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

[Nicola Squartini]

    Date: Wednesday, August 24, 2016 @ 08:18:34
  Author: tensor5
Revision: 187448

upgpkg: electron 1.3.4-1

Modified:
  electron/trunk/PKGBUILD
  electron/trunk/use-system-clang.patch
  electron/trunk/use-system-libraries-in-node.patch

------------------------------------+
 PKGBUILD                           |   69 +++++++++++++++++------------------
 use-system-clang.patch             |    2 -
 use-system-libraries-in-node.patch |    5 +-
 3 files changed, 38 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-24 08:07:56 UTC (rev 187447)
+++ PKGBUILD	2016-08-24 08:18:34 UTC (rev 187448)
@@ -3,8 +3,8 @@
 
 _chromiumver=52.0.2743.82
 pkgname=electron
-pkgver=1.3.3
-pkgrel=2
+pkgver=1.3.4
+pkgrel=1
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('i686' 'x86_64')
 url='http://electron.atom.io/'
@@ -65,8 +65,8 @@
             '75b2e9827f0593e59a35c36c6039ad10d35d7499fed6d97c4ed48ef1cce54c2b'
             'c209475c16b506d8d888a54c8564718cf9775f450d1867e19e86a03d99a119be'
             '4834c8573587c133d02a21cdfeffd9ef3ad7d71360ba548f33e100448e2cb821'
-            '53615ceef9e9919bacf561cc4e864a17a399f538268bc9e13721a4a06775a4a5'
-            '69f10a18b2f2403377cfa6e36750205a0804c5b7d49b44d44d05cd370fb186ab'
+            'e56184ddcceb29cfb1fcbca52678f72b7b8f8c8e69791016062f381aa78182f2'
+            'eb8f4d2b376dce69bec4741301696e9a9b7796fcdb00e80281438d84dc4d8659'
             'dc3286a1947240ab6ec562263af0b3c9971da2a4ab45970e3e664563e877280f'
             'fd237dada74a67a5652e0a4661d1e7f3a53a3bfa010b963579346f5456e9f190'
             '3bf045dc4ac1cb32491c4a20de313c3056824e75308f97b9e869fd5a2a166480'
@@ -83,6 +83,34 @@
             '7d49a587633c1a4a773f2a1510a12250de6b3c7a8fbb7928489c49f7ec6997ca'
            )
 
+_chromium_flags=('fastbuild=2'
+                 'host_clang=0'
+                 'linux_use_bundled_binutils=0'
+                 'linux_use_bundled_gold=0'
+                 'release_extra_cflags="-O3"'
+                 'remove_webcore_debug_symbols=1'
+                 'use_gconf=0'
+                 'use_gtk3=1'
+                 'use_sysroot=0'
+                 'use_system_expat=1'
+                 'use_system_ffmpeg=1'
+                 'use_system_flac=1'
+                 'use_system_harfbuzz=1'
+                 'use_system_jsoncpp=1'
+                 'use_system_libevent=1'
+                 'use_system_libjpeg=1'
+                 'use_system_libpng=1'
+                 'use_system_libvpx=1'
+                 'use_system_libwebp=1'
+                 'use_system_libxml=1'
+                 'use_system_libxslt=1'
+                 'use_system_re2=1'
+                 'use_system_snappy=1'
+                 'use_system_yasm=1'
+                 'use_system_zlib=1'
+                 'werror=""'  # required by bundled ICU and i686 build
+                )
+
 prepare() {
   cd "${srcdir}"/electron
 
@@ -134,36 +162,6 @@
   patch -Np1 -i "${srcdir}"/libchromiumcontent-use-system-ffmpeg.patch
   patch -Np1 -i "${srcdir}"/libchromiumcontent-static-library-only.patch
   rm patches/third_party/ffmpeg/ffmpeg.patch  # Use system ffmpeg
-  _chromium_flags=('fastbuild=2'
-                   'host_clang=0'
-                   'linux_use_bundled_binutils=0'
-                   'linux_use_bundled_gold=0'
-                   'release_extra_cflags="-O3"'
-                   'remove_webcore_debug_symbols=1'
-                   'use_gconf=0'
-                   'use_gtk3=1'
-                   'use_sysroot=0'
-                   'use_system_expat=1'
-                   'use_system_ffmpeg=1'
-                   'use_system_flac=1'
-                   'use_system_harfbuzz=1'
-                   'use_system_jsoncpp=1'
-                   'use_system_libevent=1'
-                   'use_system_libjpeg=1'
-                   'use_system_libpng=1'
-                   'use_system_libvpx=1'
-                   'use_system_libwebp=1'
-                   'use_system_libxml=1'
-                   'use_system_libxslt=1'
-                   'use_system_re2=1'
-                   'use_system_snappy=1'
-                   'use_system_yasm=1'
-                   'use_system_zlib=1'
-                   'werror=""'  # required by bundled ICU and i686 build
-                  )
-  echo "{" > chromium.gyp_env
-  echo "  'GYP_DEFINES': '${_chromium_flags[*]}'" >> chromium.gyp_env
-  echo "}" >> chromium.gyp_env
   echo 'Extracting chromium source...'
   tar -xJf "${srcdir}"/chromium-${_chromiumver}.tar.xz
   mv chromium-${_chromiumver} src
@@ -192,7 +190,8 @@
   script/bootstrap.py --verbose \
                       --target_arch=${_target} \
                       --clang_dir=/usr \
-                      --build_libchromiumcontent
+                      --build_libchromiumcontent \
+                      --defines="${_chromium_flags[*]}"
   script/build.py -c Release
 }
 

Modified: use-system-clang.patch
===================================================================
--- use-system-clang.patch	2016-08-24 08:07:56 UTC (rev 187447)
+++ use-system-clang.patch	2016-08-24 08:18:34 UTC (rev 187448)
@@ -1,6 +1,6 @@
 --- a/script/bootstrap.py
 +++ b/script/bootstrap.py
-@@ -166,8 +166,8 @@ def update_node_modules(dirname, env=None):
+@@ -168,8 +168,8 @@ def update_node_modules(dirname, env=None):
    if env is None:
      env = os.environ.copy()
    if PLATFORM == 'linux':

Modified: use-system-libraries-in-node.patch
===================================================================
--- use-system-libraries-in-node.patch	2016-08-24 08:07:56 UTC (rev 187447)
+++ use-system-libraries-in-node.patch	2016-08-24 08:18:34 UTC (rev 187448)
@@ -17,7 +17,7 @@
      'node_tag': '',
      'node_use_dtrace': 'false',
      'node_use_etw': 'false',
-@@ -107,16 +107,6 @@
+@@ -108,17 +108,6 @@
          'conditions': [
            ['OS=="linux"', {
              'cflags': [
@@ -31,10 +31,11 @@
 -              '-Wno-deprecated-declarations',
 -              '-Wno-return-type',
 -              '-Wno-shift-negative-value',
+-              '-Wno-varargs', # https://git.io/v6Olj
                # Required when building as shared library.
                '-fPIC',
              ],
-@@ -195,6 +185,13 @@
+@@ -197,6 +186,13 @@
              ],
            }],
            ['OS=="linux" and libchromiumcontent_component==0', {