PR#11: [WIP] test merging rawhide into F36 - rpms/qt5-qtwebengine

rpms / qt5-qtwebengine

#11 [WIP] test merging rawhide into F36

Closed 2 years ago by ankursinha. Opened 2 years ago by ankursinha.

rpms/ ankursinha/qt5-qtwebengine forked-rawhide into f36

Drop obsolete no-icudtl-dat patch, code has been fixed upstream since 5.11.0

Kevin Kofler • 2 years ago

9816079

Rebuild (Qt 5.15.5)

Jan Grulich • 2 years ago

a9c79ab

5.15.9

Rex Dieter • 2 years ago

734c76e

Add missing includes

Jan Grulich • 2 years ago

2583ebb

Rebuild (Qt 5.15.4)

Jan Grulich • 2 years ago

28e4282

python2 rpms for rhel9 only

Troy Dawson • 2 years ago

6f87bfd

Update hunspell dictionary path by adding conditional support

Parag Nemade • 2 years ago

f79a838

.gitignore

file modified

		`@@ -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`

qt5-qtwebengine.spec

file modified

+25 -11

		`@@ -61,8 +61,8 @@`

		`Summary: Qt5 - QtWebEngine components`
		`Name: qt5-qtwebengine`
		`- Version: 5.15.8`
		`- Release: 5%{?dist}`
		`+ Version: 5.15.9`
		`+ 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 @@`
		`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`
		`@@ -117,6 +112,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:`

		`@@ -416,7 +412,7 @@`
		`pushd src/3rdparty/chromium`
		`popd`

		`- %if 0%{?epel:1}`
		`+ %if 0%{?rhel} && 0%{?rhel} == 9`
		`# Install python2 from rpms`
		`mkdir python2`
		`pushd python2`
		`@@ -429,9 +425,6 @@`
		`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`
		`@@ -448,6 +441,7 @@`
		`%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`
		`@@ -563,7 +557,11 @@`

		`%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 +667,22 @@`


		`%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)`
		`+`
		`+ * 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)`
		`+`
		`+ * 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)`

qtwebengine-everywhere-src-5.15.0-no-icudtl-dat.patch

file removed

-33

		`@@ -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;`
		`- }`

qtwebengine-skia-missing-includes.patch

file added

+15

		`@@ -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",`

sources

file modified

+1 -1

		`@@ -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`