summaryrefslogtreecommitdiff
path: root/kde-plasma/discover
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma/discover')
-rw-r--r--kde-plasma/discover/Manifest9
-rw-r--r--kde-plasma/discover/discover-5.27.11.ebuild96
-rw-r--r--kde-plasma/discover/discover-6.1.5.ebuild (renamed from kde-plasma/discover/discover-6.0.4.ebuild)16
-rw-r--r--kde-plasma/discover/discover-6.2.1.ebuild97
-rw-r--r--kde-plasma/discover/files/discover-5.25.90-tests-optional.patch85
5 files changed, 110 insertions, 193 deletions
diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest
index 917c7a166a31..6f1b5215e5bc 100644
--- a/kde-plasma/discover/Manifest
+++ b/kde-plasma/discover/Manifest
@@ -1,6 +1,5 @@
-AUX discover-5.25.90-tests-optional.patch 3080 BLAKE2B 074ce41b4aee3fe8203f83fd63361189b78ddd4dc45a72a0d3e98a8ff50a92a463c680b93c7c7643e2bfc479e9374eda78148d41fed55c17035e751c0c584efa SHA512 bd82fe11d5ff1884c9457c655502831a3dab70ff172b5d49cdbdfa0cb6818735405ef1f4c519eaf46dd607bccf71077f11741cc11c85553f4e8f639125721767
-DIST discover-5.27.11.tar.xz 881132 BLAKE2B 8f60d92745f38aef3a767f41c763d12fe07a915ea7f89ce03a37f1ed4bae1814081d08761be496e1020998a986650269f217eb6820a15b7bbb84aa056034ce60 SHA512 3393b99df506314420c18d2fbf05f7476dd86d4b27c1a153f5da4ebce03add63b0001194d1717b90d0f4bb34f106f34ed4f54f06bcdbf7aa3de492b94a470e37
-DIST discover-6.0.4.tar.xz 999504 BLAKE2B d4d80b8777c84ba51ea3958b986d172aebc01d19e0e9c5f26c12732b2b6223c7eb009df70b61e981c0a9814bca4d320f0b238629379483b2693527ad66f6d976 SHA512 cf63b5c1ce1d0b229765ab62bb728b0ac34dee01600a7352f83058dab5216a97c77f5d31e14ae7ba8f9211319512759d4ff603e86d16d0724db6c2d0cb677a74
-EBUILD discover-5.27.11.ebuild 2778 BLAKE2B e9561e7f177bf8d123f06201aa209c31f9e5a769872ec5cca265d437cf71fd1f2aa9fc30fca997e009883ae5b2e2cb1c62df7a7eab08ec20e6041f976e0da11a SHA512 a7296b8848de18084cccf8751434a8eb195bb808db8cb2577b7c2772b9758d32757d674bf53a3b52d210e41bae1abc5e904aedfe3d4e2b2fd86d9707b2f293b7
-EBUILD discover-6.0.4.ebuild 2738 BLAKE2B 247740ebdb16faf0baa24189cafd6abd2f67eeb594c2a7ff96afd4b9f094b7a612e32c7bce2d9f3ad3ac11c21212e6a263f6b1fcfa2eceb1e595c338624d5c12 SHA512 efa632e6747aef9f03e0a236512f3013669931e7b3b4a3a59e19175864e3a796df6c10c7168ee78baa744d0823b39ab5465b70b590ca8dff97fd93b18a78cd37
+DIST discover-6.1.5.tar.xz 1025644 BLAKE2B 094503733c528b0992fad0e9ff2ee42791e03f2c23e57617a76074a48bdb865c3f75aff2e19b430ba0895eb963460e1f504da8645d2162ae40b239bd29d836e5 SHA512 ea604afb73003b3d0e67bab78c6165f7a347499baf778928deaa03a48f0e9d06f6d4e753b3aa823bbd4e6cf39932d7a8432924d03da3bc3eea98052d7e433a4e
+DIST discover-6.2.1.tar.xz 1098980 BLAKE2B c2b6119f50e70aa6fd12d388e31363fbe61a70d29ca1be87a025f0ba4634eb6091d94bc1e4f4a3e90bbd6905ee034e745eda8372ebd0df7f01ac89451e80075e SHA512 f5e50755eac1ae1d256a394819f013f6f19ddb449d9b7058b930f0bc4953c141028940dd682fb3b2b58bfaaa4281d49d895de192664ac4a937ef53e70542eb35
+EBUILD discover-6.1.5.ebuild 2800 BLAKE2B f9064749007087c19f51f6fc095ec47c9c06d1b32d526aa5feb45a7d990329562571a5eda0a67c065b4827ab3d70b3ead16fa56e96ce7a4c23f8e9d609700ff1 SHA512 e0a1ade396a580911a427cef22130077bce1b7eeb45cd5ba42da6ea5591313fce6ae2b6d1bc605dfe54721d88d0597711e4eee75a0297fc5ba0b9874d10eae52
+EBUILD discover-6.2.1.ebuild 2843 BLAKE2B 9617e5aa67203980c95082e2861e39ded610fb16f0327dfc1d8b5c0cdc1fab6e7d52668a03ce0253138097dab1007f2ae820a1e7a19f14e5a525fb3550ac4bb8 SHA512 6646c66417d1e8e90c261e90c3c3c89c448f176da78fe399c864a532875d4fe21b90e8028079b9bf5069d2a6b2d7da34a4dfbef007b23693aef732657b78b757
MISC metadata.xml 845 BLAKE2B 87d892ce29180263400147d7a7b98e42093d613897bc09764b58e43712faff76bc13f0b9e09782faf6c6f8c78d02a555271159be54ccc5213241422931d43e65 SHA512 6fda677eb8dfe74813872cad68d234d7f272f7466f654b1d0a2725b6ceb6872f51887b5861f419cf5aeb09ffc593af230a923eafa22c0db9e1353b831a4a7187
diff --git a/kde-plasma/discover/discover-5.27.11.ebuild b/kde-plasma/discover/discover-5.27.11.ebuild
deleted file mode 100644
index dd1e2d9d8cb8..000000000000
--- a/kde-plasma/discover/discover-5.27.11.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.106.0
-QTMIN=5.15.9
-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 ~loong ~ppc64 ~riscv x86"
-IUSE="+firmware flatpak snap telemetry webengine"
-
-# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
- >=dev-libs/appstream-0.15.3:=[qt5(-)]
- >=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
- >=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
- >=kde-frameworks/purpose-${KFMIN}:5
- firmware? ( >=sys-apps/fwupd-1.5.0 )
- flatpak? ( sys-apps/flatpak )
- snap? ( sys-libs/snapd-glib:=[qt5(-)] )
- telemetry? ( kde-frameworks/kuserfeedback:5 )
- webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- snap? ( app-containers/snapd )
-"
-BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5"
-
-PATCHES=( "${FILESDIR}/${PN}-5.25.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=(
- # TODO: Port PackageKit's portage back-end to python3
- -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON
- # Automated updates will not work for us
- # https://invent.kde.org/plasma/discover/-/merge_requests/142
- -DWITH_KCM=OFF
- -DBUILD_DummyBackend=OFF
- -DBUILD_FlatpakBackend=$(usex flatpak)
- -DBUILD_FwupdBackend=$(usex firmware)
- -DBUILD_RpmOstreeBackend=OFF
- -DBUILD_SnapBackend=$(usex snap)
- -DBUILD_SteamOSBackend=OFF
- $(cmake_use_find_package telemetry KUserFeedback)
- $(cmake_use_find_package webengine Qt5WebView)
- )
-
- ecm_src_configure
-}
-
-src_test() {
- # bug 686392: needs network connection
- local myctestargs=(
- -E "(knsbackendtest|flatpaktest)"
- )
-
- ecm_src_test
-}
diff --git a/kde-plasma/discover/discover-6.0.4.ebuild b/kde-plasma/discover/discover-6.1.5.ebuild
index 7a4ff24ff1ed..8a2be05cb180 100644
--- a/kde-plasma/discover/discover-6.0.4.ebuild
+++ b/kde-plasma/discover/discover-6.1.5.ebuild
@@ -4,8 +4,8 @@
EAPI=8
ECM_TEST="true"
-KFMIN=6.0
-QTMIN=6.6.2
+KFMIN=6.5.0
+QTMIN=6.7.2
inherit ecm plasma.kde.org
DESCRIPTION="KDE Plasma resources management GUI"
@@ -13,11 +13,11 @@ HOMEPAGE="https://userbase.kde.org/Discover"
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
IUSE="+firmware flatpak snap telemetry webengine"
# libmarkdown (app-text/discount) only used in PackageKitBackend
-DEPEND="
+COMMON_DEPEND="
>=dev-libs/appstream-1.0.0:=[qt6]
dev-libs/kirigami-addons:6
>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,widgets]
@@ -31,6 +31,7 @@ DEPEND="
>=kde-frameworks/kcrash-${KFMIN}:6
>=kde-frameworks/kdbusaddons-${KFMIN}:6
>=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
>=kde-frameworks/kidletime-${KFMIN}:6
>=kde-frameworks/kio-${KFMIN}:6
>=kde-frameworks/kirigami-${KFMIN}:6
@@ -46,13 +47,14 @@ DEPEND="
telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 )
"
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
snap? ( app-containers/snapd )
"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/qcoro
+"
BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
-PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" )
-
src_prepare() {
ecm_src_prepare
# we don't need it with PackageKitBackend off
diff --git a/kde-plasma/discover/discover-6.2.1.ebuild b/kde-plasma/discover/discover-6.2.1.ebuild
new file mode 100644
index 000000000000..c6ff718320c0
--- /dev/null
+++ b/kde-plasma/discover/discover-6.2.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="true"
+KFMIN=6.6.0
+QTMIN=6.7.2
+inherit ecm plasma.kde.org
+
+DESCRIPTION="KDE Plasma resources management GUI"
+HOMEPAGE="https://userbase.kde.org/Discover"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+firmware flatpak snap telemetry webengine"
+
+# libmarkdown (app-text/discount) only used in PackageKitBackend
+COMMON_DEPEND="
+ >=dev-libs/appstream-1.0.0:=[qt6]
+ dev-libs/kirigami-addons:6
+ >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,widgets]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=kde-frameworks/attica-${KFMIN}:6
+ >=kde-frameworks/kauth-${KFMIN}:6
+ >=kde-frameworks/kcmutils-${KFMIN}:6
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kcrash-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kidletime-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/knewstuff-${KFMIN}:6
+ >=kde-frameworks/knotifications-${KFMIN}:6
+ >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/purpose-${KFMIN}:6
+ firmware? ( >=sys-apps/fwupd-1.9.4 )
+ flatpak? ( sys-apps/flatpak )
+ snap? ( sys-libs/snapd-glib:=[qt6(-)] )
+ telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 )
+ webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 )
+"
+RDEPEND="${COMMON_DEPEND}
+ snap? ( app-containers/snapd )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/qcoro
+"
+BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
+
+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.*Markdown/#&/" \
+ -e "s/^pkg_check_modules.*RpmOstree/#&/" \
+ -e "s/^pkg_check_modules.*Ostree/#&/" \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ # TODO: Port PackageKit's portage back-end to python3
+ -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt6=ON
+ # Automated updates will not work for us
+ # https://invent.kde.org/plasma/discover/-/merge_requests/142
+ -DWITH_KCM=OFF
+ -DBUILD_DummyBackend=OFF
+ -DBUILD_FlatpakBackend=$(usex flatpak)
+ -DBUILD_FwupdBackend=$(usex firmware)
+ -DBUILD_RpmOstreeBackend=OFF
+ -DBUILD_SnapBackend=$(usex snap)
+ -DBUILD_SteamOSBackend=OFF
+ $(cmake_use_find_package telemetry KF6UserFeedback)
+ $(cmake_use_find_package webengine Qt6WebView)
+ )
+
+ 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.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch
deleted file mode 100644
index 50f1175116d3..000000000000
--- a/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 8706a81bccfbaf9d06a3aedf9f968d760757af07 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 | 4 ++++
- 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, 16 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13fe64228..7453c8bfb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,6 +25,10 @@ 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} CONFIG OPTIONAL_COMPONENTS WebView)
-
-+if(BUILD_TESTING)
-+ 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 KIO Declarative KCMUtils IdleTime Notifications Purpose)
-diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
-index 023b110fd..7778fab0c 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 5b4aef10c..38377d808 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 eac5a3241..e9ee78fd0 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 d52bee9d0..7d5ba8dc9 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.37.3
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-25 18:59:26 +0000