From 6439083dfcdd0fefd2a3bb0cfa78ba864761f771 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 21 Oct 2025 20:04:51 +0200
Subject: [PATCH] 6.9.3

---
 .gitignore                               |  1 +
 qt6-qtwebengine.spec                     |  7 +++-
 qtwebengine-revert-create-eglimage.patch | 53 ++++++++++++++++++++++++
 sources                                  |  2 +-
 4 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 11326d2..1c76f4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /qtwebengine-everywhere-src-6.9.0-clean.tar.xz
 /qtwebengine-everywhere-src-6.9.1-clean.tar.xz
 /qtwebengine-everywhere-src-6.9.2-clean.tar.xz
+/qtwebengine-everywhere-src-6.9.3-clean.tar.xz
diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec
index 342f0cd..6bb2607 100644
--- a/qt6-qtwebengine.spec
+++ b/qt6-qtwebengine.spec
@@ -85,8 +85,8 @@
 
 Summary: Qt6 - QtWebEngine components
 Name:    qt6-qtwebengine
-Version: 6.9.2
-Release: 2%{?dist}
+Version: 6.9.3
+Release: 1%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@@ -847,6 +847,9 @@ done
 %endif
 
 %changelog
+* Tue Oct 21 2025 Jan Grulich <jgrulich@redhat.com> - 6.9.3-1
+- 6.9.3
+
 * Mon Sep 08 2025 Sandro Mani <manisandro@gmail.com> - 6.9.2-2
 - Revert commit bcee2dbf412cc655c1b467091b581c696d234e3f
 
diff --git a/qtwebengine-revert-create-eglimage.patch b/qtwebengine-revert-create-eglimage.patch
index 2d4d6f9..0053f12 100644
--- a/qtwebengine-revert-create-eglimage.patch
+++ b/qtwebengine-revert-create-eglimage.patch
@@ -151,3 +151,56 @@ diff -rupN qtwebengine-everywhere-src-6.9.2/src/core/ozone/egl_helper.h qtwebeng
          PFNEGLDESTROYIMAGEPROC eglDestroyImage;
          PFNEGLEXPORTDMABUFIMAGEMESAPROC eglExportDMABUFImageMESA;
          PFNEGLEXPORTDMABUFIMAGEQUERYMESAPROC eglExportDMABUFImageQueryMESA;
+diff --git a/src/core/ozone/egl_helper.cpp b/src/core/ozone/egl_helper.cpp
+index 76e1c2a46..d3f76e0ce 100644
+--- a/src/core/ozone/egl_helper.cpp
++++ b/src/core/ozone/egl_helper.cpp
+@@ -6,7 +6,9 @@
+ #include "ozone_util_qt.h"
+ #include "web_engine_context.h"
+ 
++#include <QtCore/qthread.h>
+ #include <QtGui/qguiapplication.h>
++#include <QtGui/qoffscreensurface.h>
+ #include <QtGui/qopenglcontext.h>
+ #include <QtGui/qopenglfunctions.h>
+ #include <qpa/qplatformnativeinterface.h>
+@@ -93,6 +95,7 @@ EGLHelper *EGLHelper::instance()
+ EGLHelper::EGLHelper()
+     : m_eglDisplay(qApp->platformNativeInterface()->nativeResourceForIntegration("egldisplay"))
+     , m_functions(new EGLHelper::EGLFunctions())
++    , m_offscreenSurface(new QOffscreenSurface())
+ {
+     const char *extensions = m_functions->eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+     if (!extensions) {
+@@ -110,6 +113,9 @@ EGLHelper::EGLHelper()
+         return;
+     }
+ 
++    Q_ASSERT(QThread::currentThread() == qApp->thread());
++    m_offscreenSurface->create();
++
+     m_isDmaBufSupported = QtWebEngineCore::WebEngineContext::isGbmSupported();
+ 
+     // Check extensions.
+diff --git a/src/core/ozone/egl_helper.h b/src/core/ozone/egl_helper.h
+index 6233ef87e..88ed6167c 100644
+--- a/src/core/ozone/egl_helper.h
++++ b/src/core/ozone/egl_helper.h
+@@ -25,6 +25,8 @@
+ 
+ QT_BEGIN_NAMESPACE
+ 
++class QOffscreenSurface;
++
+ class EGLHelper
+ {
+ public:
+@@ -59,6 +61,7 @@ private:
+ 
+     EGLDisplay m_eglDisplay = EGL_NO_DISPLAY;
+     QScopedPointer<EGLFunctions> m_functions;
++    QScopedPointer<QOffscreenSurface> m_offscreenSurface;
+     bool m_isDmaBufSupported = false;
+ };
+ 
diff --git a/sources b/sources
index 92e53a4..7dfdd4c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (qtwebengine-everywhere-src-6.9.2-clean.tar.xz) = ae31f6b057629b2690c81e1920c8ee4dab0b44262f087c42716b2a5cbece884873bb89c2f3a5f8ffa9de6501febea85c360d29f0d98d2eded5893d213ba317c9
+SHA512 (qtwebengine-everywhere-src-6.9.3-clean.tar.xz) = 2ef985ca8165bfa8eb3b3a0161cb01e0e53fea7f77cd5bebf082b5f975e8b5e915e4114c09a471cca4612ef81a1244a26b95f5c9658bdc604d9ec549e73e1e1e
 SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be