diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2022-06-21 23:16:35 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2022-06-21 23:19:44 +0200 |
| commit | 46f3f4f169d104d996b44a1bb9e2ac13506715ac (patch) | |
| tree | 8dc480d95e007cab9def171184fbac5be343c724 | |
| parent | */*: New baseline QTMIN=5.15.4 (diff) | |
| download | kde-46f3f4f169d104d996b44a1bb9e2ac13506715ac.tar.gz kde-46f3f4f169d104d996b44a1bb9e2ac13506715ac.tar.bz2 kde-46f3f4f169d104d996b44a1bb9e2ac13506715ac.zip | |
kde-plasma/discover: Rebase tests-optional.patch
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-plasma/discover/discover-5.25.49.9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-plasma/discover/discover-9999.ebuild | 2 | ||||
| -rw-r--r-- | kde-plasma/discover/files/discover-5.25.1-tests-optional.patch (renamed from kde-plasma/discover/files/discover-5.24.90-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 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 |