commit: 457d1927d8dae1074e4a446e496b67a3fa256915 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Sun Jan 25 12:28:48 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sun Jan 25 19:25:23 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=457d1927
[kde-apps/konsole] Remove upstreamed patch --- .../files/konsole-9999-tests-optional.patch | 27 ---------------------- kde-apps/konsole/konsole-9999.ebuild | 2 -- 2 files changed, 29 deletions(-) diff --git a/kde-apps/konsole/files/konsole-9999-tests-optional.patch b/kde-apps/konsole/files/konsole-9999-tests-optional.patch deleted file mode 100644 index 99eaef8..0000000 --- a/kde-apps/konsole/files/konsole-9999-tests-optional.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/CMakeLists.txt 2015-01-19 01:06:41.388214548 +0100 -+++ b/CMakeLists.txt 2015-01-19 01:13:14.851202822 +0100 -@@ -26,7 +26,7 @@ - ecm_setup_version(${Konsole_VERSION} VARIABLE_PREFIX KONSOLEPRIVATE - SOVERSION ${Konsole_VERSION_MAJOR} - ) --find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script Test) -+find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core DBus Widgets Script) - - find_package(KF5 REQUIRED - Bookmarks Completion Config ConfigWidgets ---- a/src/CMakeLists.txt 2015-01-19 01:06:41.386214548 +0100 -+++ b/src/CMakeLists.txt 2015-01-19 01:15:51.963198139 +0100 -@@ -22,8 +22,11 @@ - ${CMAKE_CURRENT_BINARY_DIR}/config-konsole.h) - - ### Tests --add_subdirectory(autotests) --add_subdirectory(tests) -+if(BUILD_TESTING) -+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+ add_subdirectory(autotests) -+ add_subdirectory(tests) -+endif() - - ### Font Embedder and LineFont.h - option(KONSOLE_BUILD_FONTEMBEDDER "Konsole: build fontembedder executable" OFF) diff --git a/kde-apps/konsole/konsole-9999.ebuild b/kde-apps/konsole/konsole-9999.ebuild index 26b7ffe..8c9b069 100644 --- a/kde-apps/konsole/konsole-9999.ebuild +++ b/kde-apps/konsole/konsole-9999.ebuild @@ -49,8 +49,6 @@ RDEPEND="${DEPEND} !kde-base/konsole " -PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" ) - src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package X X11)