commit: 416712cb117fbe8ef40c31e05b5dcac85554ba68 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 26 11:53:30 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 26 12:04:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=416712cb
kde-plasma/discover: Fix submitting usefulness Upstream commit e74e0745bf233e02450469632e49a3cb1f416643 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/discover/discover-5.24.6-r1.ebuild | 95 ++++++++++++++++++++++ ...discover-5.24.6-fix-submitting-usefulness.patch | 62 ++++++++++++++ 2 files changed, 157 insertions(+) diff --git a/kde-plasma/discover/discover-5.24.6-r1.ebuild b/kde-plasma/discover/discover-5.24.6-r1.ebuild new file mode 100644 index 000000000000..bc8dec03387d --- /dev/null +++ b/kde-plasma/discover/discover-5.24.6-r1.ebuild @@ -0,0 +1,95 @@ +# 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.24.6-fix-submitting-usefulness.patch b/kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch new file mode 100644 index 000000000000..b51df586c540 --- /dev/null +++ b/kde-plasma/discover/files/discover-5.24.6-fix-submitting-usefulness.patch @@ -0,0 +1,62 @@ +From e74e0745bf233e02450469632e49a3cb1f416643 Mon Sep 17 00:00:00 2001 +From: Aleix Pol <aleix...@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 +
