From b89dc2cfd26d17710dffeaa61548764bcfda8d8b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 21 Jun 2022 23:20:45 +0200 Subject: [PATCH] kde-plasma/discover: drop 5.25.0* Signed-off-by: Andreas Sturmlechner --- kde-plasma/discover/Manifest | 1 - kde-plasma/discover/discover-5.25.0.ebuild | 92 ------------------ .../discover-5.24.90-tests-optional.patch | 94 ------------------- 3 files changed, 187 deletions(-) delete mode 100644 kde-plasma/discover/discover-5.25.0.ebuild delete mode 100644 kde-plasma/discover/files/discover-5.24.90-tests-optional.patch diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index 8b9696e7a96ee..b22ca59086016 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,3 +1,2 @@ DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518 -DIST discover-5.25.0.tar.xz 8298804 BLAKE2B 771719bcba9ce27daa6d361aee7e8b680ead6bb0bedef95d8bfb5ee785e5e99be1f1d195d09f1b80ecf0fd3999a0d57694073720949044513cd82ffc807f439a SHA512 c63aa636df86fe2946a0d62f79eb279b96153d1844646d5ca79017a7a9a529580b7bbfb65d06fc86a5a71186bbe214ff62b11a3224923b6e895e95ea29879f39 DIST discover-5.25.1.tar.xz 8297264 BLAKE2B ea492841bf7f978a96ab923e5e729b57a9575d437eeeef51369807d9ba9bdfc477101b6d446cf200782e47e89172b0a4a9b1ecf776708f26b775e3d02c71b1c9 SHA512 de12488e7f517f88112070e959ddf1fae2e8f5fab888f207ae0a36bc9e15cda5bb95e830cf80530a49893693e1dc93e500882b514248cef925348d20bf4dde02 diff --git a/kde-plasma/discover/discover-5.25.0.ebuild b/kde-plasma/discover/discover-5.25.0.ebuild deleted file mode 100644 index ff55875033593..0000000000000 --- a/kde-plasma/discover/discover-5.25.0.ebuild +++ /dev/null @@ -1,92 +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.94.0 -QTMIN=5.15.3 -VIRTUALX_REQUIRED="test" -inherit ecm 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/qtx11extras-${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/kitemmodels-${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.24.90-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)" - ) - - ecm_src_test -} diff --git a/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch deleted file mode 100644 index f90f81abf5faa..0000000000000 --- a/kde-plasma/discover/files/discover-5.24.90-tests-optional.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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 ---- - 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,7 @@ include(GenerateExportHeader) - 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) -+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 -+++ 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 -