The package rpms/qt5-qtwebengine.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt5-qtwebengine.git/commit/?id=dfae1....
Change: +%ifarch x86_64
Thanks.
Full change: ============
commit 56925bd64c8b29a33f06480e8e79e72840c7a584 Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Mon Aug 29 21:41:14 2022 +0100
feat: bump spec to 5.15.10
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index a31d6c3..555dc66 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -61,8 +61,8 @@
Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine -Version: 5.15.9 -Release: 5%{?dist} +Version: 5.15.10 +Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -667,6 +667,9 @@ done
%changelog +* Mon Aug 29 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 5.15.10-1 +- Update to 5.15.10 + * Tue Aug 02 2022 Frantisek Zatloukal fzatlouk@redhat.com - 5.15.9-5 - Rebuilt for ICU 71.1
commit 6deffa33bdea5a54541f940b8db56e41483d629c Author: Ankur Sinha (Ankur Sinha Gmail) sanjay.ankur@gmail.com Date: Mon Aug 29 21:39:56 2022 +0100
feat: upload 5.15.10 sources
diff --git a/.gitignore b/.gitignore index 6f05a86..dbf8d97 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /python2.7-2.7.18-19.el9.1.aarch64.rpm /python2.7-2.7.18-19.el9.1.x86_64.rpm /qtwebengine-everywhere-src-5.15.9-clean.tar.xz +/qtwebengine-everywhere-src-5.15.10-clean.tar.xz diff --git a/sources b/sources index cb2ac95..3f8c795 100644 --- a/sources +++ b/sources @@ -2,4 +2,4 @@ SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d SHA512 (python2.7-2.7.18-19.el9.1.src.rpm) = e6d738b2880b833ea80aec709f7bcf20dac2e8c59d45f1627f61245b3aa9be845888152232e9f08145723514eb29aeada3d5d99641aabe9ec9af2a5c15f32777 SHA512 (python2.7-2.7.18-19.el9.1.aarch64.rpm) = 66c8487a3323bb854ff79242287ae5d290315609b4f79fb985626e52d96286d6dfd2da9a8257e23be036b72adabbbec08d53db339935d5d6e8b6018417bbc769 SHA512 (python2.7-2.7.18-19.el9.1.x86_64.rpm) = 55f03b17f649a2da9edae67c1ca7c84738a023fc3ab2e7d6060db8a2b8ddf20099147533f3d50ce3dfafec5ca988f75ff229e67d331bcb669c879802ab6555a9 -SHA512 (qtwebengine-everywhere-src-5.15.9-clean.tar.xz) = d2c16022e8881994689c09ce3a3ee635730fd1ab1b4dd8b23243cd0a09fc231c8034a77e878634dd49206ca01fa48caccda600c869283855a20c3e6714cd93be +SHA512 (qtwebengine-everywhere-src-5.15.10-clean.tar.xz) = b268d9fe163ebb3a076d7a37d3189532cf9c5bd76d4dd9e20cc37dcc5c4a5c19070dca27b9b404bbe9837e2a1b339ca6cceb29826b8b1650815f9ea64733859a
commit c3db46dbfbf92af69c65a44ffb38b91fd347323c Author: František Zatloukal fzatlouk@redhat.com Date: Tue Aug 2 13:23:52 2022 +0200
Rebuilt for ICU 71.1
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index ae23260..a31d6c3 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -62,7 +62,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.9 -Release: 4%{?dist} +Release: 5%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -667,6 +667,9 @@ done
%changelog +* Tue Aug 02 2022 Frantisek Zatloukal fzatlouk@redhat.com - 5.15.9-5 +- Rebuilt for ICU 71.1 + * Sat Jul 23 2022 Fedora Release Engineering releng@fedoraproject.org - 5.15.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
commit b22f6246a6afa4b7e212be3eedabc366938df78b Author: Fedora Release Engineering releng@fedoraproject.org Date: Sat Jul 23 00:09:49 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering releng@fedoraproject.org
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 21b1b95..ae23260 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -62,7 +62,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.9 -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 @@ -667,6 +667,9 @@ done
%changelog +* Sat Jul 23 2022 Fedora Release Engineering releng@fedoraproject.org - 5.15.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jul 20 2022 Kevin Kofler Kevin@tigcc.ticalc.org - 5.15.9-3 - Drop obsolete no-icudtl-dat patch, code has been fixed upstream since 5.11.0
commit 9816079afb681f0611bc7b9194d83f8b9e0608ca Author: Kevin Kofler Kevin@tigcc.ticalc.org Date: Wed Jul 20 02:52:28 2022 +0200
Drop obsolete no-icudtl-dat patch, code has been fixed upstream since 5.11.0
* Wed Jul 20 2022 Kevin Kofler Kevin@tigcc.ticalc.org - 5.15.9-3 - Drop obsolete no-icudtl-dat patch, code has been fixed upstream since 5.11.0
If you look closely at the patch, you will see that the code that is removed does not actually mention the offending icudtl.dat anywhere. This upstream code snippet was fixed back in 5.11.0 to check for qtwebengine_resources.pak instead, which is always installed. (Compare my original patch with the version rebased by Rex Dieter for 5.11.0.)
Searching for alternate resource paths is still pointless in packaged QtWebEngine, mind you. (The file installed by the package should always be found.) So the patch did not hurt. But still, it is no longer necessary to patch this out.
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 8cd6ba1..21b1b95 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -62,7 +62,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.9 -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 @@ -92,11 +92,6 @@ Source100: python2.7-2.7.18-19.el9.1.src.rpm Source101: python2.7-2.7.18-19.el9.1.aarch64.rpm Source102: python2.7-2.7.18-19.el9.1.x86_64.rpm
-# quick hack to avoid checking for the nonexistent icudtl.dat and silence the -# resulting warnings - not upstreamable as is because it removes the fallback -# mechanism for the ICU data directory (which is not used in our builds because -# we use the system ICU, which embeds the data statically) completely -Patch1: qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch # fix extractCFlag to also look in QMAKE_CFLAGS_RELEASE, needed to detect the # ARM flags with our %%qmake_qt5 macro, including for the next patch Patch2: qtwebengine-opensource-src-5.12.4-fix-extractcflag.patch @@ -430,9 +425,6 @@ rpm2cpio %{SOURCE102} | cpio -idm popd %endif
-%if 0%{?use_system_libicu} -%patch1 -p1 -b .no-icudtl-dat -%endif %patch2 -p1 -b .fix-extractcflag %if !0%{?arm_neon} %patch3 -p1 -b .no-neon @@ -675,6 +667,9 @@ done
%changelog +* Wed Jul 20 2022 Kevin Kofler Kevin@tigcc.ticalc.org - 5.15.9-3 +- Drop obsolete no-icudtl-dat patch, code has been fixed upstream since 5.11.0 + * Thu Jul 14 2022 Jan Grulich jgrulich@redhat.com - 5.15.9-2 - Rebuild (Qt 5.15.5)
diff --git a/qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch b/qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch deleted file mode 100644 index a83367e..0000000 --- a/qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp.no-icudtl-dat qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp ---- qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp.no-icudtl-dat 2021-06-24 07:26:58.976486102 -0500 -+++ qtwebengine-everywhere-src-5.15.5/src/core/web_engine_library_info.cpp 2021-06-24 07:32:19.272863523 -0500 -@@ -273,7 +273,6 @@ QString dictionariesPath() - - QString resourcesDataPath() - { -- static bool initialized = false; - static QString potentialResourcesPath = - #if defined(OS_MAC) && defined(QT_MAC_FRAMEWORK_BUILD) - getResourcesPath(frameworkBundle()); -@@ -282,21 +281,6 @@ QString resourcesDataPath() - #else - QLibraryInfo::location(QLibraryInfo::DataPath) % QLatin1String("/resources"); - #endif -- if (!initialized) { -- initialized = true; -- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) { -- qWarning("Qt WebEngine resources not found at %s. Trying parent directory...", qPrintable(potentialResourcesPath)); -- potentialResourcesPath = QLibraryInfo::location(QLibraryInfo::DataPath); -- } -- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) { -- qWarning("Qt WebEngine resources not found at %s. Trying application directory...", qPrintable(potentialResourcesPath)); -- potentialResourcesPath = QCoreApplication::applicationDirPath(); -- } -- if (!QFileInfo::exists(potentialResourcesPath % QLatin1String("/qtwebengine_resources.pak"))) { -- qWarning("Qt WebEngine resources not found at %s. Trying fallback directory... The application MAY NOT work.", qPrintable(potentialResourcesPath)); -- potentialResourcesPath = fallbackDir(); -- } -- } - - return potentialResourcesPath; - }
commit a9c79ab034228108277c956f9322c0b37e2d7788 Author: Jan Grulich jgrulich@redhat.com Date: Thu Jul 14 12:12:40 2022 +0200
Rebuild (Qt 5.15.5)
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 48da22c..8cd6ba1 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -62,7 +62,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.9 -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 @@ -675,6 +675,9 @@ done
%changelog +* Thu Jul 14 2022 Jan Grulich jgrulich@redhat.com - 5.15.9-2 +- Rebuild (Qt 5.15.5) + * Wed Jun 01 2022 Rex Dieter rdieter@fedoraproject.org - 5.15.9-1 - 5.15.9
commit 734c76e76c8864657dea1c29e182f9762c89eca4 Author: Rex Dieter rdieter@gmail.com Date: Thu Jun 2 08:08:23 2022 -0500
5.15.9
diff --git a/.gitignore b/.gitignore index 1ef4d88..6f05a86 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /python2.7-2.7.18-19.el9.1.src.rpm /python2.7-2.7.18-19.el9.1.aarch64.rpm /python2.7-2.7.18-19.el9.1.x86_64.rpm +/qtwebengine-everywhere-src-5.15.9-clean.tar.xz diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index a1a58c2..48da22c 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -61,8 +61,8 @@
Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine -Version: 5.15.8 -Release: 7%{?dist} +Version: 5.15.9 +Release: 1%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -118,6 +118,7 @@ Patch26: qtwebengine-everywhere-5.15.5-use-python2.patch # FTBFS TRUE/FALSE undeclared Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch Patch32: qtwebengine-skia-missing-includes.patch + ## Upstream patches:
%if 0%{?fedora} || 0%{?epel} > 7 @@ -674,6 +675,9 @@ done
%changelog +* Wed Jun 01 2022 Rex Dieter rdieter@fedoraproject.org - 5.15.9-1 +- 5.15.9 + * Tue May 17 2022 Jan Grulich jgrulich@redhat.com - 5.15.8-7 - Rebuild (Qt 5.15.4)
diff --git a/sources b/sources index b4bf324..cb2ac95 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be -SHA512 (qtwebengine-everywhere-src-5.15.8-clean.tar.xz) = 0ded6ec6106a79e66796fa65b9574debf59e602aecbfdd0cdf0aeb6d17530177c0a8650078402c426abfebcd40c97d1501f4277541c86f2c576543052f627c04 SHA512 (python2.7-2.7.18-19.el9.1.src.rpm) = e6d738b2880b833ea80aec709f7bcf20dac2e8c59d45f1627f61245b3aa9be845888152232e9f08145723514eb29aeada3d5d99641aabe9ec9af2a5c15f32777 SHA512 (python2.7-2.7.18-19.el9.1.aarch64.rpm) = 66c8487a3323bb854ff79242287ae5d290315609b4f79fb985626e52d96286d6dfd2da9a8257e23be036b72adabbbec08d53db339935d5d6e8b6018417bbc769 SHA512 (python2.7-2.7.18-19.el9.1.x86_64.rpm) = 55f03b17f649a2da9edae67c1ca7c84738a023fc3ab2e7d6060db8a2b8ddf20099147533f3d50ce3dfafec5ca988f75ff229e67d331bcb669c879802ab6555a9 +SHA512 (qtwebengine-everywhere-src-5.15.9-clean.tar.xz) = d2c16022e8881994689c09ce3a3ee635730fd1ab1b4dd8b23243cd0a09fc231c8034a77e878634dd49206ca01fa48caccda600c869283855a20c3e6714cd93be
commit 2583ebbf3f38a3ebabe3843d40542ea9fcfc4fde Author: Jan Grulich jgrulich@redhat.com Date: Wed May 18 12:17:53 2022 +0200
Add missing includes
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 6a7b9f4..a1a58c2 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -117,7 +117,7 @@ Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch Patch26: qtwebengine-everywhere-5.15.5-use-python2.patch # FTBFS TRUE/FALSE undeclared Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch - +Patch32: qtwebengine-skia-missing-includes.patch ## Upstream patches:
%if 0%{?fedora} || 0%{?epel} > 7 @@ -448,6 +448,7 @@ popd %patch24 -p1 -b .aarch64-new-stat %patch26 -p1 -b .use-python2 %patch31 -p1 -b .TRUE +%patch32 -p1 -b .skia-missing-includes
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS diff --git a/qtwebengine-skia-missing-includes.patch b/qtwebengine-skia-missing-includes.patch new file mode 100644 index 0000000..8402a73 --- /dev/null +++ b/qtwebengine-skia-missing-includes.patch @@ -0,0 +1,15 @@ +diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp +index 7260365..503ed08 100644 +--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp ++++ b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp +@@ -8,6 +8,10 @@ + + #include "include/utils/SkParse.h" + ++#include <string.h> ++#include <algorithm> ++#include <iterator> ++ + static constexpr const char* gColorNames[] = { + "aliceblue", + "antiquewhite",
commit 28e42828996fcede09f2d0045da15d5988925e5b Author: Jan Grulich jgrulich@redhat.com Date: Tue May 17 12:27:19 2022 +0200
Rebuild (Qt 5.15.4)
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index b7d29ea..6a7b9f4 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -62,7 +62,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.8 -Release: 6%{?dist} +Release: 7%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -673,6 +673,9 @@ done
%changelog +* Tue May 17 2022 Jan Grulich jgrulich@redhat.com - 5.15.8-7 +- Rebuild (Qt 5.15.4) + * Tue Mar 29 2022 Parag Nemade <pnemade AT redhat DOT com> - 5.15.8-6 - Update hunspell dictionary path by adding conditional support F36 Change https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change
commit 6f87bfde8d0ea47eb557786aab2a42fd75ad484f Author: Troy Dawson tdawson@redhat.com Date: Fri May 6 09:59:03 2022 -0700
python2 rpms for rhel9 only
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 22c0d4d..b7d29ea 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -416,7 +416,7 @@ mv pulse src/3rdparty/chromium/ pushd src/3rdparty/chromium popd
-%if 0%{?epel:1} +%if 0%{?rhel} && 0%{?rhel} == 9 # Install python2 from rpms mkdir python2 pushd python2
commit f79a8388e168adce9e2efacf0c98a88a1e2440dc Author: Parag Nemade pnemade@fedoraproject.org Date: Tue Mar 29 18:58:12 2022 +0530
Update hunspell dictionary path by adding conditional support
F36 Change https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change
Signed-off-by: Parag Nemade pnemade@fedoraproject.org
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index a62d2b0..22c0d4d 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -62,7 +62,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.8 -Release: 5%{?dist} +Release: 6%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -563,7 +563,11 @@ sed -i -e "s|%{version} ${_Qt5WebEngine|%{lesser_version} ${_Qt5WebEngine|" \
%ldconfig_scriptlets
+%if 0%{?fedora} > 35 || 0%{?epel} > 9 +%filetriggerin -- %{_datadir}/hunspell +%else %filetriggerin -- %{_datadir}/myspell +%endif while read filename ; do case "$filename" in *.dic) @@ -669,6 +673,10 @@ done
%changelog +* Tue Mar 29 2022 Parag Nemade <pnemade AT redhat DOT com> - 5.15.8-6 +- Update hunspell dictionary path by adding conditional support + F36 Change https://fedoraproject.org/wiki/Changes/Hunspell_dictionary_dir_change + * Wed Mar 09 2022 Jan Grulich jgrulich@redhat.com - 5.15.8-5 - Rebuild (qt5)
commit b20253f3ffa06466ebe9e1687036486653ff7be5 Author: Jan Grulich jgrulich@redhat.com Date: Wed Mar 9 09:28:23 2022 +0100
Disable PipeWire for now, WebRTC in qtwebengine is still PW 0.2 based
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 7aded31..a62d2b0 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -13,7 +13,7 @@ # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e) %global use_system_libvpx 1 # For screen sharing on Wayland, currently Fedora only thing - no epel -%global pipewire 1 +#global pipewire 1 %endif %if 0%{?fedora} > 30 || 0%{?epel} > 7 # need libwebp >= 0.6.0
commit 046e95e43aed57299d4fba77958ca3d701109215 Author: Jan Grulich jgrulich@redhat.com Date: Wed Mar 9 08:15:12 2022 +0100
Rebuild (qt5)
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index fa315c1..7aded31 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -62,7 +62,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.8 -Release: 4%{?dist} +Release: 5%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -669,6 +669,9 @@ done
%changelog +* Wed Mar 09 2022 Jan Grulich jgrulich@redhat.com - 5.15.8-5 +- Rebuild (qt5) + * Thu Feb 17 2022 Rex Dieter rdieter@fedoraproject.org - 5.15.8-4 - Screen sharing support under Wayland (#2054690)
commit 864d6241146620294dfea4829d79049614c7ee5c Author: Rex Dieter rdieter@gmail.com Date: Fri Feb 18 12:36:26 2022 -0600
respin pipewire patch
enable rtc_link_pipewire
diff --git a/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch b/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch index ece385b..c9e4686 100644 --- a/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch +++ b/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch @@ -10,3 +10,15 @@ diff -up qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/web } } else { # When libpipewire is not directly linked, use stubs to allow for dlopening of +diff -up qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/webrtc.gni.libpipewire-0.3 qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +--- qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/webrtc.gni.libpipewire-0.3 2021-12-15 10:09:27.000000000 -0600 ++++ qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/webrtc.gni 2022-02-18 12:35:13.895009491 -0600 +@@ -115,7 +115,7 @@ declare_args() { + rtc_use_pipewire = is_desktop_linux && use_sysroot + + # Set this to link PipeWire directly instead of using the dlopen. +- rtc_link_pipewire = false ++ rtc_link_pipewire = true + + # Enable to use the Mozilla internal settings. + build_with_mozilla = false
commit 5e1880c665e1ac57b9d946fd3e04d8c09d7f4768 Author: Rex Dieter rdieter@gmail.com Date: Fri Feb 18 10:18:47 2022 -0600
patch8 awol, added
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 74b4312..fa315c1 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -110,6 +110,7 @@ Patch5: qtwebengine-5.15.0-QT_DEPRECATED_VERSION.patch # gcc-12 FTBFS "use of deleted function" Patch6: chromium-angle-nullptr.patch Patch7: chromium-hunspell-nullptr.patch +Patch8: qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch # Fix/workaround FTBFS on aarch64 with newer glibc Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch # Use Python2
commit 54a875c23a81fa680acd80bf903ffb4a1e97a30e Author: Rex Dieter rdieter@gmail.com Date: Fri Feb 18 09:58:17 2022 -0600
fix pipewire support
patch inspired by chromium-80.0.3987.87-libpipewire-0.3.patch
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 9c622b6..74b4312 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -12,6 +12,8 @@ %if 0%{?fedora} # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e) %global use_system_libvpx 1 +# For screen sharing on Wayland, currently Fedora only thing - no epel +%global pipewire 1 %endif %if 0%{?fedora} > 30 || 0%{?epel} > 7 # need libwebp >= 0.6.0 @@ -154,6 +156,9 @@ BuildRequires: nodejs %if 0%{?use_system_re2} BuildRequires: re2-devel %endif +%if 0%{?pipewire} +BuildRequires: pkgconfig(libpipewire-0.3) +%endif BuildRequires: snappy-devel BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(gobject-2.0) @@ -434,6 +439,9 @@ popd %patch5 -p1 -b .QT_DEPRECATED_VERSION %patch6 -p1 -b .angle_nullptr %patch7 -p1 -b .hunspell_nullptr +#if 0%{?pipewire} +%patch8 -p1 -b .libpipewire-0.3 +#endif
## upstream patches %patch24 -p1 -b .aarch64-new-stat @@ -502,7 +510,7 @@ export NINJA_PATH=%{__ninja} CONFIG+="link_pulseaudio use_gold_linker" \ %{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \ QMAKE_EXTRA_ARGS+="-webengine-kerberos" \ - QMAKE_EXTRA_ARGS+="-webengine-webrtc-pipewire" \ + %{?pipewire:QMAKE_EXTRA_ARGS+="-webengine-webrtc-pipewire"} \ .
# avoid %%make_build for now, the -O flag buffers output from intermediate build steps done via ninja diff --git a/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch b/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch new file mode 100644 index 0000000..ece385b --- /dev/null +++ b/qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch @@ -0,0 +1,12 @@ +diff -up qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn.libpipewire-0.3 qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn +--- qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn.libpipewire-0.3 2021-12-15 10:09:27.000000000 -0600 ++++ qtwebengine-everywhere-src-5.15.8/src/3rdparty/chromium/third_party/webrtc/modules/desktop_capture/BUILD.gn 2022-02-18 09:43:31.402923179 -0600 +@@ -202,7 +202,7 @@ if (is_linux || is_chromeos) { + + if (rtc_link_pipewire) { + pkg_config("pipewire") { +- packages = [ "libpipewire-0.2" ] ++ packages = [ "libpipewire-0.3" ] + } + } else { + # When libpipewire is not directly linked, use stubs to allow for dlopening of
commit 4c3f7f038d269d510841bb3da1f0449f9b3f5c36 Author: Rex Dieter rdieter@gmail.com Date: Thu Feb 17 14:12:57 2022 -0600
fix typo
*appears* to work this way too, but want to keep option enablement consistent
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 78b2a94..9c622b6 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -502,7 +502,7 @@ export NINJA_PATH=%{__ninja} CONFIG+="link_pulseaudio use_gold_linker" \ %{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \ QMAKE_EXTRA_ARGS+="-webengine-kerberos" \ - QMAKE_EXTRA_ARGS+="--webengine-webrtc-pipewire" \ + QMAKE_EXTRA_ARGS+="-webengine-webrtc-pipewire" \ .
# avoid %%make_build for now, the -O flag buffers output from intermediate build steps done via ninja
commit 6736cadbe258149a1d5f82bc97d0941b850f29de Author: Rex Dieter rdieter@gmail.com Date: Thu Feb 17 14:04:37 2022 -0600
Screen sharing support under Wayland (#2054690)
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 07c31da..78b2a94 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -60,7 +60,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.8 -Release: 3%{?dist}.1 +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 @@ -502,6 +502,7 @@ export NINJA_PATH=%{__ninja} CONFIG+="link_pulseaudio use_gold_linker" \ %{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \ QMAKE_EXTRA_ARGS+="-webengine-kerberos" \ + QMAKE_EXTRA_ARGS+="--webengine-webrtc-pipewire" \ .
# avoid %%make_build for now, the -O flag buffers output from intermediate build steps done via ninja @@ -659,6 +660,9 @@ done
%changelog +* Thu Feb 17 2022 Rex Dieter rdieter@fedoraproject.org - 5.15.8-4 +- Screen sharing support under Wayland (#2054690) + * Tue Feb 01 2022 Troy Dawson tdawson@redhat.com - 5.15.8-3.1 - Specifically for epel9 only, until things switch to python3 - Bundle python2 for building only
commit af46fc18c6d350d1d79eddde56adf7351b5c73e9 Author: Rex Dieter rdieter@gmail.com Date: Thu Feb 17 14:03:23 2022 -0600
use python2 hack only on epel
and not unconditionally
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index c367d29..07c31da 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -410,6 +410,7 @@ mv pulse src/3rdparty/chromium/ pushd src/3rdparty/chromium popd
+%if 0%{?epel:1} # Install python2 from rpms mkdir python2 pushd python2 @@ -420,6 +421,7 @@ rpm2cpio %{SOURCE101} | cpio -idm rpm2cpio %{SOURCE102} | cpio -idm %endif popd +%endif
%if 0%{?use_system_libicu} %patch1 -p1 -b .no-icudtl-dat
commit dfae144a41bb5ea3d3a89f05ef6f3b4caab6b041 Author: Troy Dawson tdawson@redhat.com Date: Tue Feb 1 15:45:56 2022 -0800
Specifically for epel9 only, until things switch to python3 Bundle python2 for building only Bundled re2 No docs
diff --git a/.gitignore b/.gitignore index f3ee4f9..1ef4d88 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ /pulseaudio-12.2-headers.tar.gz /qtwebengine-everywhere-src-5.15.8-clean.tar.xz +/python2.7-2.7.18-19.el9.1.src.rpm +/python2.7-2.7.18-19.el9.1.aarch64.rpm +/python2.7-2.7.18-19.el9.1.x86_64.rpm diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index f4c01ac..c367d29 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -7,7 +7,7 @@
# define to build docs, may need to undef this for bootstrapping # where qt5-qttools (qt5-doctools) builds are not yet available -%global docs 1 +%global docs 0
%if 0%{?fedora} # need libvpx >= 1.8.0 (need commit 297dfd869609d7c3c5cd5faa3ebc7b43a394434e) @@ -17,8 +17,12 @@ # 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 # need libicu >= 65, only currently available on f33+ @@ -56,7 +60,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.8 -Release: 3%{?dist} +Release: 3%{?dist}.1
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html @@ -79,6 +83,13 @@ Source10: macros.qt5-qtwebengine # pulseaudio headers Source20: pulseaudio-12.2-headers.tar.gz
+## Python2 Sources +## src.rpm is Fedora spec with tests and tkinter turned off +## binary rpms have been built on epel9 +Source100: python2.7-2.7.18-19.el9.1.src.rpm +Source101: python2.7-2.7.18-19.el9.1.aarch64.rpm +Source102: python2.7-2.7.18-19.el9.1.x86_64.rpm + # quick hack to avoid checking for the nonexistent icudtl.dat and silence the # resulting warnings - not upstreamable as is because it removes the fallback # mechanism for the ICU data directory (which is not used in our builds because @@ -199,7 +210,11 @@ BuildRequires: perl-interpreter # per https://fedoraproject.org/wiki/Changes/RetirePython2#FESCo_exceptions # Only the interpreter is needed %if 0%{?fedora} > 29 || 0%{?rhel} > 8 +%if 0%{?rhel} && 0%{?rhel} == 9 +BuildRequires: %{__python3} +%else BuildRequires: %{__python2} +%endif %else BuildRequires: python2 BuildRequires: python2-rpm-macros @@ -207,6 +222,10 @@ BuildRequires: python2-rpm-macros %if 0%{?use_system_libvpx} BuildRequires: pkgconfig(vpx) >= 1.8.0 %endif +# For python on EPEL9, These get pulled in via python2 +BuildRequires: libtirpc +BuildRequires: libnsl2 +BuildRequires: python-rpm-macros
# extra (non-upstream) functions needed, see # src/3rdparty/chromium/third_party/sqlite/README.chromium for details @@ -279,6 +298,7 @@ Provides: bundled(libXNVCtrl) = 302.17 Provides: bundled(libyuv) = 1768 Provides: bundled(modp_b64) Provides: bundled(ots) +Provides: bundled(re2) # see src/3rdparty/chromium/third_party/protobuf/CHANGES.txt for the version Provides: bundled(protobuf) = 3.9.0 Provides: bundled(qcms) = 4 @@ -390,6 +410,17 @@ mv pulse src/3rdparty/chromium/ pushd src/3rdparty/chromium popd
+# Install python2 from rpms +mkdir python2 +pushd python2 +%ifarch aarch64 +rpm2cpio %{SOURCE101} | cpio -idm +%endif +%ifarch x86_64 +rpm2cpio %{SOURCE102} | cpio -idm +%endif +popd + %if 0%{?use_system_libicu} %patch1 -p1 -b .no-icudtl-dat %endif @@ -427,13 +458,15 @@ cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/src/re2/ sed -i -e 's/symbol_level=1/symbol_level=2/g' src/core/config/common.pri %endif
+%if 0%{?docs} # generate qtwebengine-3rdparty.qdoc, it is missing from the tarball pushd src/3rdparty -%{__python2} chromium/tools/licenses.py \ +%{__python3} chromium/tools/licenses.py \ --file-template ../../tools/about_credits.tmpl \ --entry-template ../../tools/about_credits_entry.tmpl \ credits >../webengine/doc/src/qtwebengine-3rdparty.qdoc popd +%endif
# copy the Chromium license so it is installed with the appropriate name cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium @@ -454,6 +487,10 @@ test -f "./include/QtWebEngineCore/qtwebenginecoreglobal.h" . /opt/rh/devtoolset-7/enable %endif
+# python2 path +export PATH=$(pwd)/python2/usr/bin:$PATH +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/python2/usr/lib64 + export STRIP=strip export NINJAFLAGS="%{__ninja_common_opts}" export NINJA_PATH=%{__ninja} @@ -525,7 +562,10 @@ while read filename ; do done
%files -%license LICENSE.* src/webengine/doc/src/qtwebengine-3rdparty.qdoc +%license LICENSE.* +%if 0%{?docs} +%license src/webengine/doc/src/qtwebengine-3rdparty.qdoc +%endif %{_qt5_libdir}/libQt5*.so.* %{_qt5_bindir}/qwebengine_convert_dict %{_qt5_libdir}/qt5/qml/* @@ -617,6 +657,12 @@ done
%changelog +* Tue Feb 01 2022 Troy Dawson tdawson@redhat.com - 5.15.8-3.1 +- Specifically for epel9 only, until things switch to python3 +- Bundle python2 for building only +- Bundled re2 +- No docs + * Thu Jan 27 2022 Tom Callaway spot@fedoraproject.org - 5.15.8-3 - rebuild for libvpx
diff --git a/sources b/sources index 71b9125..b4bf324 100644 --- a/sources +++ b/sources @@ -1,2 +1,5 @@ SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be SHA512 (qtwebengine-everywhere-src-5.15.8-clean.tar.xz) = 0ded6ec6106a79e66796fa65b9574debf59e602aecbfdd0cdf0aeb6d17530177c0a8650078402c426abfebcd40c97d1501f4277541c86f2c576543052f627c04 +SHA512 (python2.7-2.7.18-19.el9.1.src.rpm) = e6d738b2880b833ea80aec709f7bcf20dac2e8c59d45f1627f61245b3aa9be845888152232e9f08145723514eb29aeada3d5d99641aabe9ec9af2a5c15f32777 +SHA512 (python2.7-2.7.18-19.el9.1.aarch64.rpm) = 66c8487a3323bb854ff79242287ae5d290315609b4f79fb985626e52d96286d6dfd2da9a8257e23be036b72adabbbec08d53db339935d5d6e8b6018417bbc769 +SHA512 (python2.7-2.7.18-19.el9.1.x86_64.rpm) = 55f03b17f649a2da9edae67c1ca7c84738a023fc3ab2e7d6060db8a2b8ddf20099147533f3d50ce3dfafec5ca988f75ff229e67d331bcb669c879802ab6555a9
commit 9294599c2450d4006ad696aa52415e7bfbf53e3b Author: Tom spot Callaway spot@fedoraproject.org Date: Thu Jan 27 16:38:58 2022 -0500
rebuild for libvpx
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index b7caa59..f4c01ac 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -56,7 +56,7 @@ Summary: Qt5 - QtWebEngine components Name: qt5-qtwebengine Version: 5.15.8 -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 @@ -617,6 +617,9 @@ done
%changelog +* Thu Jan 27 2022 Tom Callaway spot@fedoraproject.org - 5.15.8-3 +- rebuild for libvpx + * Sun Jan 23 2022 Kevin Kofler Kevin@tigcc.ticalc.org - 5.15.8-2 - Update Provides: bundled(*) version numbers, remove ones dropped upstream - Restore Provides: bundled(protobuf), unbundling support dropped years ago
commit 15ba324421e2fccdf6edf77e7f430a4bc2615ca3 Author: Troy Dawson tdawson@redhat.com Date: Wed Jan 26 09:39:53 2022 -0800
get_free_ffmpeg_source_files.py use python3
diff --git a/get_free_ffmpeg_source_files.py b/get_free_ffmpeg_source_files.py index 899e774..390ee3f 100755 --- a/get_free_ffmpeg_source_files.py +++ b/get_free_ffmpeg_source_files.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright 2015 Tomas Popela tpopela@redhat.com # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -73,7 +73,7 @@ def parse_ffmpeg_gyni_file(gyni_path, arch_not_arm): sys.stderr.write("Something went wrong, no sources parsed!\n") sys.exit(1)
- print ' '.join(output_sources) + print(' '.join(output_sources))
if __name__ == "__main__":