From 4c3d896550ae46e99ddd2da601356b7618baef10 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Tue, 7 Oct 2025 17:11:25 +0300
Subject: [PATCH] qt6-6.9.3

---
 .../qtwebengine-6.9.2-QTBUG-139424.patch      | 70 ++++++++++++++++---
 desktop/toolkit/qt6/qt6-webengine/pspec.xml   | 41 ++++++-----
 2 files changed, 83 insertions(+), 28 deletions(-)

diff --git a/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-6.9.2-QTBUG-139424.patch b/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-6.9.2-QTBUG-139424.patch
index 340bf86ae8..59f1dcfa68 100644
--- a/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-6.9.2-QTBUG-139424.patch
+++ b/desktop/toolkit/qt6/qt6-webengine/files/qtwebengine-6.9.2-QTBUG-139424.patch
@@ -1,11 +1,21 @@
-Revert of [1] from [2] for [3][4]
-[1] https://github.com/qt/qtwebengine/commit/812bf186b15
-[2] https://bugreports.qt.io/browse/QTBUG-136257
-[3] https://bugreports.qt.io/browse/QTBUG-139424
-[4] https://bugs.gentoo.org/962055
+Revert of [1]+[2] from [3] for [4][5]
+[1] https://github.com/qt/qtwebengine/commit/ddcd30454a
+[2] https://github.com/qt/qtwebengine/commit/9168bc6f53
+[3] https://bugreports.qt.io/browse/QTBUG-136257
+[4] https://bugreports.qt.io/browse/QTBUG-139424
+[5] https://bugs.gentoo.org/962055
 --- a/src/core/ozone/egl_helper.cpp
 +++ b/src/core/ozone/egl_helper.cpp
-@@ -60,2 +60,80 @@
+@@ -7,5 +7,7 @@
+ #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>
+@@ -58,4 +60,82 @@
+ QT_BEGIN_NAMESPACE
  
 +class ScopedGLContext
 +{
@@ -86,16 +96,36 @@ Revert of [1] from [2] for [3][4]
 +};
 +
  EGLHelper::EGLFunctions::EGLFunctions()
-@@ -66,4 +144,2 @@
+ {
+@@ -64,6 +144,4 @@
+     eglCreateImage =
              reinterpret_cast<PFNEGLCREATEIMAGEPROC>(context->getProcAddress("eglCreateImage"));
 -    eglCreateDRMImageMESA = reinterpret_cast<PFNEGLCREATEDRMIMAGEMESAPROC>(
 -            context->getProcAddress("eglCreateDRMImageMESA"));
      eglDestroyImage =
-@@ -124,3 +200,2 @@
+             reinterpret_cast<PFNEGLDESTROYIMAGEPROC>(context->getProcAddress("eglDestroyImage"));
+@@ -94,4 +172,5 @@
+     : 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);
+@@ -111,4 +190,7 @@
+     }
+ 
++    Q_ASSERT(QThread::currentThread() == qApp->thread());
++    m_offscreenSurface->create();
++
+     m_isDmaBufSupported = QtWebEngineCore::WebEngineContext::isGbmSupported();
+ 
+@@ -118,5 +200,4 @@
+         m_isDmaBufSupported = strstr(displayExtensions, "EGL_EXT_image_dma_buf_import")
                  && strstr(displayExtensions, "EGL_EXT_image_dma_buf_import_modifiers")
 -                && strstr(displayExtensions, "EGL_MESA_drm_image")
                  && strstr(displayExtensions, "EGL_MESA_image_dma_buf_export");
