[neon/snap-packaging/kde-qt6-core-sdk] /: update qt to 6.7.1

Scarlett Moore null at kde.org
Tue May 28 17:07:24 BST 2024


Git commit ef6a6f8a029741da37e3f7e1b63c4fb0153572c1 by Scarlett Moore, on behalf of Alex Lowe.
Committed on 28/05/2024 at 16:07.
Pushed by scarlettmoore into branch 'master'.

update qt to 6.7.1

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

https://invent.kde.org/neon/snap-packaging/kde-qt6-core-sdk/-/commit/ef6a6f8a029741da37e3f7e1b63c4fb0153572c1

diff --git a/FIXUP-Restore-GLX-usage.patch b/FIXUP-Restore-GLX-usage.patch
deleted file mode 100644
index 1101acd..0000000
--- a/FIXUP-Restore-GLX-usage.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 1a5d6dd..a662e55 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: kde-qt6-core22-sdk
 base: core22
-version: 6.7.0
+version: 6.7.1
 summary: KDE fork Qt Framework SDK
 description: |
   Qt is a cross-platform application development framework widely used
@@ -36,10 +36,6 @@ package-repositories:
 
 parts:
   qt6:
-    override-pull: |
-      craftctl default
-      cd $CRAFT_PART_SRC/qtwebengine/src/3rdparty
-      patch -p1 < $CRAFT_PROJECT_DIR/FIXUP-Restore-GLX-usage.patch
     plugin: cmake
     source: https://invent.kde.org/qt/qt/qt5.git
     source-tag: $SNAPCRAFT_PROJECT_VERSION


More information about the Neon-commits mailing list