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

[Filipe Laíns]

    Date: Sunday, November 10, 2019 @ 18:24:58
  Author: ffy00
Revision: 526481

upgpkg: electron6 6.1.4-1

Modified:
  electron6/trunk/PKGBUILD

----------+
 PKGBUILD |   76 +++++++++++++++++++++++++++++--------------------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-10 18:24:31 UTC (rev 526480)
+++ PKGBUILD	2019-11-10 18:24:58 UTC (rev 526481)
@@ -2,7 +2,7 @@
 # Contributor: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=electron6
-pkgver=6.1.1
+pkgver=6.1.4
 _commit=aa863bc323d8ddfcae9e1211d9c2cb05f1f77c46
 _chromiumver=76.0.3809.146
 pkgrel=1
@@ -23,14 +23,13 @@
         'electron6.desktop'
         'default_app-icon.patch'
         'use-system-libraries-in-node.patch'
-        'chromium-skia-harmony.patch'
-       )
-sha256sums=('SKIP'
+        'chromium-skia-harmony.patch')
+sha512sums=('SKIP'
             'SKIP'
-            '2256aa92a70d191962207008564df74cbe3ad2ace71a174cc41fee43379ec4cb'
-            '545196274b7fac0cf1e1169624bbc67414bb47a65c5112c88b6c0f4f9cb5914c'
-            'c7eadac877179e586d0cce7f898aa1462b4c207733e68ecc17de9754b691713a'
-            '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
+            'f2384d851478507b8b76ada5822d021b0ab86e6cb7d078294171cf43935f3362f383b8399fa29acd11f021df5f43c3a0337b173702313c4533946bb36b7e512d'
+            '81a959a2873e868bb9394b1e5371d8c77f13f47d88c070016394188e96420ed64c8d6efa518e854f302ec4e6e7e17888d508f6a3598f433f6f82b8507639c0b7'
+            '147563fe422108598af26c617edf78d146d4e70223e3093216d5f63a1ab051eff95abd0c8f8c0b6f8a504ae26557d65cd0ffd90c542d6534176b72b99ea44a5e'
+            '6fa7c5f737b3f86274b1f768aadf863dd7542fca9c8885d5c3804590bd04c288394c54b2003234be37d961f48b5470ce15254ba64b2716f8aceb181e1fd3c7c0')
 
 _system_libs=('ffmpeg'
               'flac'
@@ -54,18 +53,17 @@
               'zlib')
 
 prepare() {
-  mkdir -p "${srcdir}"/python2-path
-  ln -sf /usr/bin/python2 "${srcdir}/python2-path/python"
-  export PATH="${srcdir}/python2-path:${PATH}:${srcdir}/depot_tools"
+  mkdir -p "$srcdir"/python2-path
+  ln -sf /usr/bin/python2 "$srcdir"/python2-path/python
+  export PATH="$srcdir/python2-path:$PATH:$srcdir/depot_tools"
 
-  echo "Fetching chromium..."
-  git clone --branch=${_chromiumver} --depth=1 \
-      https://chromium.googlesource.com/chromium/src.git
+  echo 'Fetching chromium...'
+  git clone --branch=$_chromiumver --depth=1 https://chromium.googlesource.com/chromium/src.git
 
   echo "solutions = [
   {
     \"name\": \"src/electron\",
-    \"url\": \"file://${srcdir}/electron@${_commit}\",
+    \"url\": \"file://$srcdir/electron@$_commit\",
     \"deps_file\": \"DEPS\",
     \"managed\": False,
     \"custom_deps\": {
@@ -75,7 +73,7 @@
   },
 ]" > .gclient
 
-  python2 "${srcdir}/depot_tools/gclient.py" sync \
+  python2 "$srcdir"/depot_tools/gclient.py sync \
       --with_branch_heads \
       --with_tags \
       --nohooks
@@ -82,8 +80,8 @@
 
   sed -e "s/'am'/'apply'/" -i src/electron/script/lib/git.py
 
-  echo "Running hooks..."
-  # python2 "${srcdir}/depot_tools/gclient.py" runhooks
+  echo 'Running hooks...'
+  # python2 "$srcdir"/depot_tools/gclient.py runhooks
   python2 src/build/landmines.py
   python2 src/build/util/lastchange.py -o src/build/util/LASTCHANGE
   python2 src/build/util/lastchange.py -m GPU_LISTS_VERSION \
