From 38898e151804a12836cbd2589781f81b3437f81f Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Mon, 16 Sep 2013 20:36:57 +1000 Subject: [kde-base/konsole] Fix failing tests patch wrt bug #485052. Package-Manager: portage-2.2.5 --- kde-base/konsole/files/konsole-4.7.0-tests.patch | 12 ------------ kde-base/konsole/konsole-9999.ebuild | 5 +---- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 kde-base/konsole/files/konsole-4.7.0-tests.patch diff --git a/kde-base/konsole/files/konsole-4.7.0-tests.patch b/kde-base/konsole/files/konsole-4.7.0-tests.patch deleted file mode 100644 index d548c354391..00000000000 --- a/kde-base/konsole/files/konsole-4.7.0-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-9999.ebuild b/kde-base/konsole/konsole-9999.ebuild index d8184ae0462..3a679710a39 100644 --- a/kde-base/konsole/konsole-9999.ebuild +++ b/kde-base/konsole/konsole-9999.ebuild @@ -7,6 +7,7 @@ EAPI=5 KDE_HANDBOOK="optional" KDE_DOC_DIRS="doc/manual" VIRTUALX_REQUIRED="test" +VIRTUALDBUS_TEST="true" inherit kde4-base DESCRIPTION="X terminal for use with KDE" @@ -32,7 +33,3 @@ DEPEND="${COMMONDEPEND} ) " RDEPEND="${COMMONDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-4.7.0-tests.patch" -) -- cgit v1.2.3 From c06d774fc1b5922aa02fa542f5388c5e17f635f9 Mon Sep 17 00:00:00 2001 From: Michael Palimaka Date: Tue, 17 Sep 2013 01:49:51 +1000 Subject: [kde-base/konsole] Restore patch which is still required for KDE/4.11. Package-Manager: portage-2.2.6 --- kde-base/konsole/files/konsole-4.7.0-tests.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 kde-base/konsole/files/konsole-4.7.0-tests.patch 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 00000000000..d548c354391 --- /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}) + -- cgit v1.2.3