gentoo auto-resync : 11:07:2022 - 19:30:41

4 files changed, 49 insertions, 1 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 68f1a91e88c7..f3e79a8af719 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 004d28514019..6dfb9f48a6d3 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,6 +1,7 @@
+AUX plasma-desktop-5.24.5-kf-5.95.patch 1914 BLAKE2B a7c692ea73ecea4df9d07ed52cbd2856fbf81c3b400cd55636c38d345fa1605f2895d567194b9265fe6b332710a5436713e35ddd1cc9a8961efbb1e1417b9322 SHA512 29979bee7e108bdeb9bea9d86ad95f51cb5d3fcc39b90e272c39089ea38f9df9ba394b4389fdbf88616f778c1b09ae32c23d27d39d4e054a6329e462ec7c8063
 DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270
 DIST plasma-desktop-5.25.2.tar.xz 6279760 BLAKE2B bc17e6dd7f472b1d07802015e20c4a727042179f45be29b2eff9da22e9b81a821d12a3398ef3f5b1dc9228f767112501911b72e6ef65d3a3d4d750949ce44172 SHA512 3459dec46338453f4fc4271753c44a91cf1924eb0eab26d64ebab5bd3070ed1ce5c18154dfae4b20f496ffa492cb3e329958c1f628f1871bac89cc30d049fde4
 DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
-EBUILD plasma-desktop-5.24.5.ebuild 5185 BLAKE2B 1cbc7280829c1b8f7de67dae950d14cf0eda465d255e952f1121bc8fd5116d44bfdc2e5849079346152a6c8fbfc3988ea785df0844b5d02bdf86aa9615e83e7d SHA512 e323a68fde0cfef29cdfc5b6cc8a64f7a8bca9ca224b895ead0eb620ae1c163b292717df0ba3359cb84fb77dfc5316f520bd43aa4013b31cafdb5caec8f884b3
+EBUILD plasma-desktop-5.24.5.ebuild 5232 BLAKE2B 2b5f6823524a5a773cd52267c4509010078e9647d6d5f4aa2d7f1c192b39eef46bc777ce945aec0d8cad1edb5744e038173037518845dd61bac12975bdf62960 SHA512 6898851213ef2fefc9904f553984e0742c5dea571821f434c22e883b8a5fb6514a8d3398c1beef262cb60a84649bb78b3da0756ab1ca127c17aabb61294bda3e
 EBUILD plasma-desktop-5.25.2.ebuild 5195 BLAKE2B 309555cafe16f3623d6467ddd2cf4cae8b25fc2b06713e7a63d762269fc8f1c647077136579b161ec6c1cd181222b72d7d4fdb55bdd828549ec4d600fd624e7d SHA512 38e357cdb8fd3c248044ce8f3ae0cc9b76a0c3e5cb27df246144d5d3c55b77f402f2d9461ee43a8871a6864497eebed8f76fe0e6c4024faa47e35aa672e75610
 MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch
new file mode 100644
index 000000000000..b7705a172250
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.5-kf-5.95.patch
@@ -0,0 +1,46 @@
+From 399c1288114d083199db7058710fd61945e2a181 Mon Sep 17 00:00:00 2001
+From: Ahmad Samir <a.samirh78@gmail.com>
+Date: Sat, 11 Jun 2022 10:34:41 +0200
+Subject: [PATCH] Fix includes when building the kglobalaccel dbus interface
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+So that KGloalAccel::MatchType can be found:
+In file included from /builds/plasma/plasma-desktop/kcms/keys/kcm_keys.cpp:23:
+/builds/plasma/plasma-desktop/_build/kcms/keys/kglobalaccel_interface.h:129:105: error: ‘KGlobalAccel’ has not been declared
+  129 |     inline QDBusPendingReply<QList<KGlobalShortcutInfo> > globalShortcutsByKey(const QKeySequence &key, KGlobalAccel::MatchType matchType)
+
+And kglobalaccel.h already includes kglobalshortcutinfo.h
+
+(cherry picked from commit 1ae254abae26416576e5f0f910a4d5aef665dad5)
+(cherry picked from commit a5e1f2c023b98b130bccee1ebd1ee184c8a2f495)
+---
+ kcms/keys/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kcms/keys/CMakeLists.txt b/kcms/keys/CMakeLists.txt
+index 3df5629dd..38869de26 100644
+--- a/kcms/keys/CMakeLists.txt
++++ b/kcms/keys/CMakeLists.txt
+@@ -13,7 +13,7 @@ set(kcm_keys_SRCS
+ 
+ set(kglobalaccel_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.KGlobalAccel.xml)
+ set_source_files_properties(${kglobalaccel_xml} PROPERTIES
+-    INCLUDE "kglobalshortcutinfo.h"
++    INCLUDE "kglobalaccel.h"
+     NO_NAMESPACE TRUE
+     CLASSNAME "KGlobalAccelInterface"
+ )
+@@ -21,7 +21,7 @@ qt_add_dbus_interface(kcm_keys_SRCS ${kglobalaccel_xml} kglobalaccel_interface)
+ 
+ set(kglobalaccel_component_xml ${KGLOBALACCEL_DBUS_INTERFACES_DIR}/kf5_org.kde.kglobalaccel.Component.xml)
+ set_source_files_properties(${kglobalaccel_component_xml} PROPERTIES
+-    INCLUDE "kglobalshortcutinfo.h"
++    INCLUDE "kglobalaccel.h"
+     NO_NAMESPACE TRUE
+     CLASSNAME "KGlobalAccelComponentInterface"
+ )
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
index ae1f627cb572..3ed62a56073c 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild
@@ -120,6 +120,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
+	"${FILESDIR}/${P}-kf-5.95.patch" # bug 857249
 )
 
 src_prepare() {