kde-plasma/discover: backport kuserfeedback optionality fix

Bug: https://bugs.kde.org/show_bug.cgi?id=478766 Thanks-to: Alfred Wingate <[email protected]> Signed-off-by: Sam James <[email protected]>
a17r · Dec 22, 2023 · cb10e9e · cb10e9e
1 parent 2e59800
commit cb10e9e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git 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
@@ -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 <[email protected]>
+Date: Wed, 20 Dec 2023 20:48:59 +0200
+Subject: [PATCH] Make UserFeedback an optional component
+
+BUG: 478766
+Signed-off-by: Alfred Wingate <[email protected]>
+--- 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