import from community

1 files changed, 49 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 229b5576db95..91b1f7866988 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,25 @@
-# Contributor: Nicola Squartini <tensor5@gmail.com>
+# Maintainer: Nicola Squartini <tensor5@gmail.com>
 
 pkgname=electron9
 pkgver=9.4.4
 _commit=f981f3a7c41767fa5ec13cbc8e2242129db96e7a
 _chromiumver=83.0.4103.122
-pkgrel=2
+pkgrel=6
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('x86_64')
 url='https://electronjs.org/'
 license=('MIT' 'custom')
-depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libxslt' 'libxss'
-         'minizip' 'nss' 're2' 'snappy')
+depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libnghttp2'
+         'libxslt' 'libxss' 'minizip' 'nss' 're2' 'snappy')
 makedepends=('clang' 'git' 'gn-m85' 'gperf' 'harfbuzz-icu' 'java-runtime-headless'
              'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' 'npm' 'pciutils' 'yarn'
-             'python2' 'wget' 'yasm')
+             'python2' 'python' 'python-httplib2' 'python-pyparsing' 'python-six'
+             'wget' 'yasm')
 optdepends=('kde-cli-tools: file deletion support (kioclient5)'
             'libappindicator-gtk3: StatusNotifierItem support'
             'trash-cli: file deletion support (trash-put)'
             "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)")
