$ git show --format=fuller --patch-with-stat --summary 3d2a8c6123dc6261a7685143e0abb4233a6f81a9

commit 3d2a8c6123dc6261a7685143e0abb4233a6f81a9
Author:     Bernhard Rosenkränzer <bero@lindev.ch>
AuthorDate: Sun Apr 27 18:14:47 2025 +0200
Commit:     Bernhard Rosenkränzer <bero@lindev.ch>
CommitDate: Sun Apr 27 18:14:47 2025 +0200

    Fix WebEngine crashes in some multi-GPU situations
---
 03c7dcc.diff                    | 35 +++++++++++++++++++++++++++++++
 qt6-qtwebengine.spec            |  6 ++++--
 qtwebengine-6.7.0-compile.patch | 46 -----------------------------------------
 3 files changed, 39 insertions(+), 48 deletions(-)
 create mode 100644 03c7dcc.diff
 delete mode 100644 qtwebengine-6.7.0-compile.patch

diff --git a/03c7dcc.diff b/03c7dcc.diff
new file mode 100644
index 0000000..351036c
--- /dev/null
+++ b/03c7dcc.diff
@@ -0,0 +1,35 @@
+From 03c7dcc3280530dacf58620d169ff9c540c04592 Mon Sep 17 00:00:00 2001
+From: Peter Varga <pvarga@inf.u-szeged.hu>
+Date: Tue, 11 Mar 2025 09:19:16 +0100
+Subject: [PATCH] [angle] Always use primary GPU
+
+Since https://crrev.com/c/5320107, ANGLE may choose another GPU what Qt
+uses with an EGL configuration. This may lead to sporadic crashes when
+ANGLE uses the native EGL context.
+
+It is reproducible with integrated Intel GPU and dedicated Nvidia GPU.
+If the primary GPU is Nvidia and the kernel mode setting (KMS) is not
+explicitly enabled for the driver, it will fail to access DRM and will
+fallback to Intel.
+
+As a workaround, stop prioritizing EGL drivers with DRM support.
+
+Change-Id: I5d346fdc0db59521e4a2d323c8b230a75f128eaa
+Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/630511
+Reviewed-by: Moss Heim <moss.heim@qt.io>
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+
+diff --git a/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp b/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
+index f9bd8aa..aa68b72 100644
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
++++ b/src/3rdparty/chromium/third_party/angle/src/libANGLE/renderer/gl/egl/FunctionsEGL.cpp
+@@ -245,7 +245,7 @@
+     // extensions once the display is created and initialized.
+     queryExtensions();
+ 
+-#if defined(ANGLE_HAS_LIBDRM)
++#if defined(ANGLE_HAS_LIBDRM) && !defined(TOOLKIT_QT)
+     mEGLDisplay = getPreferredDisplay(&majorVersion, &minorVersion);
+ #endif  // defined(ANGLE_HAS_LIBDRM)
+ 
diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec
index b3a621b..560156c 100644
--- a/qt6-qtwebengine.spec
+++ b/qt6-qtwebengine.spec
@@ -13,7 +13,7 @@
 
 Name:		qt6-qtwebengine
 Version:	6.9.0
-Release:	%{?beta:0.%{beta}.}%{?snapshot:0.%{snapshot}.}2
+Release:	%{?beta:0.%{beta}.}%{?snapshot:0.%{snapshot}.}3
 %if 0%{?snapshot:1}
 # Built with package-source.sh (Source1000)
 Source:		qtwebengine-%{?snapshot:%{snapshot}}%{!?snapshot:%{version}}.tar.zst
@@ -29,7 +29,9 @@ Patch2:		qt6-qtwebengine-6.2.2-workaround-for-__fp16-build-failure-aarch64.patch
 Patch3:		a55ef9d.diff
 Patch4:		qtwebengine-6.5.0-aarch64-compile.patch
 Patch5:		qtwebengine-6.9.0-gperf-3.2+.patch
-#Patch6:		qtwebengine-6.7.0-compile.patch
+# https://bugreports.qt.io/browse/QTBUG-136122
+# https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/630511
+Patch6:		03c7dcc.diff
 # Try to restore a sufficient amount of binary compatibility between the
 # internalized copy of absl (which can't be disabled yet) and the system
 # version (used, among others, by the system version of re2, which DOES
diff --git a/qtwebengine-6.7.0-compile.patch b/qtwebengine-6.7.0-compile.patch
deleted file mode 100644
index 46d0f84..0000000
--- a/qtwebengine-6.7.0-compile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -up qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.h.omv~ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.h
---- qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.h.omv~	2024-05-09 02:03:46.643336861 +0200
-+++ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/base/strings/utf_string_conversion_utils.h	2024-05-09 02:04:05.947534583 +0200
-@@ -12,6 +12,7 @@
- #include <stdint.h>
- 
- #include <string>
-+#include <limits>
- 
- #include "base/base_export.h"
- #include "base/third_party/icu/icu_utf.h"
-diff -up qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/components/os_crypt/sync/kwallet_dbus.h.omv~ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/components/os_crypt/sync/kwallet_dbus.h
---- qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/components/os_crypt/sync/kwallet_dbus.h.omv~	2024-05-09 01:57:13.435240697 +0200
-+++ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/components/os_crypt/sync/kwallet_dbus.h	2024-05-09 01:57:19.867309072 +0200
-@@ -7,6 +7,7 @@
- 
- #include <string>
- #include <vector>
-+#include <cstdint>
- 
- #include "base/component_export.h"
- #include "base/memory/scoped_refptr.h"
-diff -up qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/content/common/service_worker/service_worker_router_evaluator.cc.omv~ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/content/common/service_worker/service_worker_router_evaluator.cc
---- qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/content/common/service_worker/service_worker_router_evaluator.cc.omv~	2024-05-09 02:28:00.969388515 +0200
-+++ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/content/common/service_worker/service_worker_router_evaluator.cc	2024-05-09 02:28:06.801441078 +0200
-@@ -446,7 +446,7 @@ ServiceWorkerRouterEvaluator::~ServiceWo
- 
- void ServiceWorkerRouterEvaluator::Compile() {
-   for (const auto& r : rules_.rules) {
--    std::unique_ptr<RouterRule> rule = absl::make_unique<RouterRule>();
-+    std::unique_ptr<RouterRule> rule = std::make_unique<RouterRule>();
-     if (!rule->SetRule(r)) {
-       return;
-     }
-diff -up qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/services/metrics/public/cpp/mojo_ukm_recorder.cc.omv~ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/services/metrics/public/cpp/mojo_ukm_recorder.cc
---- qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/services/metrics/public/cpp/mojo_ukm_recorder.cc.omv~	2024-05-09 03:07:16.986406334 +0200
-+++ qtwebengine-everywhere-src-6.7.0/src/3rdparty/chromium/services/metrics/public/cpp/mojo_ukm_recorder.cc	2024-05-09 03:07:20.230444154 +0200
-@@ -17,7 +17,7 @@ namespace ukm {
- 
- std::unique_ptr<ukm::MojoUkmRecorder> MojoUkmRecorder::Create(
-     mojom::UkmRecorderFactory& factory) {
--  return absl::WrapUnique(new MojoUkmRecorder(factory));
-+  return base::WrapUnique(new MojoUkmRecorder(factory));
- }
- 
- MojoUkmRecorder::MojoUkmRecorder(mojom::UkmRecorderFactory& factory) {