From 59b334d37d0f7ca8a9a0d5875352ab1f316b7304 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 26 Jan 2023 10:26:28 +0100 Subject: [PATCH 1/8] Rebuild for Qt 6.4.2 update --- qt6-qtwebengine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index b70f094..1e489ca 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -50,7 +50,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.4.2 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -614,5 +614,8 @@ done %changelog +* Thu Jan 26 2023 Jan Grulich - 6.4.2-2 +- Rebuild for Qt 6.4.2 update + * Mon Jan 16 2023 Jan Grulich - 6.4.2 - Initial package From 5cad61b2fba7fa30ba3b03c4c1367b5b0c1a0b7b Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Sun, 26 Feb 2023 22:01:59 +0100 Subject: [PATCH 2/8] Rebuild for freetype-2.13.0 --- qt6-qtwebengine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 8e44381..dc7ff2f 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -44,7 +44,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.4.2 -Release: 2%{?dist} +Release: 3%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -598,6 +598,9 @@ done %changelog +* Sun Feb 26 2023 Marek Kasik - 6.4.2-3 +- Rebuild for freetype-2.13.0 + * Wed Feb 15 2023 Tom Callaway - 6.4.2-2 - rebuild for libvpx From 1ecc43b03e8c6af66acc9548970a6c6707c53f71 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 12 Mar 2023 13:35:33 -0400 Subject: [PATCH 3/8] Rebuild for ffmpeg 6.0 --- qt6-qtwebengine.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index dc7ff2f..71f7339 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -44,7 +44,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.4.2 -Release: 3%{?dist} +Release: 4%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -598,6 +598,9 @@ done %changelog +* Sun Mar 12 2023 Neal Gompa - 6.4.2-4 +- Rebuild for ffmpeg 6.0 + * Sun Feb 26 2023 Marek Kasik - 6.4.2-3 - Rebuild for freetype-2.13.0 From 94878c13b725d063b3056591e0604c812bcc3be4 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 27 Mar 2023 14:21:19 +0200 Subject: [PATCH 4/8] Fix bad merge --- qt6-qtwebengine.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index f9194e9..abaee2e 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -43,13 +43,8 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine -<<<<<<< HEAD -Version: 6.4.2 -Release: 4%{?dist} -======= Version: 6.4.3 Release: 1%{?dist} ->>>>>>> rawhide # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html From 0a649da59a3507b5ed30406c7292f9ff14afe6e8 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 27 Mar 2023 14:55:25 +0200 Subject: [PATCH 5/8] Fix changelog --- qt6-qtwebengine.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index abaee2e..5186a59 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -599,9 +599,6 @@ done %changelog -* Sun Mar 12 2023 Neal Gompa - 6.4.2-4 -- Rebuild for ffmpeg 6.0 - * Fri Mar 24 2023 Jan Grulich - 6.4.3-1 - 6.4.3 From 34d307e798c71856d891440f70e218e3929485da Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 10 May 2023 07:04:33 -0700 Subject: [PATCH 6/8] does not like RHEL icu --- qt6-qtwebengine.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 288478d..47d7c4c 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -9,11 +9,12 @@ %global use_system_jsoncpp 1 %if 0%{?rhel} && 0%{?rhel} == 9 %global use_system_re2 0 +%global use_system_libicu 0 %else %global use_system_re2 1 +%global use_system_libicu 1 %endif -%global use_system_libicu 1 # NEON support on ARM (detected at runtime) - disable this if you are hitting # FTBFS due to e.g. GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495 From c08934a31c9af47b672bc0fec3464c3725de340b Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Sat, 27 May 2023 12:12:21 -0700 Subject: [PATCH 7/8] Use gcc-toolset-12 --- qt6-qtwebengine.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 47d7c4c..ec5fa4a 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -92,6 +92,9 @@ ExclusiveArch: aarch64 x86_64 BuildRequires: cmake BuildRequires: make +%if 0%{?rhel} && 0%{?rhel} < 10 +BuildRequires: gcc-toolset-12 +%endif BuildRequires: qt6-srpm-macros BuildRequires: qt6-qtbase-devel BuildRequires: qt6-qtbase-private-devel @@ -370,6 +373,9 @@ test -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h" %build +%if 0%{?rhel} && 0%{?rhel} < 10 +. /opt/rh/gcc-toolset-12/enable +%endif export STRIP=strip export NINJAFLAGS="%{__ninja_common_opts}" export NINJA_PATH=%{__ninja} @@ -467,6 +473,7 @@ done %{_qt6_plugindir}/designer/libqwebengineview.so %{_qt6_plugindir}/imageformats/libqpdf.so %dir %{_qt6_datadir}/resources/ +%{_qt6_datadir}/resources/icudtl.dat %{_qt6_datadir}/resources/qtwebengine_resources.pak %{_qt6_datadir}/resources/qtwebengine_resources_100p.pak %{_qt6_datadir}/resources/qtwebengine_resources_200p.pak From c88d558ed0085dd23cafd3e0fbff0a031f9d28ff Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Wed, 20 Mar 2024 14:06:01 -0700 Subject: [PATCH 8/8] rhel9 needs gcc-toolset-13 --- qt6-qtwebengine.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt6-qtwebengine.spec b/qt6-qtwebengine.spec index 7816f12..9336592 100644 --- a/qt6-qtwebengine.spec +++ b/qt6-qtwebengine.spec @@ -115,7 +115,7 @@ BuildRequires: bison BuildRequires: flex BuildRequires: gcc-c++ %if 0%{?rhel} && 0%{?rhel} < 10 -BuildRequires: gcc-toolset-12 +BuildRequires: gcc-toolset-13 %endif # gn links statically (for now) BuildRequires: libstdc++-static @@ -415,7 +415,7 @@ cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium %build %if 0%{?rhel} && 0%{?rhel} < 10 -. /opt/rh/gcc-toolset-12/enable +. /opt/rh/gcc-toolset-13/enable %endif export STRIP=strip export NINJAFLAGS="%{__ninja_common_opts}"