commit: 46f3f4f169d104d996b44a1bb9e2ac13506715ac
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 21:16:35 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 21:19:44 2022 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=46f3f4f1
kde-plasma/discover: Rebase tests-optional.patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-5.25.49.9999.ebuild | 2 +-
kde-plasma/discover/discover-9999.ebuild | 2 +-
...ptional.patch => discover-5.25.1-tests-optional.patch} | 15 ++++-----------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/kde-plasma/discover/discover-5.25.49.9999.ebuild
b/kde-plasma/discover/discover-5.25.49.9999.ebuild
index a600cf3575..5574202fa8 100644
--- a/kde-plasma/discover/discover-5.25.49.9999.ebuild
+++ b/kde-plasma/discover/discover-5.25.49.9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.24.90-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" )
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/discover/discover-9999.ebuild
b/kde-plasma/discover/discover-9999.ebuild
index 76eacbc097..79b033b729 100644
--- a/kde-plasma/discover/discover-9999.ebuild
+++ b/kde-plasma/discover/discover-9999.ebuild
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
-PATCHES=( "${FILESDIR}/${PN}-5.24.90-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" )
src_prepare() {
ecm_src_prepare
diff --git a/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
similarity index 84%
rename from kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
rename to kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
index f90f81abf5..fc01ca3214 100644
--- a/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch
+++ b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch
@@ -18,26 +18,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd8c61aa..8ce3fa8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -22,7 +22,7 @@ include(GenerateExportHeader)
+@@ -22,7 +22,11 @@
include(ECMQtDeclareLoggingCategory)
include(KDEClangFormat)
include(KDEGitCommitHooks)
-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG
COMPONENTS Widgets Test Network Xml Concurrent DBus Quick)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG
COMPONENTS Widgets Network Xml Concurrent DBus Quick)
-
- if (QT_MAJOR_VERSION STREQUAL "5")
- find_package(Qt5X11Extras REQUIRED)
-@@ -30,6 +30,10 @@ elseif (QT_MAJOR_VERSION STREQUAL "6")
- find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG
REQUIRED Gui) # qtx11extras_p.h
- endif()
-
++
+if(BUILD_TESTING)
-+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED)
++ find_package(Qt${QT_MAJOR_VERSION}Test ${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 a26d6934..ca827f3b 100644
--- a/libdiscover/CMakeLists.txt
