From 4f06d80586780d61a7f5b699b43cda8a1d7e1112 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 17 Apr 2021 19:25:05 +0000 Subject: [PATCH] extra/qt5-webengine to 5.15.3-4 --- extra/qt5-webengine/PKGBUILD | 5 +- ...all-new-ListFormatter-createInstance.patch | 95 +++++++++++++++++++ 2 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 extra/qt5-webengine/v8-call-new-ListFormatter-createInstance.patch diff --git a/extra/qt5-webengine/PKGBUILD b/extra/qt5-webengine/PKGBUILD index 769300d69..c302c0fc2 100644 --- a/extra/qt5-webengine/PKGBUILD +++ b/extra/qt5-webengine/PKGBUILD @@ -12,7 +12,7 @@ highmem=1 pkgname=qt5-webengine _qtver=5.15.3 pkgver=${_qtver/-/} -pkgrel=3.1 +pkgrel=4 _commit=a059e7404a6db799f4da0ad696e65ae9c854b4b0 # Upstream won't tag releases, because potatoes https://lists.qt-project.org/pipermail/interest/2021-March/036386.html arch=('x86_64') @@ -27,6 +27,7 @@ groups=('qt' 'qt5') _pkgfqn=qtwebengine source=(git+https://code.qt.io/qt/qtwebengine.git#commit=$_commit git+https://code.qt.io/qt/qtwebengine-chromium.git + v8-call-new-ListFormatter-createInstance.patch qt5-webengine-glibc-2.33.patch 0001-ARM-toolchain-fixes.patch 0002-Fix-ARM-skia-ICE.patch @@ -35,6 +36,7 @@ source=(git+https://code.qt.io/qt/qtwebengine.git#commit=$_commit 0005-Fix-sandbox-Aw-snap-for-sycalls-403-and-407.patch) sha256sums=('SKIP' 'SKIP' + '44ebcff050a1c849819d66399c14bd711801d0eb64f518d292d3d6efedce3b3a' '2294e5390c869963fc58f7bf1ee0a254a3f7fce3ed00c04e34a5f03e2b31b624' '10b3fed2d67b3a1f487d2d95c9a603fcbc23f08d4528d1986a6d0010c9e466bc' '48f37525c7066b0119b10981ae59139189ca3423db6bd14da6e064065d5d3016' @@ -52,6 +54,7 @@ prepare() { git submodule update git cherry-pick -n 199ea00a9eea13315a652c62778738629185b059 # Fix crashes with some locales + patch -p1 -d src/3rdparty/chromium/v8 -i "$srcdir"/v8-call-new-ListFormatter-createInstance.patch # Fix build with ICU 69 patch -p1 -i "$srcdir"/qt5-webengine-glibc-2.33.patch # Fix text rendering when building with glibc 2.33 cd "$srcdir/$_pkgfqn/src/3rdparty" diff --git a/extra/qt5-webengine/v8-call-new-ListFormatter-createInstance.patch b/extra/qt5-webengine/v8-call-new-ListFormatter-createInstance.patch new file mode 100644 index 000000000..1a35030c7 --- /dev/null +++ b/extra/qt5-webengine/v8-call-new-ListFormatter-createInstance.patch @@ -0,0 +1,95 @@ +From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001 +From: Frank Tang +Date: Thu, 15 Oct 2020 22:44:27 -0700 +Subject: [PATCH] [Intl] call new ListFormatter::createInstance + +The one we currently using is now marked as internal and to be removed +for 68. Migrating to the style which already avaiable in ICU 67-1. + +Bug: v8:11031 +Change-Id: I668382a2e1b8602ddca02bf231c5008a6c92bf2d +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477751 +Reviewed-by: Jakob Kummerow +Commit-Queue: Frank Tang +Cr-Commit-Position: refs/heads/master@{#70638} +--- + src/objects/js-list-format.cc | 55 ++++++++++++----------------------- + 1 file changed, 18 insertions(+), 37 deletions(-) + +diff --git a/src/objects/js-list-format.cc b/src/objects/js-list-format.cc +index b17d38c43ff5..e48a387be50f 100644 +--- a/src/objects/js-list-format.cc ++++ b/src/objects/js-list-format.cc +@@ -29,46 +29,27 @@ namespace v8 { + namespace internal { + + namespace { +-const char* kStandard = "standard"; +-const char* kOr = "or"; +-const char* kUnit = "unit"; +-const char* kStandardShort = "standard-short"; +-const char* kOrShort = "or-short"; +-const char* kUnitShort = "unit-short"; +-const char* kStandardNarrow = "standard-narrow"; +-const char* kOrNarrow = "or-narrow"; +-const char* kUnitNarrow = "unit-narrow"; +- +-const char* GetIcuStyleString(JSListFormat::Style style, +- JSListFormat::Type type) { ++ ++UListFormatterWidth GetIcuWidth(JSListFormat::Style style) { ++ switch (style) { ++ case JSListFormat::Style::LONG: ++ return ULISTFMT_WIDTH_WIDE; ++ case JSListFormat::Style::SHORT: ++ return ULISTFMT_WIDTH_SHORT; ++ case JSListFormat::Style::NARROW: ++ return ULISTFMT_WIDTH_NARROW; ++ } ++ UNREACHABLE(); ++} ++ ++UListFormatterType GetIcuType(JSListFormat::Type type) { + switch (type) { + case JSListFormat::Type::CONJUNCTION: +- switch (style) { +- case JSListFormat::Style::LONG: +- return kStandard; +- case JSListFormat::Style::SHORT: +- return kStandardShort; +- case JSListFormat::Style::NARROW: +- return kStandardNarrow; +- } ++ return ULISTFMT_TYPE_AND; + case JSListFormat::Type::DISJUNCTION: +- switch (style) { +- case JSListFormat::Style::LONG: +- return kOr; +- case JSListFormat::Style::SHORT: +- return kOrShort; +- case JSListFormat::Style::NARROW: +- return kOrNarrow; +- } ++ return ULISTFMT_TYPE_OR; + case JSListFormat::Type::UNIT: +- switch (style) { +- case JSListFormat::Style::LONG: +- return kUnit; +- case JSListFormat::Style::SHORT: +- return kUnitShort; +- case JSListFormat::Style::NARROW: +- return kUnitNarrow; +- } ++ return ULISTFMT_TYPE_UNITS; + } + UNREACHABLE(); + } +@@ -143,7 +124,7 @@ MaybeHandle JSListFormat::New(Isolate* isolate, Handle map, + icu::Locale icu_locale = r.icu_locale; + UErrorCode status = U_ZERO_ERROR; + icu::ListFormatter* formatter = icu::ListFormatter::createInstance( +- icu_locale, GetIcuStyleString(style_enum, type_enum), status); ++ icu_locale, GetIcuType(type_enum), GetIcuWidth(style_enum), status); + if (U_FAILURE(status) || formatter == nullptr) { + delete formatter; + THROW_NEW_ERROR(isolate, NewRangeError(MessageTemplate::kIcuError),