summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2023-12-22 15:41:27 +0000
committerSam James <sam@gentoo.org>2023-12-22 15:41:27 +0000
commitcb10e9e5ec650fbfbcdcf48044a308dccc44c7ac (patch)
tree20a1b61b2425e9ce98cda7d9791afcef3a4d943f
parent2e598005d4d0cca22cd78660fea15ee2febe145e (diff)
downloadkde-cb10e9e5ec650fbfbcdcf48044a308dccc44c7ac.tar.gz
kde-cb10e9e5ec650fbfbcdcf48044a308dccc44c7ac.tar.bz2
kde-cb10e9e5ec650fbfbcdcf48044a308dccc44c7ac.zip
kde-plasma/discover: backport kuserfeedback optionality fix
Bug: https://bugs.kde.org/show_bug.cgi?id=478766 Thanks-to: Alfred Wingate <parona@protonmail.com> Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--kde-plasma/discover/discover-5.91.0.ebuild5
-rw-r--r--kde-plasma/discover/files/discover-5.91.0-kuserfeedback-optional.patch22
2 files changed, 26 insertions, 1 deletions
diff --git a/kde-plasma/discover/discover-5.91.0.ebuild b/kde-plasma/discover/discover-5.91.0.ebuild
index 43aa365255a..58c7ba52402 100644
--- a/kde-plasma/discover/discover-5.91.0.ebuild
+++ b/kde-plasma/discover/discover-5.91.0.ebuild
@@ -50,7 +50,10 @@ RDEPEND="${DEPEND}"
# snap? ( app-containers/snapd )
BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6"
-PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-5.25.90-tests-optional.patch"
+ "${FILESDIR}/${PN}-5.91.0-kuserfeedback-optional.patch"
+)
src_prepare() {
ecm_src_prepare
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
new file mode 100644
index 00000000000..d52b52ad7af
--- /dev/null
+++ b/kde-plasma/discover/files/discover-5.91.0-kuserfeedback-optional.patch
@@ -0,0 +1,22 @@
+https://invent.kde.org/plasma/discover/-/merge_requests/724
+
+From 47ac41ac57e4df182b0443bb1bde3b8ff60f05e2 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Wed, 20 Dec 2023 20:48:59 +0200
+Subject: [PATCH] Make UserFeedback an optional component
+
+BUG: 478766
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- 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