[rpms/chromium] epel9-next: Add correct path for Qt6Gui header and libs

[rpms/chromium] epel9-next: Add correct path for Qt6Gui header and libs

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 476d3d642cb4649c832f11c6aa73a8661adc99af
Author : Than Ngo <than@redhat.com>
Date   : 2024-05-08T20:29:33+02:00
Stats  : +21/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/476d3d642cb4649c832f11c6aa73a8661adc99af?branch=epel9-next

Log:
Add correct path for Qt6Gui header and libs

---
diff --git a/chromium-124-qt6.patch b/chromium-124-qt6.patch
new file mode 100644
index 0000000..5c600c5
--- /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 5031576..31ea5c7 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