summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtwebengine/files')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch12
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch30
2 files changed, 42 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch
new file mode 100644
index 000000000000..84dce821f80f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/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)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
new file mode 100644
index 000000000000..2d12daccd224
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
@@ -0,0 +1,30 @@
+Patch status: pending being looked at upstream
+
+Issue[1][2][3] also exist in chromium itself[4], and unclear
+why this started happening only with ninja-1.12.0 at the moment.
+
+Just a quickfix, likely not fully correct and seems there may
+be further unresolved race issues.
+
+[1] https://bugs.gentoo.org/930107
+[2] https://bugreports.qt.io/browse/QTBUG-124375
+[3] https://github.com/ninja-build/ninja/issues/2417
+[4] https://bugs.gentoo.org/930112
+--- a/src/3rdparty/chromium/content/browser/BUILD.gn
++++ b/src/3rdparty/chromium/content/browser/BUILD.gn
+@@ -198,2 +198,3 @@
+ "//components/services/storage/public/mojom",
++ "//components/spellcheck:buildflags",
+ "//components/sqlite_proto",
+--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
++++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+@@ -22,2 +22,3 @@
+ "//content/public/browser",
++ "//components/web_cache/public/mojom",
+ "//extensions/common",
+--- a/src/core/configure/BUILD.root.gn.in
++++ b/src/core/configure/BUILD.root.gn.in
+@@ -235,2 +235,3 @@
+ deps = [
++ "//chrome/app:generated_resources",
+ "//components/zoom",