Antonio Rojas pushed to branch main at Arch Linux / Packaging / Packages /
qt6-webengine
Commits:
430184ce by Antonio Rojas at 2023-12-11T19:57:04+01:00
upgpkg: 6.6.1-2: ICU 74 rebuild
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + icu-74.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = qt6-webengine
pkgdesc = Provides support for web applications using the Chromium
browser project
pkgver = 6.6.1
- pkgrel = 1
+ pkgrel = 2
url = https://www.qt.io
arch = x86_64
groups = qt6
@@ -66,7 +66,9 @@ pkgbase = qt6-webengine
optdepends = pipewire: WebRTC desktop sharing under Wayland
source =
https://download.qt.io/official_releases/qt/6.6/6.6.1/submodules/qtwebengine-everywhere-src-6.6.1.tar.xz
source = libxml-2.12.patch
+ source = icu-74.patch
sha256sums =
7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691
sha256sums =
bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e
+ sha256sums =
547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845
pkgname = qt6-webengine
=====================================
PKGBUILD
=====================================
@@ -4,7 +4,7 @@
pkgname=qt6-webengine
_qtver=6.6.1
pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
arch=(x86_64)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -69,12 +69,15 @@ optdepends=('pipewire: WebRTC desktop sharing under
Wayland')
groups=(qt6)
_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz
- libxml-2.12.patch)
+ libxml-2.12.patch
+ icu-74.patch)
sha256sums=('7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691'
- 'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e')
+ 'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e'
+ '547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845')
prepare() {
patch -d $_pkgfn/src/3rdparty/chromium -p1 < libxml-2.12.patch
+ patch -d $_pkgfn/src/3rdparty/chromium -p1 < icu-74.patch # Fix build with
ICU 74 - patch from Alpine
}
build() {
=====================================
icu-74.patch
=====================================
@@ -0,0 +1,20 @@
+See ICU change
https://github.com/unicode-org/icu/commit/2e45e6ec0e84a1c01812015a254ea31b286316fb
+
+Similar has happened in the past. See:
+https://chromium.googlesource.com/chromium/src/+/e60b571faa3f14dd9119a6792dccf12f8bf80192
+
+diff --git a/third_party/blink/renderer/platform/text/text_break_iterator.cc
b/third_party/blink/renderer/platform/text/text_break_iterator.cc
+index ddfbd51..247da06 100644
+--- a/third_party/blink/renderer/platform/text/text_break_iterator.cc
++++ b/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -161,7 +161,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
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/commit/430184ce04292f07d57c821ddb4153857b0b1162
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-webengine/-/commit/430184ce04292f07d57c821ddb4153857b0b1162
You're receiving this email because of your account on gitlab.archlinux.org.
