From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DACC1382C5 for ; Sun, 18 Feb 2018 13:35:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FA04E0AD6; Sun, 18 Feb 2018 13:35:37 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2CC4CE0AD6 for ; Sun, 18 Feb 2018 13:35:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7BDA335C2C for ; Sun, 18 Feb 2018 13:35:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 428D31D4 for ; Sun, 18 Feb 2018 13:35:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1518960731.c7e30f34dd64a17b0a753ef53dc0a825a9154ac6.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/, kde-plasma/plasma-workspace/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild X-VCS-Directories: kde-plasma/plasma-workspace/ kde-plasma/plasma-workspace/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c7e30f34dd64a17b0a753ef53dc0a825a9154ac6 X-VCS-Branch: master Date: Sun, 18 Feb 2018 13:35:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3c7a57f0-8357-459a-9308-0a0fece5a51a X-Archives-Hash: 97ea384d81ed5452d97fd95a1fe7a52f commit: c7e30f34dd64a17b0a753ef53dc0a825a9154ac6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 18 13:31:48 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 18 13:32:11 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7e30f34 kde-plasma/plasma-workspace: Fix build w/o tests Thanks-to: Duncan <1i5t5.duncan cox.net> Bug: https://bugs.gentoo.org/646264 Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../files/plasma-workspace-5.12.80-tests-optional.patch | 14 ++++++++++++++ kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) 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 new file mode 100644 index 0000000000..73979f73b0 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch @@ -0,0 +1,14 @@ +--- 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) +-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) ++endif() diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 923f193500..21b940bcc9 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional-recursive" +KDE_TEST="forceoptional" VIRTUALX_REQUIRED="test" inherit kde5 qmake-utils @@ -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"