Fix WebEngine crashes in some multi-GPU situations

Author: berolinux

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)
+ 

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