[arch-commits] Commit in electron/trunk (4 files)

[Nicola Squartini]

    Date: Friday, October 25, 2019 @ 02:59:06
  Author: tensor5
Revision: 518844

upgpkg: electron 7.0.0-1

Added:
  electron/trunk/chromium-system-icu.patch
  electron/trunk/chromium-system-zlib.patch
Modified:
  electron/trunk/PKGBUILD
  electron/trunk/default_app-icon.patch

----------------------------+
 PKGBUILD                   |   30 ++++++++++++++++++++++--------
 chromium-system-icu.patch  |   20 ++++++++++++++++++++
 chromium-system-zlib.patch |   13 +++++++++++++
 default_app-icon.patch     |    4 ++--
 4 files changed, 57 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-25 00:34:42 UTC (rev 518843)
+++ PKGBUILD	2019-10-25 02:59:06 UTC (rev 518844)
@@ -1,9 +1,9 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=electron
-pkgver=6.1.1
-_commit=aa863bc323d8ddfcae9e1211d9c2cb05f1f77c46
-_chromiumver=76.0.3809.146
+pkgver=7.0.0
+_commit=3083693e67632720b8d12b32d3811be0f4336318
+_chromiumver=78.0.3905.1
 pkgrel=1
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('x86_64')
@@ -12,7 +12,7 @@
 depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libnghttp2'
          'libxslt' 'libxss' 'minizip' 'nss' 're2' 'snappy')
 makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'java-runtime-headless'
-             'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' 'npm' 'pciutils'
+             'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' 'npm' 'pciutils' 'yarn'
              'python2' 'wget' 'yasm')
 optdepends=('kde-cli-tools: file deletion support (kioclient5)'
             'trash-cli: file deletion support (trash-put)'
@@ -23,13 +23,17 @@
         'default_app-icon.patch'
         'use-system-libraries-in-node.patch'
         'chromium-skia-harmony.patch'
+        'chromium-system-icu.patch'
+        'chromium-system-zlib.patch'
        )
 sha256sums=('SKIP'
             'SKIP'
             '5270db01f3f8aaa5137dec275a02caa832b7f2e37942e068cba8d28b3a29df39'
-            '545196274b7fac0cf1e1169624bbc67414bb47a65c5112c88b6c0f4f9cb5914c'
+            '3d97c2b6d83a0c6dd22609484abd841a1c34dde45bd024cccbb85d4ae249dff5'
             'c7eadac877179e586d0cce7f898aa1462b4c207733e68ecc17de9754b691713a'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
+            'e73cc2ee8d3ea35aab18c478d76fdfc68ca4463e1e10306fa1e738c03b3f26b5'
+            'eb67eda4945a89c3b90473fa8dc20637511ca4dcb58879a8ed6bf403700ca9c8'
            )
 
 _system_libs=('ffmpeg'
@@ -97,11 +101,15 @@
   python2 src/third_party/depot_tools/download_from_google_storage.py \
     --no_resume --extract --no_auth --bucket chromium-nodejs \
     -s src/third_party/node/node_modules.tar.gz.sha1
-  vpython src/chrome/android/profiles/update_afdo_profile.py
+  vpython src/tools/download_cros_provided_profile.py \
+    --newest_state=src/chrome/android/profiles/newest.txt \
+    --local_state=src/chrome/android/profiles/local.txt \
+    --output_name=src/chrome/android/profiles/afdo.prof \
+    --gs_url_base=chromeos-prebuilt/afdo-job/llvm
   python2 src/electron/script/apply_all_patches.py \
-      src/electron/patches/common/config.json
+      src/electron/patches/config.json
   cd src/electron
-  npm install
+  yarn install --frozen-lockfile
   cd ..
 
   echo "Patching Chromium for using system libraries..."
@@ -125,6 +133,8 @@
 
   echo "Applying local patches..."
   patch -Np0 -i ../chromium-skia-harmony.patch
+  patch -Np1 -i ../chromium-system-icu.patch
+  patch -Np1 -i ../chromium-system-zlib.patch
   patch -Np1 -i ../use-system-libraries-in-node.patch
   patch -Np1 -i ../default_app-icon.patch  # Icon from .desktop file
 }
@@ -135,6 +145,10 @@
   export AR=ar
   export NM=nm
 
+  # Do not warn about unknown warning options
+  CFLAGS+='   -Wno-unknown-warning-option'
+  CXXFLAGS+=' -Wno-unknown-warning-option'
+
   cd src
   export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools"
   GN_EXTRA_ARGS='

Added: chromium-system-icu.patch
===================================================================
--- chromium-system-icu.patch	                        (rev 0)
+++ chromium-system-icu.patch	2019-10-25 02:59:06 UTC (rev 518844)
@@ -0,0 +1,20 @@
+diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn
+index 4450e40..9ca36dd 100644
+--- a/build/linux/unbundle/icu.gn
++++ b/build/linux/unbundle/icu.gn
+@@ -96,6 +96,7 @@ shim_headers("icui18n_shim") {
+     "unicode/fpositer.h",
+     "unicode/gender.h",
+     "unicode/gregocal.h",
++    "unicode/listformatter.h",
+     "unicode/measfmt.h",
+     "unicode/measunit.h",
+     "unicode/measure.h",
+@@ -178,7 +179,6 @@ shim_headers("icuuc_shim") {
+     "unicode/icudataver.h",
+     "unicode/icuplug.h",
+     "unicode/idna.h",
+-    "unicode/listformatter.h",
+     "unicode/localpointer.h",
+     "unicode/locdspnm.h",
+     "unicode/locid.h",

Added: chromium-system-zlib.patch
===================================================================
--- chromium-system-zlib.patch	                        (rev 0)
+++ chromium-system-zlib.patch	2019-10-25 02:59:06 UTC (rev 518844)
@@ -0,0 +1,13 @@
+diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn
+index 3bc618a..e0ddf6d 100644
+--- a/third_party/perfetto/gn/BUILD.gn
++++ b/third_party/perfetto/gn/BUILD.gn
+@@ -244,7 +244,7 @@ if (enable_perfetto_trace_processor || perfetto_build_standalone ||
+         "//buildtools:zlib",
+       ]
+     } else {
+-      public_configs = [ "//third_party/zlib:zlib_config" ]
++      public_configs = [ "//third_party/zlib:system_zlib" ]
+       public_deps = [
+         "//third_party/zlib",
+       ]

Modified: default_app-icon.patch
===================================================================
--- default_app-icon.patch	2019-10-25 00:34:42 UTC (rev 518843)
+++ default_app-icon.patch	2019-10-25 02:59:06 UTC (rev 518844)
@@ -1,6 +1,6 @@
 --- a/electron/default_app/default_app.ts
 +++ b/electron/default_app/default_app.ts
-@@ -64,7 +64,7 @@
+@@ -60,7 +60,7 @@
    }
  
    if (process.platform === 'linux') {
@@ -11,7 +11,7 @@
    mainWindow = new BrowserWindow(options)
 --- a/electron/filenames.gni
 +++ b/electron/filenames.gni
-@@ -100,7 +100,6 @@
+@@ -7,7 +7,6 @@
    ]
  
    default_app_static_sources = [