extra/qt6-webengine to 6.6.1-2

This commit is contained in:
Kevin Mihelich 2023-12-18 16:56:03 +00:00
parent 64ddbbe932
commit 8c57e4887c
3 changed files with 27 additions and 2 deletions

View file

@ -1,7 +1,7 @@
pkgbase = qt6-webengine pkgbase = qt6-webengine
pkgdesc = Provides support for web applications using the Chromium browser project pkgdesc = Provides support for web applications using the Chromium browser project
pkgver = 6.6.1 pkgver = 6.6.1
pkgrel = 1 pkgrel = 2
url = https://www.qt.io url = https://www.qt.io
arch = x86_64 arch = x86_64
groups = qt6 groups = qt6
@ -66,7 +66,9 @@ pkgbase = qt6-webengine
optdepends = pipewire: WebRTC desktop sharing under Wayland 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 = 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 = libxml-2.12.patch
source = icu-74.patch
sha256sums = 7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691 sha256sums = 7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691
sha256sums = bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e sha256sums = bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e
sha256sums = 547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845
pkgname = qt6-webengine pkgname = qt6-webengine

View file

@ -11,7 +11,7 @@ highmem=1
pkgname=qt6-webengine pkgname=qt6-webengine
_qtver=6.6.1 _qtver=6.6.1
pkgver=${_qtver/-/} pkgver=${_qtver/-/}
pkgrel=1 pkgrel=2
arch=(x86_64) arch=(x86_64)
url='https://www.qt.io' url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom) license=(GPL3 LGPL3 FDL custom)
@ -77,15 +77,18 @@ groups=(qt6)
_pkgfn=${pkgname/6-/}-everywhere-src-$_qtver _pkgfn=${pkgname/6-/}-everywhere-src-$_qtver
source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz 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
0001-ARM-toolchain-fixes.patch 0001-ARM-toolchain-fixes.patch
0002-Run-blink-bindings-generation-single-threaded.patch) 0002-Run-blink-bindings-generation-single-threaded.patch)
sha256sums=('7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691' sha256sums=('7a6ea228214bd66029ca90549b29021f30f7544abff997b7f831ceac2ce73691'
'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e' 'bfae9e773edfd0ddbc617777fdd4c0609cba2b048be7afe40f97768e4eb6117e'
'547e092f6a20ebd15e486b31111145bc94b8709ec230da89c591963001378845'
'772aeba76d16387e28ef629285965109a4bfaa02ca2dd466e9526fe2030773ec' '772aeba76d16387e28ef629285965109a4bfaa02ca2dd466e9526fe2030773ec'
'eff4ebf2e714185ef6e36e30c8d2158da6b41a46e3168d06472d35f6c9977aaf') 'eff4ebf2e714185ef6e36e30c8d2158da6b41a46e3168d06472d35f6c9977aaf')
prepare() { prepare() {
patch -d $_pkgfn/src/3rdparty/chromium -p1 < libxml-2.12.patch 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
cd $_pkgfn cd $_pkgfn

View file

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