[arch-commits] Commit in qt5-webengine/trunk (2 files)

[Antonio Rojas]

    Date: Thursday, May 20, 2021 @ 16:08:36
  Author: arojas
Revision: 415790

Replace custom patches by cherry-picks

Modified:
  qt5-webengine/trunk/PKGBUILD
Deleted:
  qt5-webengine/trunk/v8-call-new-ListFormatter-createInstance.patch

------------------------------------------------+
 PKGBUILD                                       |    7 -
 v8-call-new-ListFormatter-createInstance.patch |   95 -----------------------
 2 files changed, 2 insertions(+), 100 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-20 15:57:57 UTC (rev 415789)
+++ PKGBUILD	2021-05-20 16:08:36 UTC (rev 415790)
@@ -17,12 +17,10 @@
 _pkgfqn=qtwebengine
 source=(git+https://code.qt.io/qt/qtwebengine.git#tag=v$pkgver-lts
         git+https://code.qt.io/qt/qtwebengine-chromium.git
-        v8-call-new-ListFormatter-createInstance.patch
         qt5-webengine-glibc-2.33.patch
         qtbug-91773.patch)
 sha256sums=('SKIP'
             'SKIP'
-            '44ebcff050a1c849819d66399c14bd711801d0eb64f518d292d3d6efedce3b3a'
             '2294e5390c869963fc58f7bf1ee0a254a3f7fce3ed00c04e34a5f03e2b31b624'
             '02009c7f87a216131ab96418c9ddb21e697e61668a970b972242f0015b36ba4c')
 
@@ -36,13 +34,12 @@
   git submodule update
 
   patch -p1 < "$srcdir"/qtbug-91773.patch # Fix load signals 4d4fc9cd120376f30ce0630b1e8c7bf174d44fae
-  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 src/3rdparty
   git cherry-pick -n b498f4ce3f542882767238ea9f01eb85de6c6fda # Fix build with GCC 11
-  sed -e 's|V8_PATCH_LEVEL 31|V8_PATCH_LEVEL 32|' -i chromium/v8/include/v8-version.h # Bump V8 patch version to prevent crashes
-  
+  git cherry-pick -n 12ecfd11e326219ef185e7fdd6d967985fc57599 # Fix crashes due to old cached data  
+  git cherry-pick -n e67c7b49247c8b9646790c718b85d8ba75b68945 # Fix build with ICU 69
 }
 
 build() {

Deleted: v8-call-new-ListFormatter-createInstance.patch
===================================================================
--- v8-call-new-ListFormatter-createInstance.patch	2021-05-20 15:57:57 UTC (rev 415789)
+++ v8-call-new-ListFormatter-createInstance.patch	2021-05-20 16:08:36 UTC (rev 415790)
@@ -1,95 +0,0 @@
-From 035c305ce7761f51328b45f1bd83e26aef267c9d Mon Sep 17 00:00:00 2001
-From: Frank Tang <ftang at chromium.org>
-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 <jkummerow at chromium.org>
-Commit-Queue: Frank Tang <ftang at chromium.org>
-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> JSListFormat::New(Isolate* isolate, Handle<Map> 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),