diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-02-01 09:29:48 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-02-01 10:26:15 +0100 |
commit | a4a1bb8a6f5e465d97c98060ca0bbfa3ef9e6d10 (patch) | |
tree | bc0853c06ba4bcbe366564ffc43099d8ceffbe80 /kde-plasma | |
parent | kde-plasma/breeze-plymouth: drop 5.25.5 (diff) | |
download | gentoo-a4a1bb8a6f5e465d97c98060ca0bbfa3ef9e6d10.tar.gz gentoo-a4a1bb8a6f5e465d97c98060ca0bbfa3ef9e6d10.tar.bz2 gentoo-a4a1bb8a6f5e465d97c98060ca0bbfa3ef9e6d10.zip |
kde-plasma/discover: drop 5.25.5
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma')
-rw-r--r-- | kde-plasma/discover/Manifest | 1 | ||||
-rw-r--r-- | kde-plasma/discover/discover-5.25.5.ebuild | 90 | ||||
-rw-r--r-- | kde-plasma/discover/files/discover-5.25.1-tests-optional.patch | 87 |
3 files changed, 0 insertions, 178 deletions
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index 673a7f702161..115b46051f67 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,3 +1,2 @@ -DIST discover-5.25.5.tar.xz 8311084 BLAKE2B 07cf7d8ce9ae0d94770dba1d477caaa4689d001deab209e58e7986608c1f2419ccb478632aee31039ba73308933c41a134e39b163752d66d4fbaf6998eaa70f3 SHA512 936c2ac4e4f3608882960080ea51e183115d35c3b1334c6287de9356ac714cb55ce37ff614b6ada78a0c5ebcf94fa028351c5102b274adb748fb421e8ddf58c7 DIST discover-5.26.5.tar.xz 666824 BLAKE2B 427403ae2b4a80b846919716f1eb74fe26b4989d7a2647b176863f02a4b587801eb7907f447f13e2f1f1a463da35cb55924d2f3ace57d7246d3afad641ed257b SHA512 b41381ed97fc38be1b35f3dd34e6ffd4171a55fa81e344bdd47e3a8577a6ba05aff757db20f38b2632ca788180f93ce2ed64777abe1a2d74028df679b6a4b5ea DIST discover-5.26.90.tar.xz 851404 BLAKE2B 5d2e0fe8fc951e6f792132693ccd62f7e8388303f7beb0c36ace38a73a0f501de73c6b2f0a569ff75a3aedf37a318c8992025e26ca98c965372742c2d6d67a01 SHA512 ce32cd89994a60dddc80d371b18b30b909d72aa1da6fe881e67d2b7603f644a9cd8233270727fe45053080e4b48636085d326ea7c9357f2821497a38de0d241a diff --git a/kde-plasma/discover/discover-5.25.5.ebuild b/kde-plasma/discover/discover-5.25.5.ebuild deleted file mode 100644 index ff6abe1e063f..000000000000 --- a/kde-plasma/discover/discover-5.25.5.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.95.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm plasma.kde.org - -DESCRIPTION="KDE Plasma resources management GUI" -HOMEPAGE="https://userbase.kde.org/Discover" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="+firmware flatpak telemetry" - -# libmarkdown (app-text/discount) only used in PackageKitBackend -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - firmware? ( >=sys-apps/fwupd-1.5.0 ) - flatpak? ( - >=dev-libs/appstream-0.14.4:= - sys-apps/flatpak - ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 -" - -PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" ) - -src_prepare() { - ecm_src_prepare - # we don't need it with PackageKitBackend off - ecm_punt_kf_module Archive - # we don't do anything with this - sed -e "s/^pkg_check_modules.*RpmOstree/#&/" \ - -e "s/^pkg_check_modules.*Ostree/#&/" \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -DWITH_KCM=OFF - -DBUILD_FlatpakBackend=$(usex flatpak) - $(cmake_use_find_package flatpak AppStreamQt) - -DBUILD_FwupdBackend=$(usex firmware) - $(cmake_use_find_package telemetry KUserFeedback) - ) - - ecm_src_configure -} - -src_test() { - # bug 686392: needs network connection - local myctestargs=( - -E "(knsbackendtest|flatpaktest)" - ) - - ecm_src_test -} diff --git a/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch deleted file mode 100644 index fc01ca3214bc..000000000000 --- a/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -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 <asturm@gentoo.org> ---- - 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 cd8c61aa..8ce3fa8c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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(BUILD_TESTING) -+ find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+endif() - - find_package(PkgConfig REQUIRED) - -diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt -index a26d6934..ca827f3b 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 55e6b38e..e2d11b93 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 54f19e1f..ec3443e9 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.35.1 - |