gentoo auto-resync : 03:04:2025 - 01:34:01

4 files changed, 6 insertions, 66 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 9f5477f3387a..5ecba7b41ef7 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,5 @@
-AUX kwin-6.3.3-remove-pragma.patch 858 BLAKE2B b3be15d6ee083e0626850a8113c1e14549b4bb21b532fc4eeb9f4cb99932d7fc5364f60b069a9b93a206c338b100854b940f70475f3a6cebb095c765f6ef0d9a SHA512 5efb2fc90ee819f45aa02d17d0ce8bb4977e77e52b44a150cb8e9e8175af47341c6e8d357417f2bd53d7184c70db43f77f44847344ef5dc6606c8171b0d028d0
-AUX kwin-6.3.3-version.patch 655 BLAKE2B 171e7e60d90d4f0e9e49acaf2adaba4d7dd526e132f993a2816d6abaf0e6ba225cb1d5f0d082ef9e5d5f4cb854875a20f2e74a2bb69c5a492a93c23e31fa59e2 SHA512 44c72786fd102afc834d912a6ffa8b1872381bcf4fcf5393126c0636c182f9e4977285d9529335238bfd35fe3fe6b5509ecdf893a6b027c9cb6a435377499fe4
 DIST kwin-6.2.5.tar.xz 8563352 BLAKE2B 9a1ac80c337722d6a6411c338ac31f14f542f6d84505cc65c66e1ceedea2b88cbc9dabba68c42acf5dbace28b62e04cadc09a010a7972bc5ceb22d79344033fe SHA512 06a78d41003f2fb676f3cadca21a1e26a0006b78dcd9188c09d92fbc45f934aa9e923a69013b1cb496396d924a1848feb136d3016d64e14eca9cc525743b095b
-DIST kwin-6.3.3.tar.xz 8968752 BLAKE2B 7e27db7b93ec4b37bb139adf2e37a969525ed37b7a4ac51e529129ca433891afdd262ccf65a1bbcc9baf885c94ccefcdf397302a291b146117247110eb5c25f0 SHA512 1504a71162e90f458a42e86646e816234c4aa98b1bb884670545ae9e47b6d567d6b27dd09ac6a7337f84cb06db28d2c43e7997d0a65c9a3ac243ede8715183ea
+DIST kwin-6.3.4.tar.xz 8977144 BLAKE2B c60e38763f74ecfa137b3cb0c37af9e537242032d8c3df6be0df4d78836c07f7cf2ad0be35d3fc545a9fab2e543d7aefcacb1f0358f3c5d296545dc827e8d55a SHA512 34205039e0499a988babdb7081df4d908c2b1e8d93cd4f8d6fff14c275b54ab0f5e80b5ca830612f5176d11969e71fe4174b806fb9da3ab04580caa88463131f
 EBUILD kwin-6.2.5.ebuild 4338 BLAKE2B 7d9ee1ed1aa206230a23efdbb00a9a12b3094ee803bc5dabc74baf5dfdfa325f56a93194e2ecb24863266271973ef3bb011d4fd4acaf595f445f5a4edba5a184 SHA512 044f0f5e4336069826772e335264d5968a620acad76fe73f8d9debe88bf51ac87ed5e980286a3089aaa17c99ef677c88fb7fd6ca7906455470d560eb8a5ea285
-EBUILD kwin-6.3.3.ebuild 4605 BLAKE2B 90dc4c7d9d65a00d5618aa96c8897d5994a4e8354fe116d19865ae1c893aa198f2db8a7ac8bf2e757e622129a8ad7082950224d8266489b3b09df1f47a54adc7 SHA512 ea427aabf02dc50139b4ee6d2cbbc269c3b4074a22395ab16d578ecc9b33365ed0df7b42382ab6f9b5cac829546edc4c0bb114abc0e7005bb16569a6986d8ed0
+EBUILD kwin-6.3.4.ebuild 4482 BLAKE2B 91d1b51badb93832235358a65bad3e4dffce9fdbb15ef3b6ed9a9897e52e45615991e6725794a93c68ba36b3235a8b4413986812582a7f42eb08c07047be02c3 SHA512 f0e7645f12a096e9edec213b3994afe72c5e9a3e2ffc8b4ca663adfcf7de96e11bde02452a5a4fceb95187cb980efcd6efbfdf8caf6701ea37dc56cc3e91c4cb
 MISC metadata.xml 677 BLAKE2B 050345f8f8f489b3cb81e112c05fddedc738c8f136d409b8754c54494a02caf5671a66dd1ecd7cfb91f24ab11210c67f78c09c928a4daf16b3512600649551c5 SHA512 5134373a0ce30f351344c07df4a68f97a15bf3bdb061ba8ff3355a42da2281d64bb506cdcb5b1dad698fc2061b4a4a92e054e08c521acb327b84f968a7d936dc
