summaryrefslogtreecommitdiffstats
path: root/source/l/qt6/patches
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/qt6/patches')
-rw-r--r--source/l/qt6/patches/qt6-3d_gcc13.patch11
-rw-r--r--source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch12
2 files changed, 12 insertions, 11 deletions
diff --git a/source/l/qt6/patches/qt6-3d_gcc13.patch b/source/l/qt6/patches/qt6-3d_gcc13.patch
deleted file mode 100644
index 7128597de..000000000
--- a/source/l/qt6/patches/qt6-3d_gcc13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp.orig 2023-09-24 13:38:48.000000000 +0200
-+++ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp 2023-10-04 14:00:15.901256244 +0200
-@@ -51,6 +51,7 @@
- #include "FBXUtil.h"
- #include <assimp/defs.h>
- #include <stdint.h>
-+#include <cstdint>
- #include <assimp/Exceptional.h>
- #include <assimp/ByteSwapper.h>
- #include <assimp/DefaultLogger.hpp>
-
diff --git a/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch b/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch
new file mode 100644
index 000000000..84dce821f
--- /dev/null
+++ b/source/l/qt6/patches/qtwebengine-6.7.0-displaykey-header.patch
@@ -0,0 +1,12 @@
+TODO: merge with glx-headers patch in patchset, similar
+issues that seem to stem from Qt's GLX restoration.
+
+https://bugs.gentoo.org/930107#c8
+--- a/src/3rdparty/chromium/ui/gl/gl_display.h
++++ b/src/3rdparty/chromium/ui/gl/gl_display.h
+@@ -12,4 +12,5 @@
+
+ #include "ui/gl/gl_export.h"
++#include "ui/gl/gpu_preference.h"
+
+ #if defined(USE_EGL)