From 1bfdeddb39db59928249a422579926db3bfc804a Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 5 May 2023 14:32:19 -0700 Subject: [PATCH 1/3] Use system libraries on rhel9+ --- qt5-qtwebengine.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 40105a1..8024073 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -9,7 +9,7 @@ # where qt5-qttools (qt5-doctools) builds are not yet available %global docs 0 -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?epel} >= 9 # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e) %global use_system_libvpx 1 # For screen sharing on Wayland, currently Fedora only thing - no epel @@ -19,14 +19,10 @@ # need libwebp >= 0.6.0 %global use_system_libwebp 1 %global use_system_jsoncpp 1 -%if 0%{?rhel} && 0%{?rhel} == 9 -%global use_system_re2 0 -%else %global use_system_re2 1 %endif -%endif -%if 0%{?fedora} > 32 +%if 0%{?fedora} > 32 || 0%{?epel} >= 9 # need libicu >= 65, only currently available on f33+ %global use_system_libicu 1 %endif From cf9e5e80d95c0e3249339845260ee741f118df7d Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Fri, 5 May 2023 14:34:22 -0700 Subject: [PATCH 2/3] Fix typo --- qt5-qtwebengine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 8024073..273fe9a 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -291,7 +291,7 @@ Provides: bundled(libsrtp) = 2.2.0 Provides: bundled(libvpx) = 1.8.2 %endif %if !0%{?use_system_libwebp} -Provides: bundled(libwebp) = 1.1.0-28-g55a080e5 +Provides: bundled(libwebp) = 1.1.0-28.g55a080e5 %endif # bundled as "libxml" # see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h From 19481f21c145df6418795ff3943b626378d6de03 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 8 May 2023 11:27:32 -0700 Subject: [PATCH 3/3] fix gcc-toolset-12-binutils-gold --- qt5-qtwebengine.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 273fe9a..8968d58 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -124,6 +124,9 @@ Patch35: qt5-qtwebengine-c99.patch ExclusiveArch: %{qt5_qtwebengine_arches} %endif +# Build on CentOS Stream 9 pulls in old gcc-toolset-12-binutils-gold +# Remove this when version 2.38-14 is no longer pulled in. +BuildRequires: gcc-toolset-12-binutils-gold >= 2.38-16 BuildRequires: make BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-private-devel