[arch-commits] Commit in electron/trunk (PKGBUILD chromium-use-system-re2.patch)

[Nicola Squartini]

    Date: Thursday, September 29, 2016 @ 07:22:06
  Author: tensor5
Revision: 190776

upgpkg: electron 1.4.1-3

Fix generation of RE2 shim headers (solves FS#51025).

Added:
  electron/trunk/chromium-use-system-re2.patch
Modified:
  electron/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |    5 ++++-
 chromium-use-system-re2.patch |   17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-29 07:06:18 UTC (rev 190775)
+++ PKGBUILD	2016-09-29 07:22:06 UTC (rev 190776)
@@ -4,7 +4,7 @@
 _chromiumver=53.0.2785.113
 pkgname=electron
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('i686' 'x86_64')
 url='http://electron.atom.io/'
@@ -55,6 +55,7 @@
         'chromium-unset-madv_free.patch'
         'chromium-use-system-ffmpeg.patch'
         'chromium-use-system-minizip.patch'
+        'chromium-use-system-re2.patch'
        )
 noextract=("chromium-${_chromiumver}.tar.xz")
 sha256sums=('SKIP'
@@ -94,6 +95,7 @@
             'ccba3002243fb1f9a67c8a60af310706caa591d12aef45f1d0f4bda47626f3ab'
             '7cda59fe372b37beca079adf55b951b4f3a6c7a5490813b729fa145562d2ba12'
             'bc78d7af8e514ea28caa6c6ccaf78cc3e80044ef862e2ca7978439f183e36179'
+            'bdbc9107800caf6040f5acdc4982c2a3a5cf61d00e4141b590cb9bcb87353429'
            )
 
 _chromium_flags=('fastbuild=2'
@@ -191,6 +193,7 @@
   patch -Np1 -i "${srcdir}"/chromium-unset-madv_free.patch  # fixes crash with kernels < 4.5
   patch -Np1 -i "${srcdir}"/chromium-use-system-ffmpeg.patch
   patch -Np1 -i "${srcdir}"/chromium-use-system-minizip.patch
+  patch -Np1 -i "${srcdir}"/chromium-use-system-re2.patch
   python2 build/linux/unbundle/replace_gyp_files.py "${_chromium_flags[@]/#/-D}"
 }
 

Added: chromium-use-system-re2.patch
===================================================================
--- chromium-use-system-re2.patch	                        (rev 0)
+++ chromium-use-system-re2.patch	2016-09-29 07:22:06 UTC (rev 190776)
@@ -0,0 +1,17 @@
+--- a/build/linux/unbundle/re2.gyp
++++ b/build/linux/unbundle/re2.gyp
+@@ -8,13 +8,12 @@
+       'target_name': 're2',
+       'type': 'none',
+       'variables': {
+-        'headers_root_path': '.',
++        'headers_root_path': 'src',
+         'header_filenames': [
+           're2/filtered_re2.h',
+           're2/re2.h',
+           're2/set.h',
+           're2/stringpiece.h',
+-          're2/variadic_function.h',
+         ],
+         'shim_generator_additional_args': [
+           # Chromium copy of re2 is patched to rename POSIX to POSIX_SYNTAX