dev-qt/qtwebengine: drop 6.9.0-r1

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

2 files changed, 0 insertions, 151 deletions

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.9.0-QTBUG-133570.patch b/dev-qt/qtwebengine/files/qtwebengine-6.9.0-QTBUG-133570.patch
deleted file mode 100644
index decd83aa9b1b..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.9.0-QTBUG-133570.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-https://bugs.kde.org/show_bug.cgi?id=497691
-https://github.com/qutebrowser/qutebrowser/issues/8534
-https://bugreports.qt.io/browse/QTBUG-133570
-https://codereview.qt-project.org/c/qt/qtwebengine/+/634920
---- a/src/core/configure/BUILD.root.gn.in
-+++ b/src/core/configure/BUILD.root.gn.in
-@@ -406,4 +406,5 @@
-         "//ui/base/x:gl",
-         "//ui/gfx/linux:gpu_memory_buffer_support_x11",
-+        "//ui/gfx/x",
-       ]
- 
-@@ -411,4 +412,6 @@
-         "//ui/ozone/platform/x11/gl_egl_utility_x11.cc",
-         "//ui/ozone/platform/x11/gl_egl_utility_x11.h",
-+        "//ui/ozone/platform/x11/native_pixmap_egl_x11_binding.cc",
-+        "//ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h",
-       ]
-     }
---- a/src/core/ozone/gl_ozone_angle_qt.cpp
-+++ b/src/core/ozone/gl_ozone_angle_qt.cpp
-@@ -1,5 +1,9 @@
--// Copyright (C) 2024 The Qt Company Ltd.
-+// Copyright (C) 2025 The Qt Company Ltd.
- // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
- 
-+// Copyright 2016 The Chromium Authors
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
- #include "gl_ozone_angle_qt.h"
- 
-@@ -13,4 +17,6 @@
- #if BUILDFLAG(IS_OZONE_X11)
- #include "ozone_util_qt.h"
-+
-+#include "ui/ozone/platform/x11/native_pixmap_egl_x11_binding.h"
- #endif
- 
-@@ -21,4 +27,32 @@
- 
- namespace ui {
-+namespace {
-+// Based on //ui/ozone/platform/x11/x11_surface_factory.cc
-+enum class NativePixmapSupportType {
-+    // Importing native pixmaps not supported.
-+    kNone,
-+
-+    // Native pixmaps are imported directly into EGL using the
-+    // EGL_EXT_image_dma_buf_import extension.
-+    kDMABuf,
-+
-+    // Native pixmaps are first imported as X11 pixmaps using DRI3 and then into
-+    // EGL.
-+    kX11Pixmap,
-+};
-+
-+NativePixmapSupportType GetNativePixmapSupportType()
-+{
-+    if (gl::GLSurfaceEGL::GetGLDisplayEGL()->ext->b_EGL_EXT_image_dma_buf_import)
-+        return NativePixmapSupportType::kDMABuf;
-+
-+#if BUILDFLAG(IS_OZONE_X11)
-+    if (NativePixmapEGLX11Binding::CanImportNativeGLXPixmap())
-+        return NativePixmapSupportType::kX11Pixmap;
-+#endif
-+
-+    return NativePixmapSupportType::kNone;
-+}
-+} // namespace
- 
- bool GLOzoneANGLEQt::LoadGLES2Bindings(const gl::GLImplementationParts & /*implementation*/)
-@@ -74,5 +108,14 @@
- bool GLOzoneANGLEQt::CanImportNativePixmap(gfx::BufferFormat format)
- {
--    return gl::GLSurfaceEGL::GetGLDisplayEGL()->ext->b_EGL_EXT_image_dma_buf_import;
-+    switch (GetNativePixmapSupportType()) {
-+    case NativePixmapSupportType::kDMABuf:
-+        return NativePixmapEGLBinding::IsBufferFormatSupported(format);
-+#if BUILDFLAG(IS_OZONE_X11)
-+    case NativePixmapSupportType::kX11Pixmap:
-+        return NativePixmapEGLX11Binding::IsBufferFormatSupported(format);
-+#endif
-+    default:
-+        return false;
-+    }
- }
- 
-@@ -83,6 +126,17 @@
-                                    GLenum target, GLuint texture_id)
- {
--    return NativePixmapEGLBinding::Create(pixmap, plane_format, plane, plane_size, color_space,
--                                          target, texture_id);
-+    switch (GetNativePixmapSupportType()) {
-+    case NativePixmapSupportType::kDMABuf:
-+        return NativePixmapEGLBinding::Create(pixmap, plane_format, plane, plane_size, color_space,
-+                                              target, texture_id);
-+#if BUILDFLAG(IS_OZONE_X11)
-+    case NativePixmapSupportType::kX11Pixmap:
-+        return NativePixmapEGLX11Binding::Create(pixmap, plane_format, plane_size, target,
-+                                                 texture_id);
-+#endif
-+    default:
-+        NOTREACHED();
-+        return nullptr;
-+    }
- }
- 
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.9.0-x11-pixmap-leak.patch b/dev-qt/qtwebengine/files/qtwebengine-6.9.0-x11-pixmap-leak.patch
deleted file mode 100644
index 17071b0c7354..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-6.9.0-x11-pixmap-leak.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Patch status: fixed in Qt 6.9.1
-
-https://bugreports.qt.io/browse/QTBUG-135047
-https://codereview.qt-project.org/c/qt/qtwebengine/+/634033
---- a/src/core/compositor/native_skia_output_device_opengl.cpp
-+++ b/src/core/compositor/native_skia_output_device_opengl.cpp
-@@ -214,9 +214,10 @@
-             glFun->glBindTexture(GL_TEXTURE_2D, 0);
- 
--            m_frontBuffer->textureCleanupCallback = [glFun, glxFun, display, glxPixmap,
--                                                     glTexture]() {
-+            m_frontBuffer->textureCleanupCallback = [glFun, glxFun, display, glxPixmap, glTexture,
-+                                                     glxHelper, pixmapId]() {
-                 glxFun->glXReleaseTexImageEXT(display, glxPixmap, GLX_FRONT_LEFT_EXT);
-                 glFun->glDeleteTextures(1, &glTexture);
-                 glXDestroyGLXPixmap(display, glxPixmap);
-+                glxHelper->freePixmap(pixmapId);
-             };
-         }
---- a/src/core/ozone/glx_helper.cpp
-+++ b/src/core/ozone/glx_helper.cpp
-@@ -101,3 +101,13 @@
- }
- 
-+void GLXHelper::freePixmap(uint32_t pixmapId) const
-+{
-+    xcb_void_cookie_t cookie = xcb_free_pixmap_checked(m_connection, pixmapId);
-+    xcb_generic_error_t *error = xcb_request_check(m_connection, cookie);
-+    if (error) {
-+        qWarning("GLX: XCB_FREE_PIXMAP failed with error code: 0x%x", error->error_code);
-+        free(error);
-+    }
-+}
-+
- QT_END_NAMESPACE
---- a/src/core/ozone/glx_helper.h
-+++ b/src/core/ozone/glx_helper.h
-@@ -34,4 +34,5 @@
-     GLXPixmap importBufferAsPixmap(int dmaBufFd, uint32_t size, uint16_t width, uint16_t height,
-                                    uint16_t stride) const;
-+    void freePixmap(uint32_t pixmapId) const;
-     bool isDmaBufSupported() const { return m_isDmaBufSupported; }
-