diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-03 21:07:44 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-03 21:07:44 +0000 |
commit | ac97559931eb86c2cd39c39fc0371055d630f8a1 (patch) | |
tree | ac98808ee66733aea67b8802a1dfe315f8e8f41f /kde-base | |
parent | Version bump. All changes from upstream are in the modified tar ball (diff) | |
download | gentoo-2-ac97559931eb86c2cd39c39fc0371055d630f8a1.tar.gz gentoo-2-ac97559931eb86c2cd39c39fc0371055d630f8a1.tar.bz2 gentoo-2-ac97559931eb86c2cd39c39fc0371055d630f8a1.zip |
Disable test requiring session dbus, bug 376935
(Portage version: 2.1.10.9/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/konsole/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/konsole/files/konsole-4.7.0-tests.patch | 12 | ||||
-rw-r--r-- | kde-base/konsole/konsole-4.7.0.ebuild | 7 |
3 files changed, 22 insertions, 3 deletions
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog index b884e1d66f74..638efcc7549f 100644 --- a/kde-base/konsole/ChangeLog +++ b/kde-base/konsole/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/konsole # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.199 2011/07/27 14:04:29 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.200 2011/08/03 21:07:44 dilfridge Exp $ + + 03 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> konsole-4.7.0.ebuild, + +files/konsole-4.7.0-tests.patch: + Disable test requiring session dbus, bug 376935 *konsole-4.7.0 (27 Jul 2011) diff --git a/kde-base/konsole/files/konsole-4.7.0-tests.patch b/kde-base/konsole/files/konsole-4.7.0-tests.patch new file mode 100644 index 000000000000..d548c3543915 --- /dev/null +++ b/kde-base/konsole/files/konsole-4.7.0-tests.patch @@ -0,0 +1,12 @@ +diff -ruN konsole-4.7.0.orig/src/tests/CMakeLists.txt konsole-4.7.0/src/tests/CMakeLists.txt +--- konsole-4.7.0.orig/src/tests/CMakeLists.txt 2011-05-21 01:08:13.000000000 +0200 ++++ konsole-4.7.0/src/tests/CMakeLists.txt 2011-08-03 23:05:10.864318665 +0200 +@@ -12,6 +12,6 @@ + kde4_add_unit_test(SessionManagerTest SessionManagerTest.cpp) + target_link_libraries(SessionManagerTest ${KONSOLE_TEST_LIBS}) + +-kde4_add_unit_test(DBusTest DBusTest.cpp) +-target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS}) ++#kde4_add_unit_test(DBusTest DBusTest.cpp) ++#target_link_libraries(DBusTest ${KONSOLE_TEST_LIBS}) + diff --git a/kde-base/konsole/konsole-4.7.0.ebuild b/kde-base/konsole/konsole-4.7.0.ebuild index 834fff703599..36e5bafcc374 100644 --- a/kde-base/konsole/konsole-4.7.0.ebuild +++ b/kde-base/konsole/konsole-4.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.7.0.ebuild,v 1.1 2011/07/27 14:04:29 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-4.7.0.ebuild,v 1.2 2011/08/03 21:07:44 dilfridge Exp $ EAPI=4 @@ -33,4 +33,7 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.6.4-imagesize.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.6.4-imagesize.patch" + "${FILESDIR}/${PN}-4.7.0-tests.patch" +) |