From 7ece7f3d3bcd0184dd8dfd6653464da80184963c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Jan 2024 01:05:34 +0000 Subject: gentoo auto-resync : 11:01:2024 - 01:05:34 --- kde-plasma/discover/Manifest | 5 +- kde-plasma/discover/discover-5.91.0.ebuild | 96 ---------------------- kde-plasma/discover/discover-5.92.0.ebuild | 93 +++++++++++++++++++++ .../discover-5.91.0-kuserfeedback-optional.patch | 22 ----- 4 files changed, 95 insertions(+), 121 deletions(-) delete mode 100644 kde-plasma/discover/discover-5.91.0.ebuild create mode 100644 kde-plasma/discover/discover-5.92.0.ebuild delete mode 100644 kde-plasma/discover/files/discover-5.91.0-kuserfeedback-optional.patch (limited to 'kde-plasma/discover') diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index 896cc4009757..334d81f5dc8b 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,7 +1,6 @@ AUX discover-5.25.90-tests-optional.patch 3080 BLAKE2B 074ce41b4aee3fe8203f83fd63361189b78ddd4dc45a72a0d3e98a8ff50a92a463c680b93c7c7643e2bfc479e9374eda78148d41fed55c17035e751c0c584efa SHA512 bd82fe11d5ff1884c9457c655502831a3dab70ff172b5d49cdbdfa0cb6818735405ef1f4c519eaf46dd607bccf71077f11741cc11c85553f4e8f639125721767 -AUX discover-5.91.0-kuserfeedback-optional.patch 920 BLAKE2B 777f307d14e9c2b7890da7808b9111dd5bb4e8750ffd7544ce801efa56671ea23bc2dd85c949108c969db2ac8883cc9e449b9c2c0f8407d75e979c5f892df9ac SHA512 8fec4112673c1bb9051e78299aa103677c1320aa009808a6fe154d0e38a425fad4ab6ccbbfc045ff014d39ce8d80f1bfb7e5002761e8721a62c3af09edfab276 DIST discover-5.27.10.tar.xz 873396 BLAKE2B a4c1a85ee389fce15826bafca4d8f474fbc3e7bfc2f1342999ca9b7a5a566f3b220e78d3d373599d7e80567632cde98dd59932f05d58c3d5bc8d58a96771761c SHA512 35e92ebc170d92267b89a99c67789732ef98c8b1847836665d3c4465be2e10a6ec39d9c53e3d6f54b9529a858ac858e64ac0db371df728750ba80b47b77528b0 -DIST discover-5.91.0.tar.xz 972192 BLAKE2B 615590eb7b7030b6d02efe2af9aa8b0f8c67b390c109141d21cfb24e6a827ca4aaa3b2bdaeb5ccc06157924a1ba9e5ff601da05b260f0c585294af9ad028a4d5 SHA512 41b9316d799645e39471c28523bde6ad9ccfd49a27edc6bd58dc51ab7595a1aab56d3c75f2db008c8016614cdf6313795930fd9cc493377d0dd3ec2d53605e5d +DIST discover-5.92.0.tar.xz 989416 BLAKE2B 1c13b6828215f972224b6548787284ab0250608da95c263e72782957ad848578340e6459c8eb5493c24012499dbd6bfb5355399d128801a8c265d751fe41ced0 SHA512 53d4682ede1dbaa9a42a7b12e830950fce5d06ff228b9452fdb932ecbd0768cee8555ac63928203516c287ad6eeee8acd2929333ffc39bd4f1bb0f142eb37969 EBUILD discover-5.27.10.ebuild 2767 BLAKE2B 4ca911d9eac3d521549645316682b015a0a6b46374d7ea7ad16939624b6a3749462d11230a2a3b70b60cd1dd57742e42db54a9895e8e804f813620ea6928c49c SHA512 30b6cf4c1c5da0f4e8a3135efe48e8fc8744cce30193113947129b6a6b3b0730ff01af35e65df62a68c41e13771e5b0dd58139f77e5bec1533f9109861c0633a -EBUILD discover-5.91.0.ebuild 2820 BLAKE2B feb8af1bb99c02f97ae886749334333d9d1b43985b0680df6a1d0b3ad9bd5b8c56473d2db82adccb09380a99a938c7e1b79ca93190e960d5dc7e04d02b1afa4f SHA512 a7853ef7bb19b794a2155b3b037dfb952b83c7edf386b8eb856fa178b4fdd9f1b5cecdc45107c75ab69bfec71656945864bb53cbcd9403e9ed886a7b5bc9125b +EBUILD discover-5.92.0.ebuild 2762 BLAKE2B b2cd83fdf27031c4892a9b2731c86f5a2031bb02e3df7fd0e27726facad5f680dbec6c977ab4e93c272d391e66c4af185ae376cbf090c9c5cb3a2b064337ead7 SHA512 716ab163e47647b94bf8424a63dda20a5749314f45c68bb70684f31ddb9e55e40f678b22d315757d5602ea1c0e2ec1d1a00d587a459a081faf5ca9ef05837a27 MISC metadata.xml 845 BLAKE2B 87d892ce29180263400147d7a7b98e42093d613897bc09764b58e43712faff76bc13f0b9e09782faf6c6f8c78d02a555271159be54ccc5213241422931d43e65 SHA512 6fda677eb8dfe74813872cad68d234d7f272f7466f654b1d0a2725b6ceb6872f51887b5861f419cf5aeb09ffc593af230a923eafa22c0db9e1353b831a4a7187 diff --git a/kde-plasma/discover/discover-5.91.0.ebuild b/kde-plasma/discover/discover-5.91.0.ebuild deleted file mode 100644 index 4bb7150c270d..000000000000 --- a/kde-plasma/discover/discover-5.91.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.247.0 -QTMIN=6.6.0 -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" -IUSE="+firmware flatpak telemetry webengine" # snap: bug #919416 - -# libmarkdown (app-text/discount) only used in PackageKitBackend -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/kidletime-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kirigami-${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 ) - telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) - webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) -" -# snap? ( sys-libs/snapd-glib:=[qt6(-)] ) -RDEPEND="${DEPEND}" -# snap? ( app-containers/snapd ) -BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" - -PATCHES=( - "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" - "${FILESDIR}/${PN}-5.91.0-kuserfeedback-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.*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/discover-5.92.0.ebuild b/kde-plasma/discover/discover-5.92.0.ebuild new file mode 100644 index 000000000000..1e2bb68c3fd8 --- /dev/null +++ b/kde-plasma/discover/discover-5.92.0.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=5.248.0 +QTMIN=6.6.0 +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" +IUSE="+firmware flatpak telemetry webengine" # snap: bug #919416 + +# libmarkdown (app-text/discount) only used in PackageKitBackend +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/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${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 ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) +" +# snap? ( sys-libs/snapd-glib:=[qt6(-)] ) +RDEPEND="${DEPEND}" +# snap? ( app-containers/snapd ) +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 + 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.91.0-kuserfeedback-optional.patch b/kde-plasma/discover/files/discover-5.91.0-kuserfeedback-optional.patch deleted file mode 100644 index d52b52ad7af3..000000000000 --- a/kde-plasma/discover/files/discover-5.91.0-kuserfeedback-optional.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://invent.kde.org/plasma/discover/-/merge_requests/724 - -From 47ac41ac57e4df182b0443bb1bde3b8ff60f05e2 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Wed, 20 Dec 2023 20:48:59 +0200 -Subject: [PATCH] Make UserFeedback an optional component - -BUG: 478766 -Signed-off-by: Alfred Wingate ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -28,7 +28,7 @@ find_package(Qt6 ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WebView) - find_package(PkgConfig REQUIRED) - - find_package(KF6 ${KF6_MIN_VERSION} REQUIRED Kirigami CoreAddons Config Crash DBusAddons I18n Archive XmlGui KIO KCMUtils IdleTime Notifications Purpose Auth StatusNotifierItem) --find_package(KF6 ${KF6_MIN_VERSION} COMPONENTS UserFeedback) -+find_package(KF6 ${KF6_MIN_VERSION} OPTIONAL_COMPONENTS UserFeedback) - - find_package(packagekitqt6 1.0.1 CONFIG) - find_package(AppStreamQt 1.0 CONFIG REQUIRED) --- -GitLab -- cgit v1.2.3