commit:     de88a7dda6f5571494049a8c5e8415c26980cf51
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 15 21:53:42 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 15 21:54:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de88a7dd

kde-plasma/kwin-x11: Fix build with Qt 6.11 and Qt 6.10.2

Upstream commit 0b50e226301cf72aa39188bcca1ae64d70a7d8ec

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kwin-x11-6.5.4-fix-qt-6.10.2.patch       | 50 ++++++++++++++++++++++
 kde-plasma/kwin-x11/kwin-x11-6.5.4.ebuild          |  2 +
 2 files changed, 52 insertions(+)

diff --git a/kde-plasma/kwin-x11/files/kwin-x11-6.5.4-fix-qt-6.10.2.patch 
b/kde-plasma/kwin-x11/files/kwin-x11-6.5.4-fix-qt-6.10.2.patch
new file mode 100644
index 000000000000..d4c40b1cf374
--- /dev/null
+++ b/kde-plasma/kwin-x11/files/kwin-x11-6.5.4-fix-qt-6.10.2.patch
@@ -0,0 +1,50 @@
+From 0b50e226301cf72aa39188bcca1ae64d70a7d8ec Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <[email protected]>
+Date: Tue, 9 Dec 2025 12:42:51 +0000
+Subject: [PATCH] plugins/qpa: Fix build with Qt 6.11 and Qt 6.10.2
+
+(cherry picked from commit 9f9cf05f70d0cdecf70f0025d61161aaa6611c7e)
+
+Co-authored-by: Vlad Zahorodnii <[email protected]>
+---
+ src/plugins/qpa/integration.cpp | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/src/plugins/qpa/integration.cpp b/src/plugins/qpa/integration.cpp
+index cf761fd088..1b98a335b0 100644
+--- a/src/plugins/qpa/integration.cpp
++++ b/src/plugins/qpa/integration.cpp
+@@ -88,16 +88,15 @@ bool Integration::hasCapability(Capability cap) const
+ {
+     switch (cap) {
+     case ThreadedPixmaps:
+-        return true;
+     case OpenGL:
+-        return true;
+-    case ThreadedOpenGL:
+-        return false;
+-    case BufferQueueingOpenGL:
+-        return false;
+     case MultipleWindows:
+     case NonFullScreenWindows:
++#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 2)
++    case OffscreenSurface:
++#endif
+         return true;
++    case ThreadedOpenGL:
++    case BufferQueueingOpenGL:
+     case RasterGLSurface:
+         return false;
+     default:
+@@ -140,7 +139,7 @@ QPlatformWindow *Integration::createPlatformWindow(QWindow 
*window) const
+ 
+ QPlatformOffscreenSurface 
*Integration::createPlatformOffscreenSurface(QOffscreenSurface *surface) const
+ {
+-    return new OffscreenSurface(surface);
++    return new KWin::QPA::OffscreenSurface(surface);
+ }
+ 
+ QPlatformFontDatabase *Integration::fontDatabase() const
+-- 
+GitLab
+

diff --git a/kde-plasma/kwin-x11/kwin-x11-6.5.4.ebuild 
b/kde-plasma/kwin-x11/kwin-x11-6.5.4.ebuild
index deecb65d4272..43608472ecc5 100644
--- a/kde-plasma/kwin-x11/kwin-x11-6.5.4.ebuild
+++ b/kde-plasma/kwin-x11/kwin-x11-6.5.4.ebuild
@@ -100,6 +100,8 @@ BDEPEND="
 "
 BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
 
+PATCHES=( "${FILESDIR}/${P}-fix-qt-6.10.2.patch" )
+
 src_prepare() {
        ecm_src_prepare
 

Reply via email to