From 476d3d642cb4649c832f11c6aa73a8661adc99af Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Wed, 8 May 2024 20:29:33 +0200
Subject: [PATCH 1/2] Add correct path for Qt6Gui header and libs

---
 chromium-124-qt6.patch | 11 +++++++++++
 chromium.spec          | 12 ++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 chromium-124-qt6.patch

diff --git a/chromium-124-qt6.patch b/chromium-124-qt6.patch
new file mode 100644
index 00000000..5c600c5b
--- /dev/null
+++ b/chromium-124-qt6.patch
@@ -0,0 +1,11 @@
+diff -up chromium-124.0.6367.155/ui/qt/BUILD.gn.me chromium-124.0.6367.155/ui/qt/BUILD.gn
+--- chromium-124.0.6367.155/ui/qt/BUILD.gn.me	2024-05-08 18:15:34.178627040 +0200
++++ chromium-124.0.6367.155/ui/qt/BUILD.gn	2024-05-08 18:29:31.162513709 +0200
+@@ -61,6 +61,7 @@ template("qt_shim") {
+     packages = [
+       "Qt" + invoker.qt_version + "Core",
+       "Qt" + invoker.qt_version + "Widgets",
++      "Qt" + invoker.qt_version + "Gui",
+     ]
+   }
+ 
diff --git a/chromium.spec b/chromium.spec
index 5031576d..31ea5c7a 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -187,11 +187,12 @@
 %global use_qt6 0
 %global use_qt 0
 
-%if 0%{?rhel} > 9 || 0%{?fedora}
+%if 0%{?rhel} > 9 || 0%{?fedora} > 39
 %global use_qt6 1
 %global use_qt 1
 %else
-%if 0%{?rhel} == 8
+%if 0%{?rhel} == 8 || 0%{?rhel} == 9 || 0%{?fedora}
+%global use_qt6 0
 %global use_qt 1
 %endif
 %endif
@@ -442,6 +443,9 @@ Patch140: chromium-122-revert-av1enc-el9.patch
 # file conflict with old kernel on el8/el9
 Patch141: chromium-118-dma_buf_export_sync_file-conflict.patch
 
+# add correct path for Qt6Gui header and libs
+Patch150: chromium-124-qt6.patch
+
 # disable memory tagging in epel7 and epel8 on aarch64 due to new feature IFUNC-Resolver
 # not supported in old glibc < 2.30, error: fatal error: 'sys/ifunc.h' file not found
 Patch305: chromium-124-arm64-memory_tagging.patch
@@ -1214,6 +1218,10 @@ udev.
 %patch -P141 -p1 -b .dma_buf_export_sync_file-conflict
 %endif
 
+%if 0%{?rhel} > 9 || 0%{?fedora} > 39
+%patch -P150 -p1 -b .qt6
+%endif
+
 %if 0%{?rhel} && 0%{?rhel} <= 8
 %ifarch aarch64
 %patch -P305 -p1 -b .memory_tagging

From aadea9e7ee9fae8b48b2297fe638cf0ab1ceeeca Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 10 May 2024 10:47:35 +0200
Subject: [PATCH 2/2] - update to 124.0.6367.201   * High CVE-2024-4671: Use
 after free in Visuals

---
 chromium.spec | 6 +++++-
 sources       | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/chromium.spec b/chromium.spec
index 31ea5c7a..0f8892d9 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -314,7 +314,7 @@
 %endif
 
 Name:	chromium%{chromium_channel}
-Version: 124.0.6367.155
+Version: 124.0.6367.201
 Release: 1%{?dist}
 Summary: A WebKit (Blink) powered web browser that Google doesn't want you to use
 Url: http://www.chromium.org/Home
@@ -2121,6 +2121,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %endif
 
 %changelog
+* Fri May 10 2024 Than Ngo <than@redhat.com> - 124.0.6367.201-1
+- update to 124.0.6367.201
+  * High CVE-2024-4671: Use after free in Visuals
+
 * Wed May 08 2024 Than Ngo <than@redhat.com> - 124.0.6367.155-1
 - update to 124.0.6367.155
   * High CVE-2024-4558: Use after free in ANGLE
diff --git a/sources b/sources
index ecdb7363..359f2132 100644
--- a/sources
+++ b/sources
@@ -3,3 +3,4 @@ SHA512 (node-v20.6.1-linux-x64.tar.xz) = 7e15c05041a9a50f0046266aadb2e092a5aefbe
 SHA512 (linux-arm64-0.19.2.tgz) = 8a0d8fec6786fffcd6954d00820037a55d61e60762c74300df0801f8db27057562c221a063bedfb8df56af9ba80abb366336987e881782c5996e6f871abd3dc6
 SHA512 (linux-x64-0.19.2.tgz) = a31cc74c4bfa54f9b75d735a1cfc944d3b5efb7c06bfba9542da9a642ae0b2d235ea00ae84d3ad0572c406405110fe7b61377af0fd15803806ef78d20fc6f05d
 SHA512 (chromium-124.0.6367.155-clean.tar.xz) = ded8da8bbef3479ced51e5e84436cd4772c9c3513d643c258d7af52fe55e201f192c960961bd601a1668a12c2c5e3351452fff3fb389d95855fe091cc506dba6
+SHA512 (chromium-124.0.6367.201-clean.tar.xz) = 6a6784c68e7ded8346e3666a208452d0c63a2989672cf05a45951e7fb3af2d289e55e0e19554f51c6ba398ad81e50bff5c29a97940b6ffee614a53ff54e6d75f