diff --git a/kde-plasma/kwin/files/kwin-6.3.3-remove-pragma.patch b/kde-plasma/kwin/files/kwin-6.3.3-remove-pragma.patch
deleted file mode 100644
index 556a41681423..000000000000
--- a/kde-plasma/kwin/files/kwin-6.3.3-remove-pragma.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a3249e495907f0090119fc92e5d33530e0c4c285 Mon Sep 17 00:00:00 2001
-From: Ismael Asensio <isma.af@gmail.com>
-Date: Tue, 11 Mar 2025 20:48:15 +0100
-Subject: [PATCH] kcms/rules: Remove pragma on OptionsComboBox
-
-It is suggested by qmlls, but this seems to cause graphical artifacts
-on some systems, rendering the comboboxes unusable
-
-BUG: 501357
----
- src/kcms/rules/ui/OptionsComboBox.qml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/kcms/rules/ui/OptionsComboBox.qml b/src/kcms/rules/ui/OptionsComboBox.qml
-index 5a5d02eee9..d8a2eb8bf0 100644
---- a/src/kcms/rules/ui/OptionsComboBox.qml
-+++ b/src/kcms/rules/ui/OptionsComboBox.qml
-@@ -11,8 +11,6 @@ import QtQuick.Controls as QQC2
- import org.kde.kirigami 2.10 as Kirigami
- import org.kde.kcms.kwinrules
- 
--pragma ComponentBehavior: Bound
--
- 
- QQC2.ComboBox {
-     id: optionsCombo
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/files/kwin-6.3.3-version.patch b/kde-plasma/kwin/files/kwin-6.3.3-version.patch
deleted file mode 100644
index cfb544b4d7fc..000000000000
--- a/kde-plasma/kwin/files/kwin-6.3.3-version.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0005710eccdf702915ec776830c79102a6b66f1b Mon Sep 17 00:00:00 2001
-From: Jonathan Riddell <jr@jriddell.org>
-Date: Tue, 25 Feb 2025 16:45:29 +0000
-Subject: [PATCH] update version for new release
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6ab65f06bf8..61932a493c1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,6 +1,6 @@
- cmake_minimum_required(VERSION 3.16)
- 
--set(PROJECT_VERSION "6.3.2") # Handled by release scripts
-+set(PROJECT_VERSION "6.3.3") # Handled by release scripts
- project(KWin VERSION ${PROJECT_VERSION})
- 
- set(CMAKE_C_STANDARD 99)
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/kwin-6.3.3.ebuild b/kde-plasma/kwin/kwin-6.3.4.ebuild
index 6dad38dd8eb3..31fe9e72e38a 100644
--- a/kde-plasma/kwin/kwin-6.3.3.ebuild
+++ b/kde-plasma/kwin/kwin-6.3.4.ebuild
@@ -19,16 +19,18 @@ IUSE="accessibility gles2-only lock screencast +shortcuts systemd"
 RESTRICT="test"
 
 # qtbase slot op: GuiPrivate use in tabbox
+# qtbase[X]: private/qtx11extras_p.h in src/helpers/killer
 COMMON_DEPEND="
 	dev-libs/libei
 	>=dev-libs/libinput-1.27:=
 	>=dev-libs/wayland-1.23.0
 	>=dev-qt/qt5compat-${QTMIN}:6[qml]
-	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets]
+	>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets,X]
 	>=dev-qt/qtdeclarative-${QTMIN}:6
 	>=dev-qt/qtsensors-${QTMIN}:6
 	>=dev-qt/qtshadertools-${QTMIN}:6
 	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qtwayland-${QTMIN}:6
 	>=kde-frameworks/kauth-${KFMIN}:6
 	>=kde-frameworks/kcmutils-${KFMIN}:6
 	>=kde-frameworks/kcolorscheme-${KFMIN}:6
@@ -61,7 +63,7 @@ COMMON_DEPEND="
 	>=media-libs/libdisplay-info-0.2.0:=
 	media-libs/libepoxy
 	media-libs/libglvnd
-	>=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X]
+	>=media-libs/mesa-24.1.0_rc1[opengl,wayland,X]
 	virtual/libudev:=
 	x11-libs/libX11
 	x11-libs/libXi
@@ -73,7 +75,6 @@ COMMON_DEPEND="
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
 	accessibility? ( media-libs/libqaccessibilityclient:6 )
-	gles2-only? ( >=media-libs/mesa-24.1.0_rc1 )
 	lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 )
 	screencast? ( >=media-video/pipewire-1.2.0:= )
 	shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 )
@@ -100,7 +101,6 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-libs/wayland-protocols-1.38
 	>=dev-qt/qttools-${QTMIN}:6[widgets]
 	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
-	>=dev-qt/qtwayland-${QTMIN}:6
 	x11-base/xorg-proto
 	x11-libs/xcb-util-image
 	test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
@@ -115,11 +115,6 @@ BDEPEND="
 # -m 0755 to avoid suid with USE="-filecaps"
 FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland )
 
-PATCHES=(
-	"${FILESDIR}/${P}-version.patch" # temp. downstream fix
-	"${FILESDIR}/${P}-remove-pragma.patch" # MR 7317, KDE-Bug: 501357
-)
-
 src_prepare() {
 	ecm_src_prepare