2:55 a.m.
commit c43203af2c93cd82e938ca9c2da9150f313a569f
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Sat Feb 3 03:55:53 2024 +0100
Update to 5.15.16 to match Fedora.
* Sat Feb 03 2024 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.16-1
- 5.15.16
- Sync patches from Fedora (2 removed as fixed upstream, 1 ICU 74 fix added)
- Remove obsolete and unused BuildRequires: pkgconfig(protobuf) (as in Fedora)
- Add missing Provides: bundled(re2) (as in Fedora)
.gitignore | 1 +
qt5-qtwebengine-freeworld.spec | 23 +-
...5-Backport-of-16k-page-support-on-aarch64.patch | 372 ---------------------
qtwebengine-everywhere-src-5.15.5-TRUE.patch | 12 -
qtwebengine-icu-74.patch | 15 +
qtwebengine-release.sh | 2 +-
sources | 2 +-
7 files changed, 29 insertions(+), 398 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c472263..54f545f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/qtwebengine-everywhere-src-5.15.9.tar.xz
/qtwebengine-everywhere-src-5.15.10.tar.xz
/qtwebengine-everywhere-src-5.15.12.tar.xz
+/qtwebengine-everywhere-src-5.15.16.tar.xz
diff --git a/qt5-qtwebengine-freeworld.spec b/qt5-qtwebengine-freeworld.spec
index 1899b21..935dc81 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.12
-Release: 8%{?dist}
+Version: 5.15.16
+Release: 1%{?dist}
%global major_minor %(echo %{version} | cut -d. -f-2)
%global major %(echo %{version} | cut -d. -f1)
@@ -99,14 +99,7 @@ Patch8: qtwebengine-everywhere-5.15.8-libpipewire-0.3.patch
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
# Use Python2
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
-# Fix QtWebEngine on Apple M1 hardware (patch from Arch Linux ARM)
-## Cf. https://bugreports.qt.io/browse/QTBUG-108674
-## Cf. https://bugzilla.redhat.com/show_bug.cgi?id=2144200
-## From: https://chromium-review.googlesource.com/c/chromium/src/+/3545665
-Patch33: qtwebengine-5.15-Backport-of-16k-page-support-on-aarch64.patch
# Fixes for GCC 13
# https://bugzilla.redhat.com/show_bug.cgi?id=2164993
Patch34: qtwebengine-fix-build.patch
@@ -115,6 +108,7 @@ 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
## Upstream patches:
@@ -185,7 +179,6 @@ BuildRequires: pkgconfig(libwebp) >= 0.6.0
BuildRequires: pkgconfig(harfbuzz)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(opus)
-BuildRequires: pkgconfig(protobuf)
BuildRequires: pkgconfig(libevent)
BuildRequires: pkgconfig(poppler-cpp)
BuildRequires: pkgconfig(zlib)
@@ -302,6 +295,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
@@ -388,13 +382,12 @@ popd
## upstream patches
%patch -P 24 -p1 -b .aarch64-new-stat
%patch -P 26 -p1 -b .use-python2
-%patch -P 31 -p1 -b .TRUE
%patch -P 32 -p1 -b .skia-missing-includes
-%patch -P 33 -p1 -b .aarch64-16kb-support
%patch -P 34 -p1 -b .gcc-13
%patch -P 35 -p1 -b .c99
%patch -P 50 -p1 -b .0001-avcodec-x86-mathops-clip-constants-used-with-shift-i
+%patch -P 51 -p1 -b .icu-74
# delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we
# never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS
@@ -486,6 +479,12 @@ echo "%{_libdir}/%{name}" \
%changelog
+* Sat Feb 03 2024 Kevin Kofler <Kevin(a)tigcc.ticalc.org> - 5.15.16-1
+- 5.15.16
+- Sync patches from Fedora (2 removed as fixed upstream, 1 ICU 74 fix added)
+- Remove obsolete and unused BuildRequires: pkgconfig(protobuf) (as in Fedora)
+- Add missing Provides: bundled(re2) (as in Fedora)
+
* Thu Feb 01 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 5.15.12-8
- Sync patch with fedora
diff --git a/qtwebengine-icu-74.patch b/qtwebengine-icu-74.patch
new file mode 100644
index 0000000..703f5f3
--- /dev/null
+++ b/qtwebengine-icu-74.patch
@@ -0,0 +1,15 @@
+diff --git
a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+index e34b07372..c0f9268aa 100644
+---
a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
++++
b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -162,7 +162,9 @@ static const unsigned char
kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar
+ };
+ // clang-format on
+
+-#if U_ICU_VERSION_MAJOR_NUM >= 58
++#if U_ICU_VERSION_MAJOR_NUM >= 74
++#define BA_LB_COUNT (U_LB_COUNT - 8)
++#elif U_ICU_VERSION_MAJOR_NUM >= 58
+ #define BA_LB_COUNT (U_LB_COUNT - 3)
+ #else
+ #define BA_LB_COUNT U_LB_COUNT
diff --git a/qtwebengine-release.sh b/qtwebengine-release.sh
index a5ce247..ccec359 100755
--- a/qtwebengine-release.sh
+++ b/qtwebengine-release.sh
@@ -1,6 +1,6 @@
#!/bin/sh
set -x
-VERSION=5.15.12
+VERSION=5.15.16
CHROMIUMHASH=`wget
https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/3rdparty?h=$VERSION -q
--content-on-error -O - | grep "Bad object name: " | sed 's/^.*Bad object
name: \([0-9a-f]\{40\}\).*$/\1/g'`
rm -rf qtwebengine-$VERSION qtwebengine-$VERSION.tar.gz
qtwebengine-chromium-$CHROMIUMHASH qtwebengine-chromium-$CHROMIUMHASH.tar.gz
qtwebengine-everywhere-src-$VERSION
wget https://github.com/qt/qtwebengine/archive/$VERSION.tar.gz -O
qtwebengine-$VERSION.tar.gz || exit $?
diff --git a/sources b/sources
index cca97df..9a85f40 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (qtwebengine-everywhere-src-5.15.12.tar.xz) =
840531345de2d6b5166847904a2457d2d1f3bc3c86337d87f3d0d25ba4089575550d1eb9ff1ea7b23f697865f8e0b885f8ff4cef81df4cc8e07bafa383058db0
+SHA512 (qtwebengine-everywhere-src-5.15.16.tar.xz) =
1fabffe58db7cfa9c0f91d5963495159b90f4e6d67b0db9a01a8bbbba9303d12299317c3b485106a847f10a9d81a8ec8bc0986f284c1a2b1fa5bb0cfd9c7291e
SHA512 (pulseaudio-12.2-headers.tar.gz) =
a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be