7 files changed, 105 insertions, 5 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index bfbb57456168..28a5527433cf 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 9258338bd4a4..f9f74e45b46e 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.101.0.tar.xz 347684 BLAKE2B 5226c69a7949c1bb53fde646ec5d2e135e7352b69dd608ea3ab9543f359fc70990196345a10926124d0a95690f70b2123529d61070628c138964546bbbff0784 SHA512 1d587b192a9debead88449249bfd410a2c85ce6d090ef5afe65b3f95e17c4e45de6cfb6de9c787a93cffb7951d9f27086d3315aeff7c343fa2729bca0138d1d9
 DIST kwallet-5.99.0.tar.xz 333436 BLAKE2B 915fb97743be3f0dd8068e1a507bf51f490814b15153599fcd530805df69bfc69ae7de11ce2b31b27ef8eb6bfe6d719b2c7ce1159eec1e932b8fd1655d10a7bb SHA512 21310271f8acd92d05c985ae90bb5f25482c251245a396557719500de8a3562e0487dec26110b4956837ccf99cb83461b6d1d57cf5925b914dafd04cdef33e24
-EBUILD kwallet-5.101.0-r1.ebuild 1440 BLAKE2B 542cd3c275a9c7f326da2963f086ba1f52b22f2cd94a3490d694098ecc901ccf0ab144637363177d190a9b3d086a008c0258dc5d46795f9c02a6c06ef5b1ba73 SHA512 16049eb85b2cd8fb19bc4a1c60f9428d57fe9a83e59e51fc2279e51bfc9a0d8a2ad647714394b33948d28ef6e1aef09631a498d9ccb56ecf8e6f805762273ab9
+EBUILD kwallet-5.101.0-r2.ebuild 1437 BLAKE2B bf63c6aab5955fc4fe3af7bfdadc08ef9e9e829007c2da94fbefe34038694e21a77e0671e7f8aa99fd155cea7b25e3e7e96094bc6de42d3d7dfc89f866400164 SHA512 7589c6fa070ea62031a76ae20eb048882fc12413efb92bef14ae9bc6dbbb01dc48b3852c827bdb3909ea711cca4b7f6493dd197a97daeff4e036588c091d667c
 EBUILD kwallet-5.99.0.ebuild 1424 BLAKE2B 25cd8b6e2ec6f3ba82234cad6309f25e36b30e1a89a4e8397a23a2cba30f3ba9f595153a6989c43810958b35bfff853bdf37422f5626120b8fd37372df4b4527 SHA512 2af8fe6199b609e491f3cda52df15d8e68d59e827137627fa89b96ac196b93d0dcd401a07442d329bba6c0cf8c295485bc14107da9764c540349d264a6e75232
 MISC metadata.xml 586 BLAKE2B 7ab7b780f8861068d289d9563a6a81ee660265764db00a7be316a1242fc56689af895248783ee8814b95f46ce35bfa7533d511b2c47b1170b46ae0ba96aa92e5 SHA512 f0d5748631151406a2baf5401386cf644a8d373651e44858f336741a8eecffe1b3c2967b10925fdd9490a050740b3f9eba781f2aacee13fcd211c3145c625a3c
diff --git a/kde-frameworks/kwallet/kwallet-5.101.0-r1.ebuild b/kde-frameworks/kwallet/kwallet-5.101.0-r2.ebuild
index d5655c7687e3..2869c90371c9 100644
--- a/kde-frameworks/kwallet/kwallet-5.101.0-r1.ebuild
+++ b/kde-frameworks/kwallet/kwallet-5.101.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ DEPEND="
 	=kde-frameworks/knotifications-${PVCUT}*:5
 	=kde-frameworks/kservice-${PVCUT}*:5
 	=kde-frameworks/kwidgetsaddons-${PVCUT}*:5
