[arch-commits] Commit in electron6/trunk (3 files)

Evangelos Foutras foutrelis at archlinux.org
Thu Apr 15 21:11:55 UTC 2021


    Date: Thursday, April 15, 2021 @ 21:11:55
  Author: foutrelis
Revision: 919217

upgpkg: electron6 6.1.12-6: icu 69.1 rebuild

Added:
  electron6/trunk/v8-call-new-ListFormatter-createInstance.patch
  electron6/trunk/v8-remove-unnecessary-COUNT.patch
Modified:
  electron6/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |    8 +
 v8-call-new-ListFormatter-createInstance.patch |   95 +++++++++++++++++++++++
 v8-remove-unnecessary-COUNT.patch              |   73 +++++++++++++++++
 3 files changed, 175 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-15 21:04:38 UTC (rev 919216)
+++ PKGBUILD	2021-04-15 21:11:55 UTC (rev 919217)
@@ -4,7 +4,7 @@
 pkgver=6.1.12
 _commit=cb408dbb5bc2e98b22690a22bf3e14d233d76676
 _chromiumver=76.0.3809.146
-pkgrel=5
+pkgrel=6
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('x86_64')
 url='https://electronjs.org/'
@@ -24,6 +24,8 @@
         'use-system-libraries-in-node.patch'
         'icu65.patch'
         'icu67.patch'
+        'v8-remove-unnecessary-COUNT.patch'
+        'v8-call-new-ListFormatter-createInstance.patch'
         'chromium-gcc10.patch'
         'angle-gcc10.patch'
         'perfetto-clang11.patch'
@@ -41,6 +43,8 @@
             '147563fe422108598af26c617edf78d146d4e70223e3093216d5f63a1ab051eff95abd0c8f8c0b6f8a504ae26557d65cd0ffd90c542d6534176b72b99ea44a5e'
             'd109937c4a5fba96e82d6fbc7b804943010d5723eef91af4f79355c8b84214da3978fc784dd0fcc3ed228c4684d0d06cf8cd21fa32fc5ec80c00d1bb4e3b9c90'
             'b46eeef32c7c773babe15da0c118ca55bf3c084142592695853a73f80b5dc55336cad72636f8ed2308fe9c10bcab953e37ca7ab08f20f545b881fe99a543d247'
+            '5db77e2398321b65d17aad2437078686029ad0bfcc7b276ec328bc92f8731181f96dbd98e7293f179d8df9b0861ff22d537223918f7f64e683b5d71e22dfe118'
+            'd21c1e3ba9ce31358a08579b8ff5dd60c231c5f9074d3b225f671889aa3e0c28259f6dce789adc838729edc4d81a23da4d81ec9ac188a7652c43c1396e21b5b4'
             '682cbc25a332ea30e2475fc39fa8e6ce395f65b974520121ccf7be90b7744b0f9b98313e2d9ac0e56a0e41fd444e8dec80a7e8565b7e91508bfe8234e4105f6b'
             'fd8e523b657205ed1cb64581bd9e5597183c1575f0d0523dcc708e3b67e4ff2dcb962b41254b7ad7b180a317161ab47b7e262d2321ac1b21718c3b1bccc54c3e'
             'd9d232c98cf80d2b337e85883fa07a845fa2f4ffdc73b890f46aa5abba14efadba80d964995b3088476dc93237c203b8bfa91f3bc5f95ab3eb71b57dc3c127b0'
@@ -148,6 +152,8 @@
   patch -Np4 -i ../qt5-webengine-glibc-2.33.patch
   patch -Np1 -i ../icu65.patch
   patch -Np1 -d v8 <../icu67.patch
+  patch -Np1 -d v8 <../v8-remove-unnecessary-COUNT.patch
+  patch -Np1 -d v8 -F3 <../v8-call-new-ListFormatter-createInstance.patch
   patch -Np1 -i ../chromium-gcc10.patch
   patch -Np1 -d third_party/angle <../angle-gcc10.patch
   patch -Np1 -d third_party/perfetto <../perfetto-clang11.patch

