commit: 07ed4f629ac1d2d38cdbf09eac0ff7017d5343be
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 10:44:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 14 10:57:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=07ed4f62
kde-plasma/discover: Make tests optional
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-9999.ebuild | 4 +-
.../files/discover-5.21.90-tests-optional.patch | 94 ++++++++++++++++++++++
2 files changed, 97 insertions(+), 1 deletion(-)
diff --git a/kde-plasma/discover/discover-9999.ebuild
b/kde-plasma/discover/discover-9999.ebuild
index 7f338a238a..d1ba0d83c3 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-ECM_TEST="forceoptional"
+ECM_TEST="true"
KFMIN=9999
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
+PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" )
+
src_prepare() {
ecm_src_prepare
# we don't need it with PackageKitBackend off
diff --git a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch
b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch
new file mode 100644
index 0000000000..43976d145b
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch
@@ -0,0 +1,94 @@
+From f9e0be7a43665a7020e4bfffde0f48b332ec366b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <[email protected]>
+Date: Fri, 14 May 2021 12:38:57 +0200
+Subject: [PATCH] Use BUILD_TESTING to make tests optional
+
+Variable is provided by KDECMakeSettings and default enabled.
+
+Signed-off-by: Andreas Sturmlechner <[email protected]>
+---
+ CMakeLists.txt | 6 +++++-
+ libdiscover/CMakeLists.txt | 4 +++-
+ libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++-
+ libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++-
+ 5 files changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73061dde..7d230317 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+
+-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test
Network Xml Concurrent DBus Quick X11Extras)
++find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network
Xml Concurrent DBus Quick X11Extras)
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(KDECompilerSettings NO_POLICY_SCOPE)
+@@ -23,6 +23,10 @@ include(ECMQtDeclareLoggingCategory)
+ include(KDEClangFormat)
+ include(KDEGitCommitHooks)
+
++if(BUILD_TESTING)
++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
++
+ find_package(PkgConfig REQUIRED)
+
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash
DBusAddons I18n Archive XmlGui ItemModels KIO Declarative KCMUtils IdleTime)
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
+index 661c371b..56c72008 100644
+--- a/libdiscover/CMakeLists.txt
++++ b/libdiscover/CMakeLists.txt
+@@ -4,7 +4,9 @@
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_
+
+ add_subdirectory(backends)
+ add_subdirectory(notifiers)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(discovercommon_SRCS
+ Category/Category.cpp
+diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt
b/libdiscover/backends/DummyBackend/CMakeLists.txt
+index 5b4aef10..38377d80 100644
+--- a/libdiscover/backends/DummyBackend/CMakeLists.txt
++++ b/libdiscover/backends/DummyBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(dummy-backend_SRCS
+ DummyResource.cpp
+diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+index 2006a829..810238f0 100644
+--- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt
++++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ set(flatpak-backend_SRCS
+ FlatpakResource.cpp
+diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt
b/libdiscover/backends/KNSBackend/CMakeLists.txt
+index e2cb4e52..195cb98a 100644
+--- a/libdiscover/backends/KNSBackend/CMakeLists.txt
++++ b/libdiscover/backends/KNSBackend/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++ add_subdirectory(tests)
++endif()
+
+ add_library(kns-backend MODULE
+ KNSBackend.cpp
+--
+2.31.1
+
