* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2021-04-24 22:39 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2021-04-24 22:39 UTC (permalink / raw
To: gentoo-commits
commit: adf30035141015d54d46a27b77727e9f620c7bcc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 24 22:30:57 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 22:39:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf30035
kde-plasma/discover: Fix upstream linking
See also: https://invent.kde.org/plasma/discover/-/merge_requests/116
Reported-by: Kenneth G. Strawn <kenny.strawn <AT> gmail.com>
Closes: https://bugs.gentoo.org/785457
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/discover/discover-5.21.4.ebuild | 2 +
.../files/discover-5.21.4-missing-link.patch | 49 ++++++++++++++++++++++
2 files changed, 51 insertions(+)
diff --git a/kde-plasma/discover/discover-5.21.4.ebuild b/kde-plasma/discover/discover-5.21.4.ebuild
index 07a1f7d78f4..2c50bd9597f 100644
--- a/kde-plasma/discover/discover-5.21.4.ebuild
+++ b/kde-plasma/discover/discover-5.21.4.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${DEPEND}
>=kde-frameworks/kirigami-${KFMIN}:5
"
+PATCHES=( "${FILESDIR}/${P}-missing-link.patch" ) # bug 785457
+
src_prepare() {
ecm_src_prepare
# we don't need it with PackageKitBackend off
diff --git a/kde-plasma/discover/files/discover-5.21.4-missing-link.patch b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
new file mode 100644
index 00000000000..c8c8b152ea7
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.21.4-missing-link.patch
@@ -0,0 +1,49 @@
+From 3c578beeb5d3748d9fdacae4ace42fe6098d9184 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 25 Apr 2021 00:26:12 +0200
+Subject: [PATCH] Add missing Qt5Concurrent to target_link_libraries
+
+This was working as long as it was implicitly provided by KIO.
+Other backends are fine.
+
+Fixes:
+- DiscoverCommon w/ AppStreamQt
+- packagekit-backend
+
+See also: https://invent.kde.org/frameworks/kio/-/merge_requests/426
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ libdiscover/CMakeLists.txt | 2 +-
+ libdiscover/backends/PackageKitBackend/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt
+index 1097ea84..3e2a6c9c 100644
+--- a/libdiscover/CMakeLists.txt
++++ b/libdiscover/CMakeLists.txt
+@@ -48,7 +48,7 @@ if(TARGET AppStreamQt)
+ appstream/AppStreamIntegration.cpp
+ appstream/AppStreamUtils.cpp
+ )
+- target_link_libraries(DiscoverCommon PRIVATE AppStreamQt)
++ target_link_libraries(DiscoverCommon PRIVATE Qt5::Concurrent AppStreamQt)
+
+ if(AppStreamQt_VERSION VERSION_GREATER 0.12.4)
+ target_compile_definitions(DiscoverCommon PRIVATE -DAPPSTREAM_HAS_SPDX=1)
+diff --git a/libdiscover/backends/PackageKitBackend/CMakeLists.txt b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
+index cfeb38f1..466dbc49 100644
+--- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt
++++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
+@@ -19,7 +19,7 @@ ecm_qt_declare_logging_category(packagekit-backend_SRCS HEADER libdiscover_backe
+
+ add_library(packagekit-backend MODULE ${packagekit-backend_SRCS})
+
+-target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
++target_link_libraries(packagekit-backend PRIVATE Discover::Common Qt5::Core Qt5::Concurrent PK::packagekitqt5 KF5::ConfigGui KF5::KIOCore KF5::Archive AppStreamQt)
+ install(TARGETS packagekit-backend DESTINATION ${PLUGIN_INSTALL_DIR}/discover)
+
+ if(TARGET PkgConfig::Markdown)
+--
+2.31.1
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-plasma/discover/, kde-plasma/discover/files/
@ 2022-07-26 12:08 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2022-07-26 12:08 UTC (permalink / raw
To: gentoo-commits
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 <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
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-07-26 12:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-26 12:08 [gentoo-commits] repo/gentoo:master commit in: kde-plasma/discover/, kde-plasma/discover/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-04-24 22:39 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox