gentoo auto-resync : 29:05:2024 - 00:07:15

4 files changed, 21 insertions, 57 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index dae66030551d..ae506939eb08 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,6 @@
 AUX kwin-5.26.80-gstreamer-optional.patch 948 BLAKE2B 880e77ce6462c115953471dfd4985cc4891a05a910323c1760e01870f04a6930d6d4680811701e12094f1bc3eabbba6b097535408b9148dea4beca31496c7e35 SHA512 66e839c7d603873d675b96430ae48d89366a7f1c5019686c9471ef4fd66449bc4bc22752856665a5d90ab8e503e40d307c4671ac0c2f2991b869e211f7b46c86
-AUX kwin-6.0.2-qtgui-accessibility-optional.patch 1356 BLAKE2B ed6a4a0c98da013a71390314c92b078800242ca2aaa1391bb87046cb2ae6d270545d8fe3715afacf168989fd57a8b68c5e02b92085aec5bd083b4193fe9b32b7 SHA512 f53e97a0b1b77b0c074a3687ca67702ac5793edadd4091696e10947d0b8debe32b556570aa25a95c093e41c8b72c50195f074cd5a418163783a2bf4879cd9402
 DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b
-DIST kwin-6.0.5.tar.xz 8835880 BLAKE2B 6298438b079d4df0d48aba969ef10daa1bbd8fb3ac422c4da93d6a35426f35a3160e35b4bb7ef478d4d4051ec0b28722f2160ad1e78d013eb934e6bf5f84145a SHA512 ae4004f846f663339e44f88cad9ffc3decde2f6efb1fd50212a86a8b78138f91b0ba7d510b9508e4ccd274a9a6116fb171d8baded62573e3ddf3aedff718f757
-EBUILD kwin-5.27.11.ebuild 4244 BLAKE2B a7d67b4d73c0ea947430d50c8e40f3ff92db153bd2de367bec724784c4575c866734f651d23f738658da5647abd3d0d7f0fed30b37d31d8a819cad05a1a3b739 SHA512 a40d2fc6629a388aeca42f883372c9dd49a139a97cca5a598c2d9676c3be96ec240e5dc3d562e9d62e314db82fff01e3d2cdf8522f1821aac7364c628f3f0b13
-EBUILD kwin-6.0.5.ebuild 4050 BLAKE2B f054afc14cc5db0cb3e2752cd5529ab62417eec6a7846c03303bda1aa241f8f379f364f32a2229519900b0160878978bb1c97fbabe07b1358da44f004c85aabc SHA512 a63704cdb12605bf5cdf508a8d0f45c0ed1c104d79b3a7e7d3d35fb966a568d173bd4419b8054fc5ef6e72d43452988f4938616c3d9ac675fdff789b2cacc4d0
+DIST kwin-6.0.90.1.tar.xz 8474872 BLAKE2B eb9a2b326b3335a47fb3f57da213d48fbeb949062b7663801287e70eac0a9566ae9cebd7f242b807de76ba53208a1548c427ea379ce1e72e6ec428146356c5d8 SHA512 cf924f792184cb591c14b15f80b0533a62e7a032c8f9ad45b3faf30048826e5fcb41e90ddf582615531d4694bb817cafd615556d5f38530f42a9747f818c92a4
+EBUILD kwin-5.27.11-r1.ebuild 4305 BLAKE2B f6aacf67667be303f5bf6cf328a186f113d458560f6438c65ec1e0ea12b47d4585ac9abcb510cf817c99fd00685e2de2cf6b2b1a7e2647e0d888c4b0923e1beb SHA512 ce094346e507377f8b1d3e30ed2154886ea3195aeaf5790331e7f0e8f963841837363ab353e70b73bf1ea70b189743121c5bdf53447ba42ae815dddfabe24fea
+EBUILD kwin-6.0.90.1.ebuild 4159 BLAKE2B bb728185778b60e65ec79d1bcf16df436bf646a3e24d97ac77693847db99822dc5f511e1c51dd8f5f6854fd9e56a28ada973482bc089288dc615b4176e1f89cd SHA512 b57524853b97b16f244298773cb511205e49764acbb3ee6798bc3aa8ccf510dc4f984f680da84ffff5dbdfa56d5ada46f90d2a1768cbf631a88a4f9d4f4a97a5
 MISC metadata.xml 705 BLAKE2B 996b365c3536e5bdaf8487b2f736a31625b84497af81c3b8fa8bf46a585004f426f8bdc22a3a430936e03694a1222dd0a89789df769ef650c0d8da25bf263cd7 SHA512 569c589a88ac23dc869a6487459bd46711dc2b92c1f1cf5d19879fb363b52b76faf7d8c5805f0a9d5a13a3ab4f9f316d732e6ae475d63a950d56ad65c2f05fa4
diff --git a/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch
deleted file mode 100644
index 3bf872a6e30f..000000000000
--- a/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ade5d72c3a7e2078025ecbb3c9a354c20a8d9c90 Mon Sep 17 00:00:00 2001
-From: Aleix Pol Gonzalez <aleixpol@kde.org>
-Date: Wed, 21 Feb 2024 12:25:09 +0000
-Subject: [PATCH] qpa: Don't build SPI support if Qt wasn't build with it
-
-Signed-off-by: Falko Becker <falko.becker@mbition.io>
----
- src/plugins/qpa/integration.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/plugins/qpa/integration.cpp b/src/plugins/qpa/integration.cpp
-index 9a9195d8173..238a2e60628 100644
---- a/src/plugins/qpa/integration.cpp
-+++ b/src/plugins/qpa/integration.cpp
-@@ -33,9 +33,12 @@
- #include <QtGui/private/qgenericunixeventdispatcher_p.h>
- #include <QtGui/private/qgenericunixfontdatabase_p.h>
- #include <QtGui/private/qgenericunixthemes_p.h>
--#include <QtGui/private/qspiaccessiblebridge_p.h>
- #include <QtGui/private/qunixeventdispatcher_qpa_p.h>
- 
-+#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
-+#include <QtGui/private/qspiaccessiblebridge_p.h>
-+#endif
-+
- namespace KWin
- {
- 
-@@ -160,7 +163,9 @@ QPlatformOpenGLContext *Integration::createPlatformOpenGLContext(QOpenGLContext
- QPlatformAccessibility *Integration::accessibility() const
- {
-     if (!m_accessibility) {
-+#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE)
-         m_accessibility.reset(new QSpiAccessibleBridge());
-+#endif
-     }
-     return m_accessibility.get();
- }
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/kwin-5.27.11.ebuild b/kde-plasma/kwin/kwin-5.27.11-r1.ebuild
index b0e84b231dc1..a41c239d5468 100644
--- a/kde-plasma/kwin/kwin-5.27.11.ebuild
+++ b/kde-plasma/kwin/kwin-5.27.11-r1.ebuild
@@ -68,7 +68,10 @@ COMMON_DEPEND="
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
 	accessibility? ( media-libs/libqaccessibilityclient:5 )
-	gles2-only? ( media-libs/mesa[gles2] )
+	gles2-only? ( || (
+		>=media-libs/mesa-24.1.0_rc1[opengl]
+		<media-libs/mesa-24.1.0_rc1[gles2]
+	) )
 	lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 )
 	plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 )
 	screencast? ( >=media-video/pipewire-0.3:= )
diff --git a/kde-plasma/kwin/kwin-6.0.5.ebuild b/kde-plasma/kwin/kwin-6.0.90.1.ebuild
index 5a1121feb3cd..b571a098fece 100644
--- a/kde-plasma/kwin/kwin-6.0.5.ebuild
+++ b/kde-plasma/kwin/kwin-6.0.90.1.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 ECM_HANDBOOK="optional"
 ECM_TEST="true"
-KFMIN=6.0
+KFMIN=6.2.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=6.6.2
+QTMIN=6.7.1
 inherit ecm plasma.kde.org
 
 DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
@@ -15,16 +15,17 @@ DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
 LICENSE="GPL-2+"
 SLOT="6"
 KEYWORDS="~amd64"
-IUSE="accessibility +caps gles2-only lock screencast +shortcuts"
+IUSE="accessibility +caps gles2-only lock screencast +shortcuts systemd"
 
 RESTRICT="test"
 
 # qtbase slot up: GuiPrivate use in tabbox
 COMMON_DEPEND="
+	dev-libs/libei
 	>=dev-libs/libinput-1.19:=
 	>=dev-libs/wayland-1.22.0
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,dbus,gles2-only=,gui,libinput,opengl,widgets]
+	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsensors-${QTMIN}:6
 	>=dev-qt/qtshadertools-${QTMIN}:6
@@ -63,7 +64,7 @@ COMMON_DEPEND="
 	virtual/libudev:=
 	x11-libs/libX11
 	x11-libs/libXi
-	>=x11-libs/libdrm-2.4.112
+	>=x11-libs/libdrm-2.4.116
 	>=x11-libs/libxcb-1.10:=
 	>=x11-libs/libxcvt-0.1.1
 	>=x11-libs/libxkbcommon-1.5.0
@@ -94,11 +95,11 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-frameworks/kitemmodels-${KFMIN}:6
 	>=kde-plasma/libplasma-${PVCUT}:6[wayland]
 	sys-apps/hwdata
-	x11-base/xwayland
+	x11-base/xwayland[libei]
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/plasma-wayland-protocols-1.11.1
-	>=dev-libs/wayland-protocols-1.32
+	>=dev-libs/wayland-protocols-1.34
 	>=dev-qt/qttools-${QTMIN}:6[widgets]
 	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
 	>=dev-qt/qtwayland-${QTMIN}:6
@@ -114,10 +115,6 @@ BDEPEND="
 "
 PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-6.0.2-qtgui-accessibility-optional.patch" # bug 926935, 6.1
-)
-
 src_prepare() {
 	ecm_src_prepare
 
@@ -125,10 +122,16 @@ src_prepare() {
 	if ! use screencast; then
 		sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die
 	fi
+
+	# TODO: try to get a build switch upstreamed
+	if ! use systemd; then
+		sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
+		# TODO: KWIN_BUILD_X11?
 		# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
 		$(cmake_use_find_package accessibility QAccessibilityClient6)
 		$(cmake_use_find_package caps Libcap)