1 |
commit: 0ac1806c80c3c2ac960ccdf5bb16813493c289e2 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 29 18:00:38 2018 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 29 18:00:38 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ac1806c |
7 |
|
8 |
kde-plasma/plasma-workspace: Make tests optional again |
9 |
|
10 |
Package-Manager: Portage-2.3.26, Repoman-2.3.7 |
11 |
|
12 |
.../plasma-workspace-5.12.80-tests-optional.patch | 23 ++++++++++++---------- |
13 |
.../plasma-workspace/plasma-workspace-9999.ebuild | 1 + |
14 |
2 files changed, 14 insertions(+), 10 deletions(-) |
15 |
|
16 |
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch |
17 |
index 73979f73b0..e26b27e8c3 100644 |
18 |
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch |
19 |
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch |
20 |
@@ -1,14 +1,17 @@ |
21 |
---- a/dataengines/notifications/CMakeLists.txt 2018-01-31 19:54:26.608634042 -0700 |
22 |
-+++ b/dataengines/notifications/CMakeLists.txt 2018-01-31 21:00:17.040830824 -0700 |
23 |
-@@ -33,6 +33,8 @@ install(FILES notifications.operations D |
24 |
- |
25 |
- #unit test |
26 |
- |
27 |
--add_executable(notification_test notificationsanitizer.cpp notifications_test.cpp) |
28 |
+diff --git a/dataengines/notifications/CMakeLists.txt b/dataengines/notifications/CMakeLists.txt |
29 |
+index 8a90cb59..597b3f7e 100644 |
30 |
+--- a/dataengines/notifications/CMakeLists.txt |
31 |
++++ b/dataengines/notifications/CMakeLists.txt |
32 |
+@@ -46,7 +46,8 @@ ecm_qt_declare_logging_category(notifications_test_SRCS HEADER debug.h |
33 |
+ IDENTIFIER NOTIFICATIONS |
34 |
+ CATEGORY_NAME kde.dataengine.notifications` |
35 |
+ DEFAULT_SEVERITY Info) |
36 |
+- |
37 |
+-add_executable(notification_test ${notifications_test_SRCS}) |
38 |
-target_link_libraries(notification_test Qt5::Test Qt5::Core) |
39 |
-ecm_mark_as_test(notification_test) |
40 |
+if(BUILD_TESTING) |
41 |
-+ add_executable(notification_test notificationsanitizer.cpp notifications_test.cpp) |
42 |
-+ target_link_libraries(notification_test Qt5::Test Qt5::Core) |
43 |
-+ ecm_mark_as_test(notification_test) |
44 |
++ add_executable(notification_test ${notifications_test_SRCS}) |
45 |
++ target_link_libraries(notification_test Qt5::Test Qt5::Core) |
46 |
++ ecm_mark_as_test(notification_test) |
47 |
+endif() |
48 |
|
49 |
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
50 |
index a33002f4fe..21b940bcc9 100644 |
51 |
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
52 |
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild |
53 |
@@ -125,6 +125,7 @@ PATCHES=( |
54 |
"${FILESDIR}/${PN}-5.4-startkde-script.patch" |
55 |
"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch" |
56 |
"${FILESDIR}/${PN}-5.10.4-unused-dep.patch" |
57 |
+ "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" |
58 |
) |
59 |
|
60 |
RESTRICT+=" test" |