Added: v8-call-new-ListFormatter-createInstance.patch
===================================================================
--- v8-call-new-ListFormatter-createInstance.patch	                        (rev 0)
+++ v8-call-new-ListFormatter-createInstance.patch	2021-04-15 21:11:55 UTC (rev 919217)
@@ -0,0 +1,95 @@
+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),

Added: v8-remove-unnecessary-COUNT.patch
===================================================================
--- v8-remove-unnecessary-COUNT.patch	                        (rev 0)
+++ v8-remove-unnecessary-COUNT.patch	2021-04-15 21:11:55 UTC (rev 919217)
@@ -0,0 +1,73 @@
+From 3777f4199ad056a183931964441912278d1319d7 Mon Sep 17 00:00:00 2001
+From: Frank Tang <ftang at chromium.org>
+Date: Fri, 19 Jul 2019 14:29:44 -0700
+Subject: [PATCH] Remove unnecessary COUNT from enum
+
+Bug: v8:9523
+Change-Id: Ib9d6772d2025b0452ddcd777cc777276f9038e97
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1710960
+Reviewed-by: Adam Klein <adamk at chromium.org>
+Commit-Queue: Frank Tang <ftang at chromium.org>
+Cr-Commit-Position: refs/heads/master@{#62836}
+---
+ src/objects/js-list-format.cc | 15 +++------------
+ 1 file changed, 3 insertions(+), 12 deletions(-)
+
+diff --git a/src/objects/js-list-format.cc b/src/objects/js-list-format.cc
+index de47729fce..4f303b1874 100644
+--- a/src/objects/js-list-format.cc
++++ b/src/objects/js-list-format.cc
+@@ -50,8 +50,6 @@ const char* GetIcuStyleString(JSListFormat::Style style,
+           return kStandardShort;
+         case JSListFormat::Style::NARROW:
+           return kStandardNarrow;
+-        case JSListFormat::Style::COUNT:
+-          UNREACHABLE();
+       }
+     case JSListFormat::Type::DISJUNCTION:
+       switch (style) {
+@@ -61,8 +59,6 @@ const char* GetIcuStyleString(JSListFormat::Style style,
+           return kOrShort;
+         case JSListFormat::Style::NARROW:
+           return kOrNarrow;
+-        case JSListFormat::Style::COUNT:
+-          UNREACHABLE();
+       }
+     case JSListFormat::Type::UNIT:
+       switch (style) {
+@@ -72,12 +68,9 @@ const char* GetIcuStyleString(JSListFormat::Style style,
+           return kUnitShort;
+         case JSListFormat::Style::NARROW:
+           return kUnitNarrow;
+-        case JSListFormat::Style::COUNT:
+-          UNREACHABLE();
+       }
+-    case JSListFormat::Type::COUNT:
+-      UNREACHABLE();
+   }
++  UNREACHABLE();
+ }
+ 
+ }  // namespace
+@@ -238,9 +231,8 @@ Handle<String> JSListFormat::StyleAsString() const {
+       return GetReadOnlyRoots().short_string_handle();
+     case Style::NARROW:
+       return GetReadOnlyRoots().narrow_string_handle();
+-    case Style::COUNT:
+-      UNREACHABLE();
+   }
++  UNREACHABLE();
+ }
+ 
+ Handle<String> JSListFormat::TypeAsString() const {
+@@ -251,9 +243,8 @@ Handle<String> JSListFormat::TypeAsString() const {
+       return GetReadOnlyRoots().disjunction_string_handle();
+     case Type::UNIT:
+       return GetReadOnlyRoots().unit_string_handle();
+-    case Type::COUNT:
+-      UNREACHABLE();
+   }
++  UNREACHABLE();
+ }
+ 
+ namespace {



More information about the arch-commits mailing list