@@ -103,17 +101,17 @@
   npm install
   cd ..
 
-  echo "Patching Chromium for using system libraries..."
+  echo 'Patching Chromium for using system libraries...'
   sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
       tools/generate_shim_headers/generate_shim_headers.py
   for lib in "${_system_libs[@]}" libjpeg_turbo; do
-      third_party_dir="third_party/${lib}"
-      if [ ! -d ${third_party_dir} ]; then
-        third_party_dir="base/${third_party_dir}"
+      third_party_dir=third_party/"$lib"
+      if [ ! -d "$third_party_dir" ]; then
+        third_party_dir=base/"$third_party_dir"
       fi
-      find ${third_party_dir} -type f \
-          \! -path "${third_party_dir}/chromium/*" \
-          \! -path "${third_party_dir}/google/*" \
+      find "$third_party_dir" -type f \
+          \! -path "$third_party_dir/chromium/*" \
+          \! -path "$third_party_dir/google/*" \
           \! -path 'third_party/yasm/run_yasm.py' \
           \! -regex '.*\.\(gn\|gni\|isolate\)' \
           -delete
@@ -122,7 +120,7 @@
       --system-libraries \
       "${_system_libs[@]}"
 
-  echo "Applying local patches..."
+  echo 'Applying local patches...'
   patch -Np0 -i ../chromium-skia-harmony.patch
   patch -Np1 -i ../use-system-libraries-in-node.patch
   patch -Np1 -i ../default_app-icon.patch  # Icon from .desktop file
@@ -135,7 +133,7 @@
   export NM=nm
 
   cd src
-  export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools"
+  export CHROMIUM_BUILDTOOLS_PATH="$PWD"/buildtools
   GN_EXTRA_ARGS='
     blink_symbol_level = 0
     clang_use_chrome_plugins = false
@@ -151,7 +149,7 @@
     use_sysroot = false
   '
   gn gen out/Release \
-      --args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}"
+      --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS"
   ninja -C out/Release electron
   # Strip before zip to avoid
   # zipfile.LargeZipFile: Filesize would require ZIP64 extensions
@@ -161,24 +159,24 @@
 }
 
 package() {
-  install -dm755 "${pkgdir}/usr/lib/${pkgname}"
-  bsdtar -xf src/out/Release/dist.zip -C "${pkgdir}/usr/lib/${pkgname}"
+  install -dm755 "$pkgdir"/usr/lib/$pkgname
+  bsdtar -xf src/out/Release/dist.zip -C "$pkgdir"/usr/lib/$pkgname
 
-  chmod u+s "${pkgdir}/usr/lib/${pkgname}/chrome-sandbox"
+  chmod u+s "$pkgdir"/usr/lib/$pkgname/chrome-sandbox
 
-  install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  for l in "${pkgdir}/usr/lib/${pkgname}"/{LICENSE,LICENSES.chromium.html}; do
+  install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
+  for l in "$pkgdir"/usr/lib/$pkgname/{LICENSE,LICENSES.chromium.html}; do
     ln -s  \
-      $(realpath --relative-to="${pkgdir}/usr/share/licenses/${pkgname}" ${l}) \
-      "${pkgdir}/usr/share/licenses/${pkgname}"
+      $(realpath --relative-to="$pkgdir"/usr/share/licenses/$pkgname $l) \
+      "$pkgdir"/usr/share/licenses/$pkgname
   done
 
-  install -dm755 "${pkgdir}"/usr/bin
-  ln -s ../lib/${pkgname}/electron "${pkgdir}"/usr/bin/${pkgname}
+  install -dm755 "$pkgdir"/usr/bin
+  ln -s ../lib/$pkgname/electron "$pkgdir"/usr/bin/$pkgname
 
   # Install .desktop and icon file (see default_app-icon.patch)
-  install -Dm644 -t "${pkgdir}/usr/share/applications" ${pkgname}.desktop
+  install -Dm644 -t "$pkgdir"/usr/share/applications $pkgname.desktop
   install -Dm644 src/electron/default_app/icon.png \
-          "${pkgdir}/usr/share/pixmaps/${pkgname}.png"  # hicolor has no 1024x1024
+          "$pkgdir"/usr/share/pixmaps/$pkgname.png  # hicolor has no 1024x1024
 }