[arch-commits] Commit in electron/trunk (PKGBUILD libchromiumcontent-settings.patch)

[Balló György]

    Date: Thursday, September 13, 2018 @ 11:14:19
  Author: bgyorgy
Revision: 380141

upgpkg: electron 2.0.9-1

Update to new version, remove unneeded make dependencies (gconf, libexif, libgnome-keyring), update upstream URL

Modified:
  electron/trunk/PKGBUILD
  electron/trunk/libchromiumcontent-settings.patch

-----------------------------------+
 PKGBUILD                          |   18 ++++++++++--------
 libchromiumcontent-settings.patch |    9 ++++++---
 2 files changed, 16 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-13 10:59:09 UTC (rev 380140)
+++ PKGBUILD	2018-09-13 11:14:19 UTC (rev 380141)
@@ -2,17 +2,16 @@
 
 _chromiumver=61.0.3163.100
 pkgname=electron
-pkgver=2.0.8
+pkgver=2.0.9
 pkgrel=1
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('x86_64')
-url='http://electron.atom.io/'
+url='https://electronjs.org/'
 license=('MIT' 'custom')
 depends=('c-ares' 'ffmpeg' 'gtk3' 'http-parser' 'libevent' 'libvpx' 'libxslt'
          'libxss' 'minizip' 'nss' 're2' 'snappy')
-makedepends=('clang' 'gconf' 'git' 'gperf' 'harfbuzz-icu' 'jsoncpp' 'libexif'
-             'libgnome-keyring' 'libnotify' 'lld' 'llvm' 'ninja' 'npm'
-             'pciutils' 'python2' 'wget' 'yasm')
+makedepends=('clang' 'git' 'gperf' 'harfbuzz-icu' 'jsoncpp' 'libnotify' 'lld'
+             'llvm' 'ninja' 'npm' 'pciutils' 'python2' 'wget' 'yasm')
 optdepends=('gvfs: file deletion support (gvfs-trash)'
             'kde-cli-tools: file deletion support (kioclient5)'
             'trash-cli: file deletion support (trash-put)'
@@ -75,7 +74,7 @@
             '2dd594a07f8ce62a7706a0365d764ab3ee3cc2d050d6ae4460db3152269e84f43516438a4f48f47fc54fe758a70c462baed6b7defa8b2bd277e67cb1bae8da12'
             'd77a2045f03c1327eb78517028c083e8965297a41d5a81df8c7dac5a8500aa242faa644a38be5d12914b68ba3a0b944c1bfe6dbfd7b88b1a0aeeec1d87a1619a'
             '79baa5d144733442cd839d7ee195b11b4e8ee19cd77e37c8ca1def18e2ffa30b8e63b8e4e2688944d55cbea048107f0cf209547ea14c49b4585c936249016c43'
-            'c06965d17e772e853c636709d64e4fb6dd863e3dc84435b79455d9077e65a6179f970796bbdc07ee2d4c57a577a159eb6be261c49428a90d7864a875862c711f'
+            'f7b354b1672760c85b278a900e8398c54c31663148091a59ca63bfcb9739a0071991111c6ce790fcfc072aff30fe8c52309c55cc39ede1f44ba503d712e4fc3d'
             '8da75b16f3fc39e828b94fe9bf013a2fd180a81a9a34a8511a99e62e8d2a714ced24d94ef643561e0c88c27868d8eaa643e19003cbfa293451fc15dd75f5801f'
             'efeb0358488a7402d380a4cab736efd4c626171659f1fd627b48b3f44a873d6ef149f8b00a03f6eae4a775d3fe77887e7e8b9ff2753f60d16a94e4f342687384'
             '45c9bcc588d8fc5dd5c5fde17ef5114f0c9717c965a7c3009bfa6e79ba6a3fc9a19eab3451b72e5de75535d62391a3e2660f0aab329d7ec137605593915f4010'
@@ -114,8 +113,9 @@
   patch -Np1 -i "${srcdir}"/dont-bootstrap-libchromiumcontent.patch
   patch -Np1 -i "${srcdir}"/no-whole-archive.patch
 
-  # Add extra libraries for unbundling
+  # Add extra libraries for unbundling, remove unneeded libraries
   sed -e "s/'-lexpat',/'-lexpat', '<\!@(pkg-config --libs-only-l libavcodec libavformat libavutil libevent flac harfbuzz-icu jsoncpp minizip libpulse vpx libwebpdemux libwebpmux libxml-2.0 libxslt zlib)', '-ljpeg', '-lre2', '-lsnappy', '-latomic',/" \
+      -e 's/ gconf-2.0//' \
       -i brightray/brightray.gyp
 
   mkdir -p "${srcdir}"/python2-path
@@ -187,7 +187,9 @@
     'treat_warnings_as_errors=false'
     'use_custom_libcxx=false'
     'use_sysroot=false'
-  )
+    'use_gconf=false'
+    'use_gnome_keyring=false'
+)
   CC=clang CXX=clang++ python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args "${gn_flags[*]}"
   # libevent not needed anymore
   find -type f -path "*base/third_party/libevent/*" \

Modified: libchromiumcontent-settings.patch
===================================================================
--- libchromiumcontent-settings.patch	2018-09-13 10:59:09 UTC (rev 380140)
+++ libchromiumcontent-settings.patch	2018-09-13 11:14:19 UTC (rev 380141)
@@ -1,6 +1,6 @@
 --- a/chromiumcontent/args/native_mksnapshot.gn
 +++ b/chromiumcontent/args/native_mksnapshot.gn
-@@ -12,3 +12,8 @@
+@@ -12,3 +12,10 @@
  if (target_cpu == "arm64") {
    v8_snapshot_toolchain="//build/toolchain/linux:clang_arm64"
  }
@@ -9,9 +9,11 @@
 +treat_warnings_as_errors = false
 +use_custom_libcxx = false
 +use_sysroot = false
++use_gconf = false
++use_gnome_keyring = false
 --- a/chromiumcontent/args/static_library.gn
 +++ b/chromiumcontent/args/static_library.gn
-@@ -1,13 +1,24 @@
+@@ -1,13 +1,25 @@
  root_extra_deps = [ "//chromiumcontent:chromiumcontent" ]
  is_electron_build = true
  is_component_build = false
@@ -33,8 +35,9 @@
 +link_pulseaudio = true
 +linux_use_bundled_binutils = false
 +use_cups = true
++use_sysroot = false
 +use_gconf = false
-+use_sysroot = false
++use_gnome_keyring = false
  
  # CFI is disabled for the time being, as Electron is not a monolithic binary
  # with at least one shared library component (Node) and CFI is tricky in that