+options=('!lto') # Electron adds its own flags for ThinLTO
 source=('git+https://github.com/electron/electron.git'
         'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git'
         'electron9.desktop'
@@ -25,15 +27,25 @@ source=('git+https://github.com/electron/electron.git'
         'use-system-libraries-in-node.patch'
         'add-missing-algorithm-header-in-crx_install_error.cc.patch'
         'avoid-double-destruction-of-ServiceWorkerObjectHost.patch'
+        'breakpad-fix-for-non-constant-SIGSTKSZ.patch'
         'chromium-83-gcc-10.patch'
         'chromium-ffmpeg-4.3.patch'
         'qt5-webengine-glibc-2.33.patch'
+        'chromium-harfbuzz-3.0.0.patch'
+        'skia-harfbuzz-3.0.0.patch'
+        'chromium-include-limits.patch'
         'chromium-skia-harmony.patch'
+        'sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch'
+        'sql-make-VirtualCursor-standard-layout-type.patch'
+        'std-max-fix.patch'
+        'ffmpeg5.patch'
+        'disk_data_allocator-Metadata-constructor.patch'
         'clean-up-a-call-to-set_utf8.patch'
         'include-memory-header-to-get-the-definition-of-std-u.patch'
         'iwyu-std-numeric_limits-is-defined-in-limits.patch'
         'libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch'
         'make-some-of-blink-custom-iterators-STL-compatible.patch'
+        'v8-call-new-ListFormatter-createInstance.patch'
         'v8-remove-soon-to-be-removed-getAllFieldPositions.patch'
        )
 sha256sums=('SKIP'
@@ -43,16 +55,27 @@ sha256sums=('SKIP'
             'c7eadac877179e586d0cce7f898aa1462b4c207733e68ecc17de9754b691713a'
             '0e2a78e4aa7272ab0ff4a4c467750e01bad692a026ad9828aaf06d2a9418b9d8'
             'd793842e9584bf75e3779918297ba0ffa6dd05394ef5b2bf5fb73aa9c86a7e2f'
+            'b4d28867c1fabde6c50a2cfa3f784730446c4d86e5191e0f0000fbf7b0f91ecf'
             '3e5ba8c0a70a4bc673deec0c61eb2b58f05a4c784cbdb7c8118be1eb6580db6d'
             '5390304b5f544868985ce00a3ec082d4ece2dacb1c73cdb35dd4facfea12449a'
             '5600cfa40254fa3fa2cb541d3b55cc8f7a9231de8d2830c25a7651aa392de16f'
+            '7ce947944a139e66774dfc7249bf7c3069f07f83a0f1b2c1a1b14287a7e15928'
+            'fffbdd7479292462a1b4e3846c610ee5a0f0d409ded11426f21dd47051604dfd'
+            'cb8e4c347169f145d2f08329e25125eb2a3682bfc3530c674cf1ffad89431bdf'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
+            'f910be9370c880de6e1d61cc30383c069e421d7acf406166e4fbfad324fc7d61'
+            'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
+            'c315dd56b354cf5ad3458e1edf397cc7b492fefe82138135a881206a82b9d9dc'
+            '4f32b815349357ef1f17b36059cee588c994472b9754a194fff41ec21a93826b'
+            '52a63a84a10dc501a0712a76170cfa12abc02ed4efe93486a1e6139b1670f90c'
             '58c41713eb6fb33b6eef120f4324fa1fb8123b1fbc4ecbe5662f1f9779b9b6af'
             '071326135bc25226aa165639dff80a03670a17548f2d2ff5cc4f40982b39c52a'
             '675fb3d6276cce569a641436465f58d5709d1d4a5f62b7052989479fd4aaea24'
             '50687079426094f2056d1f4806dc30fc8d6bad16190520e57ba087ec5db1d778'
             '3d7f20e1d2ee7d73ed25e708c0d59a0cb215fcce10a379e3d48a856533c4b0b7'
-            'e042024423027ad3ef729a7e4709bdf9714aea49d64cfbbf46a645a05703abc2')
+            '44ebcff050a1c849819d66399c14bd711801d0eb64f518d292d3d6efedce3b3a'
+            'e042024423027ad3ef729a7e4709bdf9714aea49d64cfbbf46a645a05703abc2'
+           )
 
 _system_libs=('ffmpeg'
               'flac'
@@ -98,7 +121,7 @@ prepare() {
   },
 ]" > .gclient
 
-  python2 "${srcdir}/depot_tools/gclient.py" sync \
+  python3 "${srcdir}/depot_tools/gclient.py" sync \
       --with_branch_heads \
       --with_tags \
       --nohooks
@@ -133,17 +156,28 @@ prepare() {
   cd ..
 
   echo "Applying local patches..."
+
+  patch -Np1 -d third_party/breakpad/breakpad < ../breakpad-fix-for-non-constant-SIGSTKSZ.patch
+  patch -Np1 -i ../ffmpeg5.patch
   patch -Np1 -i ../add-missing-algorithm-header-in-crx_install_error.cc.patch
   patch -Np1 -i ../avoid-double-destruction-of-ServiceWorkerObjectHost.patch
   patch -Np1 -i ../chromium-83-gcc-10.patch
   patch -Np1 -i ../chromium-ffmpeg-4.3.patch
+  patch -Np1 -i ../chromium-include-limits.patch
   patch -Np0 -i ../chromium-skia-harmony.patch
+  patch -Np1 -i ../sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch
+  patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
+  patch -Np1 -F3 -i ../std-max-fix.patch
+  patch -Np0 -i ../disk_data_allocator-Metadata-constructor.patch
   patch -Np4 -i ../qt5-webengine-glibc-2.33.patch
+  patch -Np1 -i ../chromium-harfbuzz-3.0.0.patch
+  patch -Np1 -d third_party/skia <../skia-harfbuzz-3.0.0.patch
   patch -Np1 -i ../clean-up-a-call-to-set_utf8.patch
   patch -Np1 -i ../include-memory-header-to-get-the-definition-of-std-u.patch
   patch -Np1 -F3 -i ../iwyu-std-numeric_limits-is-defined-in-limits.patch
   patch -Np1 -i ../libstdc-fix-incomplete-type-in-AXTree-for-NodeSetSiz.patch
   patch -Np1 -i ../make-some-of-blink-custom-iterators-STL-compatible.patch
+  patch -Np1 -d v8 <../v8-call-new-ListFormatter-createInstance.patch
   patch -Np1 -d v8 <../v8-remove-soon-to-be-removed-getAllFieldPositions.patch
   patch -Np1 -i ../use-system-libraries-in-node.patch
   patch -Np1 -i ../default_app-icon.patch  # Icon from .desktop file
@@ -178,6 +212,14 @@ build() {
   # Workaround for building with ICU 68.x
   CPPFLAGS+=' -DU_DEFINE_FALSE_AND_TRUE=1'
 
+  CFLAGS="${CFLAGS/-fexceptions/}"
+  CXXFLAGS="${CXXFLAGS/-fexceptions/}"
+
+  # This appears to cause random segfaults when combined with ThinLTO
+  # https://bugs.archlinux.org/task/73518
+  CFLAGS=${CFLAGS/-fstack-clash-protection}
+  CXXFLAGS=${CXXFLAGS/-fstack-clash-protection}
+
   # Do not warn about unknown warning options
   CFLAGS+='   -Wno-unknown-warning-option'
   CXXFLAGS+=' -Wno-unknown-warning-option'