| 1 |
commit: 3934ef31af8d45b378ad9f0fe4c0338f7a58a391 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Feb 23 22:22:10 2015 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 24 22:35:02 2015 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3934ef31 |
| 7 |
|
| 8 |
[kde-apps/okular] Fix tests-optional.patch |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.17 |
| 11 |
|
| 12 |
--- |
| 13 |
.../files/okular-5.9999-tests-optional.patch | 31 ++++++++++------------ |
| 14 |
1 file changed, 14 insertions(+), 17 deletions(-) |
| 15 |
|
| 16 |
diff --git a/kde-apps/okular/files/okular-5.9999-tests-optional.patch b/kde-apps/okular/files/okular-5.9999-tests-optional.patch |
| 17 |
index 9494cbc..309c092 100644 |
| 18 |
--- a/kde-apps/okular/files/okular-5.9999-tests-optional.patch |
| 19 |
+++ b/kde-apps/okular/files/okular-5.9999-tests-optional.patch |
| 20 |
@@ -1,24 +1,21 @@ |
| 21 |
---- a/CMakeLists.txt 2015-01-25 14:40:33.935040773 +0100 |
| 22 |
-+++ b/CMakeLists.txt 2015-01-25 14:42:53.287043165 +0100 |
| 23 |
-@@ -20,7 +20,7 @@ |
| 24 |
+--- a/CMakeLists.txt 2015-02-23 23:12:24.420881583 +0100 |
| 25 |
++++ b/CMakeLists.txt 2015-02-23 23:17:07.173858317 +0100 |
| 26 |
+@@ -18,7 +18,17 @@ |
| 27 |
include(ECMAddTests) |
| 28 |
|
| 29 |
|
| 30 |
-find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Test Widgets PrintSupport Svg Qml Quick) |
| 31 |
+find_package(Qt5 CONFIG REQUIRED COMPONENTS Core DBus Widgets PrintSupport Svg Qml Quick) |
| 32 |
- find_package(KF5 REQUIRED COMPONENTS |
| 33 |
- Activities |
| 34 |
- Archive |
| 35 |
-@@ -68,7 +68,11 @@ |
| 36 |
- add_subdirectory( ui ) |
| 37 |
- add_subdirectory( shell ) |
| 38 |
- add_subdirectory( generators ) |
| 39 |
--add_subdirectory( autotests ) |
| 40 |
+ |
| 41 |
-+if(BUILD_TESTING) |
| 42 |
-+ find_package(Qt5Test CONFIG REQUIRED) |
| 43 |
-+ add_subdirectory( autotests ) |
| 44 |
++find_package(Qt5Test CONFIG QUIET) |
| 45 |
++set_package_properties(Qt5Test PROPERTIES |
| 46 |
++ PURPOSE "Required for tests" |
| 47 |
++ TYPE OPTIONAL) |
| 48 |
++add_feature_info("Qt5Test" Qt5Test_FOUND "Required for building tests") |
| 49 |
++if (NOT Qt5Test_FOUND) |
| 50 |
++ set(BUILD_TESTING OFF CACHE BOOL "Build the testing tree.") |
| 51 |
+endif() |
| 52 |
- |
| 53 |
- add_subdirectory(doc) |
| 54 |
- |
| 55 |
++ |
| 56 |
+ find_package(Qt5 OPTIONAL_COMPONENTS TextToSpeech) |
| 57 |
+ if (NOT Qt5TextToSpeech_FOUND) |
| 58 |
+ message(STATUS "Qt5TextToSpeech not found, speech features will be disabled") |
Archives