-@@ -145,13 +220,15 @@
+     }
+@@ -139,15 +220,17 @@
+         return;
  
 -    // clang-format off
 -    EGLint attribs[] = {
@@ -121,13 +151,31 @@ Revert of [1] from [2] for [3][4]
 +    EGLImage eglImage = m_functions->eglCreateImage(m_eglDisplay, eglContext, EGL_GL_TEXTURE_2D,
 +                                                    (EGLClientBuffer)textureId, NULL);
      if (eglImage == EGL_NO_IMAGE) {
+         qWarning("EGL: Failed to create EGLImage: %s", getLastEGLErrorString());
 --- a/src/core/ozone/egl_helper.h
 +++ b/src/core/ozone/egl_helper.h
-@@ -13,3 +13,2 @@
+@@ -13,5 +13,4 @@
+ 
  #undef eglCreateImage
 -#undef eglCreateDRMImageMESA
  #undef eglDestroyImage
-@@ -36,3 +35,2 @@
+ #undef eglExportDMABUFImageMESA
+@@ -26,4 +25,6 @@
+ QT_BEGIN_NAMESPACE
+ 
++class QOffscreenSurface;
++
+ class EGLHelper
+ {
+@@ -34,5 +35,4 @@
+ 
          PFNEGLCREATEIMAGEPROC eglCreateImage;
 -        PFNEGLCREATEDRMIMAGEMESAPROC eglCreateDRMImageMESA;
          PFNEGLDESTROYIMAGEPROC eglDestroyImage;
+         PFNEGLEXPORTDMABUFIMAGEMESAPROC eglExportDMABUFImageMESA;
+@@ -60,4 +60,5 @@
+     EGLDisplay m_eglDisplay = EGL_NO_DISPLAY;
+     QScopedPointer<EGLFunctions> m_functions;
++    QScopedPointer<QOffscreenSurface> m_offscreenSurface;
+     bool m_isDmaBufSupported = false;
+ };
diff --git a/desktop/toolkit/qt6/qt6-webengine/pspec.xml b/desktop/toolkit/qt6/qt6-webengine/pspec.xml
index d8fd56b039..ce742dc250 100755
--- a/desktop/toolkit/qt6/qt6-webengine/pspec.xml
+++ b/desktop/toolkit/qt6/qt6-webengine/pspec.xml
@@ -12,7 +12,7 @@
     <Description>Provides support for web applications using the Chromium browser project</Description>
     <License>LGPLv2.1-linking-exception</License>
     <Icon>qt-logo</Icon>
-    <Archive sha1sum="66b4fcc8975555f2840af1fa47dcf4d0e761c65c" type="tarxz">https://download.qt.io/official_releases/qt/6.9/6.9.2/submodules/qtwebengine-everywhere-src-6.9.2.tar.xz</Archive>
+    <Archive sha1sum="320cbba4c20d8f90214864eecb2e6c2606ffa5b9" type="tarxz">https://download.qt.io/official_releases/qt/6.9/6.9.3/submodules/qtwebengine-everywhere-src-6.9.3.tar.xz</Archive>
     <BuildDependencies>
       <Dependency>git</Dependency>
       <Dependency>wget</Dependency>
@@ -77,14 +77,14 @@
       <Dependency versionFrom="2.7.13">python-devel</Dependency>
       <Dependency versionFrom="3.2.4">ffmpeg-devel</Dependency>
       <Dependency versionFrom="3.8.10">python3-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-base-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-base-devel</Dependency>
       <Dependency versionFrom="2.7.1">freetype-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-sensors-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-designer-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-webchannel-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-websockets-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-declarative-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-positioning-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-sensors-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-designer-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-webchannel-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-websockets-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-declarative-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-positioning-devel</Dependency>
     </BuildDependencies>
     <Patches>
       <Patch level="1">qtwebengine-link-pipewire.patch</Patch>
@@ -149,10 +149,10 @@
       <Dependency>libjpeg-turbo</Dependency>
       <Dependency>pulseaudio-libs</Dependency>
       <Dependency versionFrom="2.7.1">freetype</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-base</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-webchannel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-positioning</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-declarative</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-base</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-webchannel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-positioning</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-declarative</Dependency>
     </RuntimeDependencies>
   </Package>
   <Package>
@@ -164,22 +164,29 @@
     </Files>
     <RuntimeDependencies>
       <Dependency release="current">qt6-webengine</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-base-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-webchannel-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-declarative-devel</Dependency>
-      <Dependency versionFrom="6.9.2">qt6-positioning-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-base-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-webchannel-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-declarative-devel</Dependency>
+      <Dependency versionFrom="6.9.3">qt6-positioning-devel</Dependency>
     </RuntimeDependencies>
   </Package>
   <!--Package>
         <Name>qt6-webengine-docs</Name>
         <RuntimeDependencies>
-            <Dependency versionFrom="6.9.2">qt6-base</Dependency>
+            <Dependency versionFrom="6.9.3">qt6-base</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package-->
     <History>
+        <Update release="19">
+            <Date>2025-10-07</Date>
+            <Version>6.9.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
       <Update release="18">
         <Date>2025-09-02</Date>
         <Version>6.9.2</Version>