summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-10-08 14:12:35 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-10-10 11:47:00 +0200
commit78be619f6cfd996053ab2c3664da39480106ba74 (patch)
treef6010a9bf8c1789507006762b6e054d706876c84
parentkde-plasma/breeze-plymouth: drop 5.24.6 (diff)
downloadgentoo-78be619f6cfd996053ab2c3664da39480106ba74.tar.gz
gentoo-78be619f6cfd996053ab2c3664da39480106ba74.tar.bz2
gentoo-78be619f6cfd996053ab2c3664da39480106ba74.zip
kde-plasma/discover: drop 5.24.6-r1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/discover/Manifest1
-rw-r--r--kde-plasma/discover/discover-5.24.6-r1.ebuild95
-rw-r--r--kde-plasma/discover/files/discover-5.21.90-tests-optional.patch94
-rw-r--r--kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch62
4 files changed, 0 insertions, 252 deletions
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 1edf4db71a98..4333d2c0a960 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,2 +1 @@
-DIST discover-5.24.6.tar.xz 8262256 BLAKE2B e01fe3da64f976c576f52c9882d76479b01aee45c008856c0dceca4dd243b5af0ee020912511ea57b15ebf2bee8a3a653896d83f663bea0c8ed79eee3f4e3b73 SHA512 3be308dcb302ee87d3a2983b822c0f7233837c80646c5387085714864c057cabd0c492013167f81b8b869947400ea2a30e4e1f3f3e73e2e03bc58953ea0080cd
DIST discover-5.25.5.tar.xz 8311084 BLAKE2B 07cf7d8ce9ae0d94770dba1d477caaa4689d001deab209e58e7986608c1f2419ccb478632aee31039ba73308933c41a134e39b163752d66d4fbaf6998eaa70f3 SHA512 936c2ac4e4f3608882960080ea51e183115d35c3b1334c6287de9356ac714cb55ce37ff614b6ada78a0c5ebcf94fa028351c5102b274adb748fb421e8ddf58c7
diff --git a/kde-plasma/discover/discover-5.24.6-r1.ebuild b/kde-plasma/discover/discover-5.24.6-r1.ebuild
deleted file mode 100644
index 6c36d0838b59..000000000000
--- a/kde-plasma/discover/discover-5.24.6-r1.ebuild
+++ /dev/null
@@ -1,95 +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.92.0
-QTMIN=5.15.4
-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/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.21.90-tests-optional.patch"
- "${FILESDIR}/${P}-fix-submitting-usefulness.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.21.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch
deleted file mode 100644
index 43976d145baf..000000000000
--- a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From f9e0be7a43665a7020e4bfffde0f48b332ec366b 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 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
-
diff --git a/kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch b/kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch
deleted file mode 100644
index b51df586c540..000000000000
--- a/kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e74e0745bf233e02450469632e49a3cb1f416643 Mon Sep 17 00:00:00 2001
-From: Aleix Pol <aleixpol@kde.org>
-Date: Wed, 20 Jul 2022 18:12:08 +0200
-Subject: [PATCH] Fix submitting usefulness
-
-QML was getting the names mixed up somehow
-
-
-(cherry picked from commit 7ab3bfe4ec6a6767aa1410aa448faed77c934069)
-
-(cherry picked from commit 9f06c84d9ecd035c730c8720ad01d2fa8d39848b)
----
- discover/qml/ReviewDelegate.qml | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/discover/qml/ReviewDelegate.qml b/discover/qml/ReviewDelegate.qml
-index 15eccda2c..0e04f1882 100644
---- a/discover/qml/ReviewDelegate.qml
-+++ b/discover/qml/ReviewDelegate.qml
-@@ -11,7 +11,7 @@ import org.kde.discover 2.0
- import org.kde.kirigami 2.14 as Kirigami
-
- Kirigami.AbstractCard {
-- id: item
-+ id: reviewDelegateItem
- visible: model.shouldShow
- property bool compact: false
- property bool separator: true
-@@ -85,10 +85,10 @@ Kirigami.AbstractCard {
- }
-
- footer: Loader {
-- active: !item.compact
-+ active: !reviewDelegateItem.compact
- sourceComponent: RowLayout {
- id: rateTheReviewLayout
-- visible: !item.compact
-+ visible: !reviewDelegateItem.compact
- Label {
- Layout.leftMargin: Kirigami.Units.largeSpacing
- visible: usefulnessTotal !== 0
-@@ -117,7 +117,7 @@ Kirigami.AbstractCard {
- checked: usefulChoice === ReviewsModel.Yes
- onClicked: {
- noButton.checked = false
-- item.markUseful(true)
-+ reviewDelegateItem.markUseful(true)
- }
- }
- Button {
-@@ -134,7 +134,7 @@ Kirigami.AbstractCard {
- checked: usefulChoice === ReviewsModel.No
- onClicked: {
- yesButton.checked = false
-- item.markUseful(false)
-+ reviewDelegateItem.markUseful(false)
- }
- }
- }
---
-GitLab
-