[neon/snap-packaging/kde-qt6-snap] /: Upgrade the snap to Qt 6.7.0

[Kevin Ottens]

Git commit 05669ace1676590587c2d7f4cd9d782ddb5cb62b by Kevin Ottens.
Committed on 19/04/2024 at 05:37.
Pushed by ervin into branch 'master'.

Upgrade the snap to Qt 6.7.0

A  +30   -0    FIXUP-Restore-GLX-usage.patch
M  +5    -1    snapcraft.yaml

https://invent.kde.org/neon/snap-packaging/kde-qt6-snap/-/commit/05669ace1676590587c2d7f4cd9d782ddb5cb62b

diff --git a/FIXUP-Restore-GLX-usage.patch b/FIXUP-Restore-GLX-usage.patch
new file mode 100644
index 0000000..1101acd
--- /dev/null
+++ b/FIXUP-Restore-GLX-usage.patch
@@ -0,0 +1,30 @@
+From ca016bb4a7d5291c3f2e4ce549c94e6362150c6c Mon Sep 17 00:00:00 2001
+From: David Faure <david.faure at kdab.com>
+Date: Tue, 9 Apr 2024 15:29:40 +0200
+Subject: [PATCH 01/11] FIXUP: Restore GLX usage
+
+Change-Id: I49e8ae6df08160f1cd7180a2cf601d15bceddcdb
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/553830
+Reviewed-by: Peter Varga <pvarga at inf.u-szeged.hu>
+---
+ chromium/ui/gl/gl_display.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/chromium/ui/gl/gl_display.cc b/chromium/ui/gl/gl_display.cc
+index dcd6d60f767..672756a48bd 100644
+--- a/chromium/ui/gl/gl_display.cc
++++ b/chromium/ui/gl/gl_display.cc
+@@ -36,6 +36,10 @@
+ #include "base/android/build_info.h"
+ #endif
+ 
++#if defined(USE_GLX)
++#include "ui/gfx/x/connection.h"
++#endif
++
+ // From ANGLE's egl/eglext.h.
+ 
+ #ifndef EGL_ANGLE_platform_angle
+-- 
+2.44.0
+
diff --git a/snapcraft.yaml b/snapcraft.yaml
index bed804d..e78db1f 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: kde-qt6-core22-sdk
 base: core22
-version: 6.6.3
+version: 6.7.0
 summary: KDE fork Qt Framework SDK
 description: |
   Qt is a cross-platform application development framework widely used
@@ -31,6 +31,10 @@ package-repositories:
 
 parts:
   qt6:
+    override-pull: |
+      craftctl default
+      cd $SNAPCRAFT_PART_SRC/qtwebengine/src/3rdparty
+      patch -p1 < $SNAPCRAFT_PROJECT_DIR/FIXUP-Restore-GLX-usage.patch
     plugin: cmake
     source: https://invent.kde.org/qt/qt/qt5.git
     source-tag: $SNAPCRAFT_PROJECT_VERSION