commit 57fb4f8ad7cdc739c0b0c4501cf595bec1725f94 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Mon Jul 8 15:49:55 2024 +0100 5.15.17 .gitignore | 1 + ...-mathops-clip-constants-used-with-shift-i.patch | 75 ---------------------- fix_build_pdf_extension_util.patch | 10 +++ qt5-qtwebengine-freeworld.spec | 43 +++++++------ qtwebengine-5.15.13_p20240322-ninja1.12.patch | 27 ++++++++ qtwebengine-everywhere-5.15.5-use-python2.patch | 22 ------- qtwebengine-icu-74.patch | 15 ----- sources | 2 +- 8 files changed, 63 insertions(+), 132 deletions(-) --- diff --git a/.gitignore b/.gitignore index 54f545f..e941492 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /qtwebengine-everywhere-src-5.15.10.tar.xz /qtwebengine-everywhere-src-5.15.12.tar.xz /qtwebengine-everywhere-src-5.15.16.tar.xz +/qtwebengine-everywhere-src-5.15.17.tar.xz diff --git a/fix_build_pdf_extension_util.patch b/fix_build_pdf_extension_util.patch new file mode 100644 index 0000000..0b4c754 --- /dev/null +++ b/fix_build_pdf_extension_util.patch @@ -0,0 +1,10 @@ +--- ./src/3rdparty/chromium/qtwebengine/browser/pdf/BUILD.gn.orig 2024-07-03 13:49:13.812285886 +0100 ++++ ./src/3rdparty/chromium/qtwebengine/browser/pdf/BUILD.gn 2024-07-03 13:51:45.789966941 +0100 +@@ -6,6 +6,7 @@ source_set("pdf") { + ] + + deps = [ ++ "//chrome/app:generated_resources", + "//content/public/browser", + ] + } diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec index f5a416f..23c61f2 100644 --- a/qt5-qtwebengine-freeworld.spec +++ b/qt5-qtwebengine-freeworld.spec @@ -62,8 +62,8 @@ Summary: Qt5 - QtWebEngine components (freeworld version) Name: qt5-qtwebengine-freeworld -Version: 5.15.16 -Release: 3%{?dist} +Version: 5.15.17 +Release: 1%{?dist} %global major_minor %(echo %{version} | cut -d. -f-2) %global major %(echo %{version} | cut -d. -f1) @@ -106,9 +106,9 @@ Patch34: qtwebengine-fix-build.patch # https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/628adfbb0613c892b916... Patch35: qt5-qtwebengine-c99.patch -# Fix assembly with binutils 2.41 https://fftrac-bg.ffmpeg.org/ticket/10405 -Patch50: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch -Patch51: qtwebengine-icu-74.patch +# Fix build +Patch61: qtwebengine-5.15.13_p20240322-ninja1.12.patch +Patch62: fix_build_pdf_extension_util.patch ## Upstream patches: @@ -138,6 +138,7 @@ BuildRequires: cmake BuildRequires: bison BuildRequires: flex BuildRequires: gcc-c++ +BuildRequires: binutils-gold # gn links statically (for now) BuildRequires: libstdc++-static BuildRequires: git-core @@ -367,27 +368,28 @@ mv pulse src/3rdparty/chromium/ pushd src/3rdparty/chromium popd -%patch -P 2 -p1 -b .fix-extractcflag +%patch -P2 -p1 -b .fix-extractcflag %if !0%{?arm_neon} -%patch -P 3 -p1 -b .no-neon +%patch -P3 -p1 -b .no-neon %endif -%patch -P 4 -p1 -b .SIOCGSTAMP -%patch -P 5 -p1 -b .QT_DEPRECATED_VERSION -%patch -P 6 -p1 -b .angle_nullptr -%patch -P 7 -p1 -b .hunspell_nullptr +%patch -P4 -p1 -b .SIOCGSTAMP +%patch -P5 -p1 -b .QT_DEPRECATED_VERSION +%patch -P6 -p1 -b .angle_nullptr +%patch -P7 -p1 -b .hunspell_nullptr #if 0%{?pipewire} -%patch -P 8 -p1 -b .libpipewire-0.3 +%patch -P8 -p1 -b .libpipewire-0.3 #endif ## upstream patches -%patch -P 24 -p1 -b .aarch64-new-stat -%patch -P 26 -p1 -b .use-python2 -%patch -P 32 -p1 -b .skia-missing-includes -%patch -P 34 -p1 -b .gcc-13 -%patch -P 35 -p1 -b .c99 +%patch -P24 -p1 -b .aarch64-new-stat +%patch -P26 -p1 -b .use-python2 +%patch -P32 -p1 -b .skia-missing-includes +%patch -P34 -p1 -b .gcc-13 -%patch -P 50 -p1 -b .0001-avcodec-x86-mathops-clip-constants-used-with-shift-i -%patch -P 51 -p1 -b .icu-74 +%patch -P35 -p1 -b .c99 + +%patch -P61 -p1 +%patch -P62 -p1 # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS @@ -479,6 +481,9 @@ echo "%{_libdir}/%{name}" \ %changelog +* Mon Jul 08 2024 Sérgio Basto <sergio(a)serjux.com&gt; - 5.15.17-1 +- 5.15.17 + * Thu Jun 13 2024 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 5.15.16-3 - Rebuild for qt-5.15.14 diff --git a/qtwebengine-5.15.13_p20240322-ninja1.12.patch b/qtwebengine-5.15.13_p20240322-ninja1.12.patch new file mode 100644 index 0000000..0fdf13e --- /dev/null +++ b/qtwebengine-5.15.13_p20240322-ninja1.12.patch @@ -0,0 +1,27 @@ +Quoting the description from qtwebengine-6.7.0-ninja1.12.patch: +""" +Patch status: pending being looked at upstream + +Issue[1][2][3] also exist in chromium itself[4], and unclear +why this started happening only with ninja-1.12.0 at the moment. + +Just a quickfix, likely not fully correct and seems there may +be further unresolved race issues. + +[1] https://bugs.gentoo.org/930107 +[2] https://bugreports.qt.io/browse/QTBUG-124375 +[3] https://github.com/ninja-build/ninja/issues/2417 +[4] https://bugs.gentoo.org/930112 +""" + +This has a hunk removed but is otherwise the same. +--- ./src/3rdparty/chromium/content/browser/BUILD.gn.orig 2024-03-26 14:47:34.000000000 +0000 ++++ ./src/3rdparty/chromium/content/browser/BUILD.gn 2024-06-24 04:57:25.108720935 +0100 +@@ -196,6 +196,7 @@ jumbo_static_library("browser") { + "//content/common", + "//content/common:buildflags", + "//content/common:mojo_bindings", ++ "//components/spellcheck:buildflags", + "//content/public/browser:proto", + "//content/public/common:common_sources", + "//content/public/common:content_descriptor_keys", diff --git a/qtwebengine-everywhere-5.15.5-use-python2.patch b/qtwebengine-everywhere-5.15.5-use-python2.patch index 9626d27..91a17ae 100644 --- a/qtwebengine-everywhere-5.15.5-use-python2.patch +++ b/qtwebengine-everywhere-5.15.5-use-python2.patch @@ -1,25 +1,3 @@ -diff --git a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py -index 8af373102..b551c0fe2 100644 ---- a/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py -+++ b/src/3rdparty/chromium/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py -@@ -83,7 +83,7 @@ def _MinifyJS(input_js): - - with tempfile.NamedTemporaryFile() as _: - args = [ -- 'python', -+ 'python2', - rjsmin_path - ] - p = subprocess.Popen(args, -@@ -203,7 +203,7 @@ def _MinifyCSS(css_text): - os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py')) - - with tempfile.NamedTemporaryFile() as _: -- rcssmin_args = ['python', rcssmin_path] -+ rcssmin_args = ['python2', rcssmin_path] - p = subprocess.Popen(rcssmin_args, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, diff --git a/src/webengine/module.pro b/src/webengine/module.pro index 49a1086b2..afc89d49e 100644 --- a/src/webengine/module.pro diff --git a/sources b/sources index 9a85f40..e3747f1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qtwebengine-everywhere-src-5.15.16.tar.xz) = 1fabffe58db7cfa9c0f91d5963495159b90f4e6d67b0db9a01a8bbbba9303d12299317c3b485106a847f10a9d81a8ec8bc0986f284c1a2b1fa5bb0cfd9c7291e +SHA512 (qtwebengine-everywhere-src-5.15.17.tar.xz) = db541ecaf7b27c3e81bbf6567d07f269e0d877caf1605a24abd8bccc67f51539a3aae20279d38f233ddd0de3e4d1855cd83d67104841191b672b8c595ebbff96 SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be