-	=kde-frameworks/kwindowsystem-${PVCUT}*:5[X]
+	=kde-frameworks/kwindowsystem-${PVCUT}*:5
 	gpg? ( >=app-crypt/gpgme-1.7.1:=[cxx,qt5] )
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 3fac06647bf8..64f9b12f8f74 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,7 @@
+AUX kwindowsystem-5.101.0-always-provide-KX11Extras.patch 1313 BLAKE2B 3755d45569972c3df9dae5462a5952ae0fb5e5bf4d8401afaecc132eba08c018f06cec684560acb8467749606febafefce300ea9020a23898a805a2bb26a694a SHA512 e74329470a9ad65fa05c52b0ca995feadf01a6c926ccf2ec9a5f42400f373e913f5926e1889494d6125d15eed0ea5928e59af02aa49c72a77258c6e61d4d3e02
+AUX kwindowsystem-5.101.0-cmake.patch 1521 BLAKE2B 8b9eecd287a54ccb6baff6deea7eff9c1a7229766d3532e0df1c5046b40893a54d9c71052b2cbf83f899c0fabbd1664a9c8dcf00b0cfcf40f509c6743680549e SHA512 0d90dcc7867786d87daeeeb3afe2094cc77af98596feda5b5db17c6468da81c15fd5d8cb4301127a4d537fcdfd86f044e5ccc492b939f76782a94dd129e9d31c
 DIST kwindowsystem-5.101.0.tar.xz 2435020 BLAKE2B 1f1834eeea3fb0fc0c9bcb0141532fec62ef510122b0a3adef650de0f4c35a5a5acbb8bc9e5a03847f6025071b3eed386a897700d283b1e8b5cf0982bbaaa847 SHA512 86518f0f96a1e364bed48c00fb824a5a61226cb0ca0132f051c2a315cd7df6076c2bbbee0e3e14aff936a7fa60d44ca61f7ae6f20508474b2a02a380d8310ab2
 DIST kwindowsystem-5.99.0.tar.xz 182540 BLAKE2B c4789c96b65ba678e32264cb28c344866c39a08007a5324876247c3e823825202b8314c402e5a854569b6b459dabbcf8ffbc9bf8bd4c58ac95ef6eb8ff8e2cff SHA512 91719c273730693cd49dcd4a94701190d983a9c64a74cbd66143901efd77de8e78a6fffb0cc289888567ce66541ca64685458cac932b6fd7333e18a38487c1bd
