From bba7ed73af4fe3b333cb970dc40a9098e2d1c54b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 10 Oct 2022 13:34:01 +0100 Subject: gentoo auto-resync : 10:10:2022 - 13:34:00 --- kde-plasma/discover/Manifest | 4 - kde-plasma/discover/discover-5.24.6-r1.ebuild | 95 ---------------------- .../files/discover-5.21.90-tests-optional.patch | 94 --------------------- ...discover-5.24.6-fix-submitting-usefulness.patch | 62 -------------- 4 files changed, 255 deletions(-) delete mode 100644 kde-plasma/discover/discover-5.24.6-r1.ebuild delete mode 100644 kde-plasma/discover/files/discover-5.21.90-tests-optional.patch delete mode 100644 kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch (limited to 'kde-plasma/discover') diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index dd0ab55d70d9..9f80b4912673 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,8 +1,4 @@ -AUX discover-5.21.90-tests-optional.patch 3372 BLAKE2B 9c1ee887d31b48b730350cb599f3f8e7ca4b802ba2d68dce72cede96b7a6d0e83451697b9e9e3da67c611514a3d808affb9616a515b80cc3788365fc3ca01997 SHA512 43a7152fb04224f52e417f2684fda6561cfd26888ff6493899e70b313f725066be1aefe9a0350c1aa260d799c44bdd5643a79e4a84dd6cfa34511dbc098ff93d -AUX discover-5.24.6-fix-submitting-usefulness.patch 2041 BLAKE2B 865c8719c047a2c23147c198c15ff638be82745c4082f3f91bf9912653426a02c3e433d555915c1edcd8ae6de0a4712bba750449c0a228607234607807c0fdd8 SHA512 4d6fd5079dc35a36471d626e99430a83de25d71eaca91de526a8485be7cf62effbcec80058b6ccbaf9a3e0f083430a5cfb9f9fc418adc5818158039130502d40 AUX discover-5.25.1-tests-optional.patch 3012 BLAKE2B a13aa4927a0ebc6c4c021400a8de15c248adf3a26558e3a4809f75d104b23bdbcf8b87670f1f28ab3683a1c852d43fc890692e86580512e6c3b9a3d275d901a7 SHA512 96c3c48786bc66d1d777a0b43a1b80dff717dcbd395277e1c7fe6cba9e12f15bb55ee9aadfee65b2c2896b35e0b6567c62322852b94baf3698150a147b600e39 -DIST discover-5.24.6.tar.xz 8262256 BLAKE2B e01fe3da64f976c576f52c9882d76479b01aee45c008856c0dceca4dd243b5af0ee020912511ea57b15ebf2bee8a3a653896d83f663bea0c8ed79eee3f4e3b73 SHA512 3be308dcb302ee87d3a2983b822c0f7233837c80646c5387085714864c057cabd0c492013167f81b8b869947400ea2a30e4e1f3f3e73e2e03bc58953ea0080cd DIST discover-5.25.5.tar.xz 8311084 BLAKE2B 07cf7d8ce9ae0d94770dba1d477caaa4689d001deab209e58e7986608c1f2419ccb478632aee31039ba73308933c41a134e39b163752d66d4fbaf6998eaa70f3 SHA512 936c2ac4e4f3608882960080ea51e183115d35c3b1334c6287de9356ac714cb55ce37ff614b6ada78a0c5ebcf94fa028351c5102b274adb748fb421e8ddf58c7 -EBUILD discover-5.24.6-r1.ebuild 2501 BLAKE2B fc22e0aef2d50549f3c1a0c60a95c05e1b6ad21b82d7ea4e22ad8eb3496befea1a84aaf950cfc8cc73e852928cb09cb4b8c592de36e109634cfd6005fb0dd968 SHA512 6a581691f5e847c25b78bf5a02afd9225f839859a670bedbac466f38cef677627295289b3abeb60362e9b3239942fd7aa5244ac59d9dca0b06285cd3e4f9998a EBUILD discover-5.25.5.ebuild 2385 BLAKE2B e9bb7d2cb674bac400e0fcdc69b43f47c636f00f59b2211a26b1fb23b615f9a45a35c2d0b13a830314f806b379aa1425d6678f7cc7ea11ee18fbae74a5550c99 SHA512 bebff24cab41674224321fe1f3d091b76306eaddedea9e0c6217b9e90462168428f06c6a9684da53c54f72d73c051482568ab49838130fa245176610b0c46c49 MISC metadata.xml 593 BLAKE2B df9bc71449f9da27c50179bccd724b275f65726ddd17b44e9d639489fec725d7ac4fdeb012878a80e46f3f6e75a5bb7c2c1661279602b0b55267078128adfec0 SHA512 596816ebb6342627a25a605b62a87fe5aad5935e956db6dea84215b65edb2f405c0ad3fcda87481e10abc950e0263d190064f3edf91710aa2f16699a2de63f0b 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 -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 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 -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 - -- cgit v1.2.3