commit: 535f8a55c2b3248176681be41cc3d490336faf00 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Mon Mar 9 23:51:24 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Mon Mar 9 23:51:24 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=535f8a55
[kde-apps/knetwalk] Tests optional patch upstreamed Package-Manager: portage-2.2.18 .../files/knetwalk-9999-tests-optional.patch | 27 ---------------------- kde-apps/knetwalk/knetwalk-9999.ebuild | 2 -- 2 files changed, 29 deletions(-) diff --git a/kde-apps/knetwalk/files/knetwalk-9999-tests-optional.patch b/kde-apps/knetwalk/files/knetwalk-9999-tests-optional.patch deleted file mode 100644 index 4a0712e..0000000 --- a/kde-apps/knetwalk/files/knetwalk-9999-tests-optional.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/CMakeLists.txt 2015-02-15 21:59:57.932461024 +0100 -+++ b/CMakeLists.txt 2015-02-15 22:06:56.974222282 +0100 -@@ -4,7 +4,7 @@ - find_package(ECM 1.3.0 REQUIRED NO_MODULE) - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg) - find_package(KF5 REQUIRED COMPONENTS - CoreAddons - Config -@@ -21,6 +21,15 @@ - ) - find_package(KF5KDEGames 4.9.0 REQUIRED) - -+find_package(Qt5Test ${QT_MIN_VERSION} QUIET) -+set_package_properties(Qt5Test PROPERTIES -+ PURPOSE "Required for tests" -+ TYPE OPTIONAL) -+add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests") -+if (NOT Qt5Test_FOUND) -+ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") -+endif() -+ - include(FeatureSummary) - include(ECMInstallIcons) - include(KDEInstallDirs) diff --git a/kde-apps/knetwalk/knetwalk-9999.ebuild b/kde-apps/knetwalk/knetwalk-9999.ebuild index 0d550cd..5a82c19 100644 --- a/kde-apps/knetwalk/knetwalk-9999.ebuild +++ b/kde-apps/knetwalk/knetwalk-9999.ebuild @@ -37,5 +37,3 @@ DEPEND=" dev-qt/qtwidgets:5 " RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" )