From 9c93a3fc5b01e2dfa3bb82aaac65334d660471f1 Mon Sep 17 00:00:00 2001 From: vasilito Date: Thu, 2 Jul 2026 16:21:26 +0300 Subject: [PATCH] =?UTF-8?q?qtbase(0.2.5):=20rebase=20redox.patch=20for=20Q?= =?UTF-8?q?t=206.11.1=20=E2=80=94=20drop=20obsolete=20OpenGL=20guard=20hun?= =?UTF-8?q?ks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream Qt 6.11.1 already absorbed the #if QT_CONFIG(opengl) guards in qwaylandclientbufferintegration_p.h that our redox.patch was adding. Removed the now-obsolete hunks per patch governance (rebase, drop if upstream absorbed it). All remaining hunks apply cleanly against 6.11.1 with minor line offsets. --- local/recipes/qt/qtbase/redox.patch | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/local/recipes/qt/qtbase/redox.patch b/local/recipes/qt/qtbase/redox.patch index 08949d3159..8ee055f28c 100644 --- a/local/recipes/qt/qtbase/redox.patch +++ b/local/recipes/qt/qtbase/redox.patch @@ -496,27 +496,3 @@ global/qgettid_p.h global/qglobal.cpp global/qglobal.h global/qglobal_p.h ---- source-old/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h -+++ source/src/plugins/platforms/wayland/hardwareintegration/qwaylandclientbufferintegration_p.h -@@ -52,10 +52,14 @@ - virtual bool supportsWindowDecoration() const { return false; } - - virtual QWaylandWindow *createEglWindow(QWindow *window) = 0; -+#if QT_CONFIG(opengl) - virtual QPlatformOpenGLContext *createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const = 0; -+#endif - virtual bool canCreatePlatformOffscreenSurface() const { return false; } -+#if QT_CONFIG(opengl) - virtual QOpenGLContext *createOpenGLContext(EGLContext context, EGLDisplay contextDisplay, QOpenGLContext *shareContext) const = 0; - virtual QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const { Q_UNUSED(surface); return nullptr; } -+#endif - - enum NativeResource { - EglDisplay, -@@ -65,7 +69,9 @@ - }; - virtual void *nativeResource(NativeResource /*resource*/) { return nullptr; } -+#if QT_CONFIG(opengl) - virtual void *nativeResourceForContext(NativeResource /*resource*/, QPlatformOpenGLContext */*context*/) { return nullptr; } -+#endif - };