1 |
commit: d4b833d89b502806ff70d080a7d16ff3d7749533 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Feb 7 17:35:53 2015 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 9 20:37:06 2015 +0000 |
6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d4b833d8 |
7 |
|
8 |
[kde-apps/libkdegames] Optional tests: kick it like kwin |
9 |
|
10 |
Use a more promising patch already submitted for review. |
11 |
|
12 |
Package-Manager: portage-2.2.14 |
13 |
|
14 |
--- |
15 |
.../files/libkdegames-5.9999-buildsystem.patch | 58 ---------------------- |
16 |
.../files/libkdegames-9999-tests-optional.patch | 33 ++++++++++++ |
17 |
kde-apps/libkdegames/libkdegames-9999.ebuild | 2 +- |
18 |
3 files changed, 34 insertions(+), 59 deletions(-) |
19 |
|
20 |
diff --git a/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch b/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch |
21 |
deleted file mode 100644 |
22 |
index 62a7186..0000000 |
23 |
--- a/kde-apps/libkdegames/files/libkdegames-5.9999-buildsystem.patch |
24 |
+++ /dev/null |
25 |
@@ -1,58 +0,0 @@ |
26 |
---- a/CMakeLists.txt 2015-01-18 21:48:57.436568121 +0100 |
27 |
-+++ b/CMakeLists.txt 2015-01-18 21:49:04.667567906 +0100 |
28 |
-@@ -1,5 +1,3 @@ |
29 |
--enable_testing() |
30 |
-- |
31 |
- project(libkdegames) |
32 |
- |
33 |
- cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) |
34 |
-@@ -9,7 +7,7 @@ |
35 |
- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
36 |
- |
37 |
- |
38 |
--find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) |
39 |
-+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg) |
40 |
- find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive |
41 |
- DBusAddons DNSSD Declarative |
42 |
- I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash |
43 |
-@@ -51,7 +49,10 @@ |
44 |
- add_subdirectory( highscore ) |
45 |
- add_subdirectory( includes ) |
46 |
- add_subdirectory( libkdegamesprivate ) |
47 |
--add_subdirectory( tests ) |
48 |
-+ |
49 |
-+if(BUILD_TESTING) |
50 |
-+ add_subdirectory( tests ) |
51 |
-+endif() |
52 |
- |
53 |
- include_directories( |
54 |
- ${CMAKE_CURRENT_SOURCE_DIR}/highscore |
55 |
---- a/tests/CMakeLists.txt 2015-01-18 21:34:42.477593601 +0100 |
56 |
-+++ b/tests/CMakeLists.txt 2015-01-18 21:39:09.461585644 +0100 |
57 |
-@@ -1,3 +1,5 @@ |
58 |
-+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE) |
59 |
-+ |
60 |
- set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) |
61 |
- include_directories( ${CMAKE_SOURCE_DIR}/libkdegames ) |
62 |
- |
63 |
---- a/libkdegamesprivate/CMakeLists.txt 2015-01-18 21:49:50.737566533 +0100 |
64 |
-+++ b/libkdegamesprivate/CMakeLists.txt 2015-01-18 21:51:18.496563917 +0100 |
65 |
-@@ -1,7 +1,8 @@ |
66 |
--enable_testing() |
67 |
- project(libkdegamesprivate) |
68 |
- |
69 |
--add_subdirectory(tests) |
70 |
-+if(BUILD_TESTING) |
71 |
-+ add_subdirectory( tests ) |
72 |
-+endif() |
73 |
- |
74 |
- # NOTE: The libkdegamesprivate target is compiled in the parent directory, |
75 |
- # because CMake can't cope with exported libraries in two different |
76 |
---- a/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:49:50.737566533 +0100 |
77 |
-+++ b/libkdegamesprivate/tests/CMakeLists.txt 2015-01-18 21:54:04.201558979 +0100 |
78 |
-@@ -1,3 +1,5 @@ |
79 |
-+find_package(Qt5Test ${QT_MIN_VERSION} REQUIRED NO_MODULE) |
80 |
-+ |
81 |
- set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) |
82 |
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) |
83 |
- |
84 |
|
85 |
diff --git a/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch b/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch |
86 |
new file mode 100644 |
87 |
index 0000000..fa07df0 |
88 |
--- /dev/null |
89 |
+++ b/kde-apps/libkdegames/files/libkdegames-9999-tests-optional.patch |
90 |
@@ -0,0 +1,33 @@ |
91 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
92 |
+index 2664fd4..32f453b 100644 |
93 |
+--- a/CMakeLists.txt |
94 |
++++ b/CMakeLists.txt |
95 |
+@@ -1,5 +1,3 @@ |
96 |
+-enable_testing() |
97 |
+- |
98 |
+ project(libkdegames) |
99 |
+ |
100 |
+ cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) |
101 |
+@@ -9,12 +7,21 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE) |
102 |
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) |
103 |
+ |
104 |
+ |
105 |
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg Test) |
106 |
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Qml Quick QuickWidgets Svg) |
107 |
+ find_package(KF5 REQUIRED COMPONENTS CoreAddons Config WidgetsAddons Codecs Archive |
108 |
+ DBusAddons DNSSD Declarative |
109 |
+ I18n GuiAddons Service ConfigWidgets ItemViews IconThemes Completion JobWidgets TextWidgets GlobalAccel XmlGui Crash |
110 |
+ Bookmarks KIO NewStuff KDELibs4Support) |
111 |
+ |
112 |
++find_package(Qt5Test ${QT_MIN_VERSION} QUIET) |
113 |
++set_package_properties(Qt5Test PROPERTIES |
114 |
++ PURPOSE "Required for tests" |
115 |
++ TYPE OPTIONAL) |
116 |
++add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests") |
117 |
++if (NOT Qt5Test_FOUND) |
118 |
++ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") |
119 |
++endif() |
120 |
++ |
121 |
+ include(FeatureSummary) |
122 |
+ include(GenerateExportHeader) |
123 |
+ include(ECMPackageConfigHelpers) |
124 |
|
125 |
diff --git a/kde-apps/libkdegames/libkdegames-9999.ebuild b/kde-apps/libkdegames/libkdegames-9999.ebuild |
126 |
index 2b635ad..0637f23 100644 |
127 |
--- a/kde-apps/libkdegames/libkdegames-9999.ebuild |
128 |
+++ b/kde-apps/libkdegames/libkdegames-9999.ebuild |
129 |
@@ -48,4 +48,4 @@ DEPEND=" |
130 |
|
131 |
RDEPEND="${DEPEND}" |
132 |
|
133 |
-PATCHES=( "${FILESDIR}/${PN}-5.9999-buildsystem.patch" ) |
134 |
+PATCHES=( "${FILESDIR}/${PN}-9999-tests-optional.patch" ) |