[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/

["Johannes Huber" <johu@gentoo.org>]

commit:     0ac1806c80c3c2ac960ccdf5bb16813493c289e2
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 18:00:38 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar 29 18:00:38 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ac1806c

kde-plasma/plasma-workspace: Make tests optional again

Package-Manager: Portage-2.3.26, Repoman-2.3.7

 .../plasma-workspace-5.12.80-tests-optional.patch  | 23 ++++++++++++----------
 .../plasma-workspace/plasma-workspace-9999.ebuild  |  1 +
 2 files changed, 14 insertions(+), 10 deletions(-)

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
index 73979f73b0..e26b27e8c3 100644
--- 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
@@ -1,14 +1,17 @@
---- a/dataengines/notifications/CMakeLists.txt  2018-01-31 19:54:26.608634042 -0700
-+++ b/dataengines/notifications/CMakeLists.txt  2018-01-31 21:00:17.040830824 -0700
-@@ -33,6 +33,8 @@ install(FILES notifications.operations D
- 
- #unit test
- 
--add_executable(notification_test  notificationsanitizer.cpp notifications_test.cpp)
+diff --git a/dataengines/notifications/CMakeLists.txt b/dataengines/notifications/CMakeLists.txt
+index 8a90cb59..597b3f7e 100644
+--- a/dataengines/notifications/CMakeLists.txt
++++ b/dataengines/notifications/CMakeLists.txt
+@@ -46,7 +46,8 @@ ecm_qt_declare_logging_category(notifications_test_SRCS HEADER debug.h
+                                                IDENTIFIER NOTIFICATIONS
+                                                CATEGORY_NAME kde.dataengine.notifications`
+                                                DEFAULT_SEVERITY Info)
+-
+-add_executable(notification_test  ${notifications_test_SRCS})
 -target_link_libraries(notification_test Qt5::Test Qt5::Core)
 -ecm_mark_as_test(notification_test)
 +if(BUILD_TESTING)
-+    add_executable(notification_test  notificationsanitizer.cpp notifications_test.cpp)
-+    target_link_libraries(notification_test Qt5::Test Qt5::Core)
-+    ecm_mark_as_test(notification_test)
++	add_executable(notification_test  ${notifications_test_SRCS})
++	target_link_libraries(notification_test Qt5::Test Qt5::Core)
++	ecm_mark_as_test(notification_test)
 +endif()

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
index a33002f4fe..21b940bcc9 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild
@@ -125,6 +125,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
 	"${FILESDIR}/${PN}-5.10.4-unused-dep.patch"
+	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
 )
 
 RESTRICT+=" test"