-EBUILD kwindowsystem-5.101.0.ebuild 939 BLAKE2B 591321c3a882d37745aaf9605e03539bc341be2f7d580da6bc303baf667d896851c0fff8180a1220206539e1616f5b660afd76ee69470aee59210c1becb6b87c SHA512 e9fc1b3fecc69c13f24333d704c052ed92e2c331bc7a0c6f48e5488691d5f4b070b9dc1b43d3dde79d59bdc34ffcd502ce383ca693a3cb281ae91289211b2f31
+EBUILD kwindowsystem-5.101.0-r1.ebuild 1060 BLAKE2B 9faebbaa6221c808cb9e1185e29cef174a369127d44fb13142a3be2ac9bbf24ddc7bb8fbf6a58d5a426309c8d302a915c02e54c74750272a1b4dfd748c41bd0a SHA512 a048e7c4ed03900afa0a0b8336e8e63bb98cf1bed759125dba788f4754abac353eeb891bbf96238b62e1e528156d89bd0e59ab98229da6df40767d3e68876ee6
 EBUILD kwindowsystem-5.99.0-r1.ebuild 936 BLAKE2B 40e28fc73ab17309cf56c8905bfa6884edd53f1b4a5af60993dcaa1f93e04e320b6ea5fe5f17135ae5c2f26c80a3dc821baece2757e75768265449b6ddbf2b10 SHA512 88d097c65a055fe68bb4506b46d548f594fda1e9ea7d859854e707553b24dae1fe8f841bbe43a126181a17d07b605944a0c0520241599a11f259578563367bec
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch
new file mode 100644
index 000000000000..94c019c82e5b
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-always-provide-KX11Extras.patch
@@ -0,0 +1,45 @@
+From 9f4229d2628d882b5aa2248546ad23f2e8d280dd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 5 Jan 2023 13:38:38 +0100
+Subject: [PATCH 2/2] Always provide KX11Extras
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 27577ef..fb7c28e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -36,6 +36,10 @@ ecm_qt_declare_logging_category(KF5WindowSystem
+     EXPORT KWINDOWSYSTEM
+ )
+ 
++target_sources(KF5WindowSystem PRIVATE
++    kx11extras.cpp
++)
++
+ if (KWINDOWSYSTEM_HAVE_X11)
+    if(NOT X11_Xfixes_LIB)
+       message(FATAL_ERROR "The XFixes library could not be found. Please install the development package for it.")
+@@ -71,7 +75,6 @@ if (KWINDOWSYSTEM_HAVE_X11)
+         platforms/xcb/kxmessages.cpp
+         platforms/xcb/kxutils.cpp
+         platforms/xcb/netwm.cpp
+-        kx11extras.cpp
+    )
+ 
+    # we install kkeyserver_x11.h which needs the X11 headers available
+@@ -149,7 +152,7 @@ ecm_generate_headers(KWindowSystem_HEADERS
+   REQUIRED_HEADERS KWindowSystem_HEADERS
+ )
+ 
+-if (KWINDOWSYSTEM_HAVE_X11)
++if (TRUE)
+     ecm_generate_headers(KWindowSystem_HEADERS
+     HEADER_NAMES
+     KX11Extras
+-- 
+2.39.0
+
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-cmake.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-cmake.patch
new file mode 100644
index 000000000000..721f1ee997c4
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.101.0-cmake.patch
@@ -0,0 +1,48 @@
+From 765dd7112f728369d63e3be91c844e0cdf8674c1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 5 Jan 2023 13:21:00 +0100
+Subject: [PATCH 1/2] Merge two KWINDOWSYSTEM_HAVE_X11 sections into one
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/CMakeLists.txt | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 163ea38..27577ef 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -36,16 +36,6 @@ ecm_qt_declare_logging_category(KF5WindowSystem
+     EXPORT KWINDOWSYSTEM
+ )
+ 
+-if (KWINDOWSYSTEM_HAVE_X11)
+-  target_sources(KF5WindowSystem PRIVATE
+-    platforms/xcb/kselectionowner.cpp
+-    platforms/xcb/kselectionwatcher.cpp
+-    platforms/xcb/kxerrorhandler.cpp
+-    platforms/xcb/kxutils.cpp
+-    kx11extras.cpp
+-  )
+-endif()
+-
+ if (KWINDOWSYSTEM_HAVE_X11)
+    if(NOT X11_Xfixes_LIB)
+       message(FATAL_ERROR "The XFixes library could not be found. Please install the development package for it.")
+@@ -75,8 +65,13 @@ if (KWINDOWSYSTEM_HAVE_X11)
+ 
+    target_sources(KF5WindowSystem PRIVATE
+         platforms/xcb/kkeyserver.cpp
++        platforms/xcb/kselectionowner.cpp
++        platforms/xcb/kselectionwatcher.cpp
++        platforms/xcb/kxerrorhandler.cpp
+         platforms/xcb/kxmessages.cpp
++        platforms/xcb/kxutils.cpp
+         platforms/xcb/netwm.cpp
++        kx11extras.cpp
+    )
+ 
+    # we install kkeyserver_x11.h which needs the X11 headers available
+-- 
+2.39.0
+
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.101.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.101.0-r1.ebuild
index 0006cc7dcf06..4841645c5e3c 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.101.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.101.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,6 +34,11 @@ PDEPEND="wayland? ( >=kde-plasma/kwayland-integration-5.25.5-r1:5 )"
 
 DOCS=( docs/README.kstartupinfo )
 
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch" # KF 5.102
+	"${FILESDIR}/${P}-always-provide-KX11Extras.patch" # bug 885525
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DKWINDOWSYSTEM_NO_WIDGETS=ON