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

[Evangelos Foutras]

    Date: Friday, March 6, 2020 @ 07:43:39
  Author: foutrelis
Revision: 590909

upgpkg: electron2 2.0.18-3: re2 20200303 rebuild.

Added:
  electron2/trunk/breakpad-glibc2.30.patch
  electron2/trunk/chromium-SIOCGSTAMP.patch
Modified:
  electron2/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   10 +++++++-
 breakpad-glibc2.30.patch  |   49 ++++++++++++++++++++++++++++++++++++++++++++
 chromium-SIOCGSTAMP.patch |   13 +++++++++++
 3 files changed, 70 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-06 05:34:41 UTC (rev 590908)
+++ PKGBUILD	2020-03-06 07:43:39 UTC (rev 590909)
@@ -4,7 +4,7 @@
 _chromiumver=61.0.3163.100
 pkgname=electron2
 pkgver=2.0.18
-pkgrel=2
+pkgrel=3
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('x86_64')
 url='https://electronjs.org/'
@@ -38,6 +38,7 @@
         'use-system-libraries-in-node.patch'
         'use-system-ffmpeg.patch'
         'breakpad-glibc2.26.patch'
+        'breakpad-glibc2.30.patch'
         'gyp-no-rpath.patch'
         'libchromiumcontent-fix-v8-patches.patch'
         'libchromiumcontent-settings.patch'
@@ -50,6 +51,7 @@
         'chromium-use-system-ffmpeg.patch'
         'chromium-use-system-minizip.patch'
         'chromium-use-system-re2.patch'
+        'chromium-SIOCGSTAMP.patch'
        )
 noextract=("chromium-${_chromiumver}.tar.xz")
 sha512sums=('SKIP'
@@ -73,6 +75,7 @@
             'baf921c2970e09cbc98781bdad9625c6926eaeb197cca5588cb3444db4422d18949a611f8d66452c4acff1c5f2cb0ba67cac3f85214a97c91c232778e1e9dce2'
             '89966d7b6eba2a588898cb69a2397ff87ad8936dc1e99e82668b312b6423794e3d6c41ee9defa8773e8fa947c6e873bc23928c719d908687eb28f78df54d6a2a'
             '2dd594a07f8ce62a7706a0365d764ab3ee3cc2d050d6ae4460db3152269e84f43516438a4f48f47fc54fe758a70c462baed6b7defa8b2bd277e67cb1bae8da12'
+            '8d9a06f10ecc3a4a54fce8d4ca4d9fce338705c3f43bf4e393377e0cb21710711f8fd0a1e211b01942776fc7117e9d8ecf51609b61d77f42579513dca2c84454'
             'd77a2045f03c1327eb78517028c083e8965297a41d5a81df8c7dac5a8500aa242faa644a38be5d12914b68ba3a0b944c1bfe6dbfd7b88b1a0aeeec1d87a1619a'
             '79baa5d144733442cd839d7ee195b11b4e8ee19cd77e37c8ca1def18e2ffa30b8e63b8e4e2688944d55cbea048107f0cf209547ea14c49b4585c936249016c43'
             'f7b354b1672760c85b278a900e8398c54c31663148091a59ca63bfcb9739a0071991111c6ce790fcfc072aff30fe8c52309c55cc39ede1f44ba503d712e4fc3d'
@@ -84,7 +87,8 @@
             '2906e565804cb42ef3370521683d01e4cb083f0c7d5b02692101afb56616838b3dda8d05d43d0942ea3b7b7528985a1470719574356d37416427b56409c52a7f'
             'd549c33d3499737f7d4dd2f87b8f08e90687d107248d9729676b7a0ea8562df3dd0430aa6776e4cb6ca793c2d93a726ce7b8da22703eef3f91aeb42b7e852240'
             'eace29bd99f7167ac2e5b7499560ec7e6c205eeee8fd0adef8cc7de3cef5058f9852dd2cc20946d637ed479d25b270c35d52de6f104f41000faa36dc018f63aa'
-            '5552e8918462f6c3a4e1baef3c22b57d70c732766945ea0b39f63df7d7b8fca9646f1f9b28b0528fa586799842c949298fc97e1041875da0ca1aacff046f6c9b')
+            '5552e8918462f6c3a4e1baef3c22b57d70c732766945ea0b39f63df7d7b8fca9646f1f9b28b0528fa586799842c949298fc97e1041875da0ca1aacff046f6c9b'
+            '764f9d564863098b20fb59c3eac2cf37a5ec725e4113ef7c1b81f91242c1c3ea994afead7fc9b70dbcdaff3d108068167e7b4dc4515de25dc5c18005da8ec55e')
 
 _system_libs=('ffmpeg'
               'flac'
@@ -140,6 +144,7 @@
   git config submodule.src.url "${srcdir}"/google-breakpad
   git submodule update
   patch -Np1 -i "${srcdir}"/breakpad-glibc2.26.patch
+  patch -Np1 -i "${srcdir}"/breakpad-glibc2.30.patch
 
   cd "${srcdir}"/electron/vendor/gyp
   # Remove a useless $ORIGIN/lib/ rpath from the electron binary
@@ -162,6 +167,7 @@
   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
+  patch -Np1 -i "${srcdir}"/chromium-SIOCGSTAMP.patch
 
   for lib in "${_system_libs[@]}" libjpeg_turbo; do
       find -type f -path "*third_party/${lib}/*" \

Added: breakpad-glibc2.30.patch
===================================================================
--- breakpad-glibc2.30.patch	                        (rev 0)
+++ breakpad-glibc2.30.patch	2020-03-06 07:43:39 UTC (rev 590909)
@@ -0,0 +1,49 @@
+From 7e3c165000d44fa153a3270870ed500bc8bbb461 Mon Sep 17 00:00:00 2001
+From: Nicholas Baldwin <baldwinn at google.com>
+Date: Fri, 27 Oct 2017 11:44:36 -0700
+Subject: [PATCH] Fix double declaration of tgkill when using Android NDK
+ Headers.
+
+As of Android API level 16 tgkill is declared in the NDK version of
+signal.h, which conflicts with the static definition found in
+src/client/linux/handler/exception_handler.cc. This change removes
+the static tgkill definition and replaces its use with sys_tgkill
+from the linux syscall support library.
+
+Bug:
+Change-Id: Ic70addd8a064cfa36345d86b7e36409e2089e909
+Reviewed-on: https://chromium-review.googlesource.com/738912
+Reviewed-by: Mike Frysinger <vapier at chromium.org>
+---
+ src/client/linux/handler/exception_handler.cc | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc
+index 95005209..cd94e3b5 100644
+--- a/src/client/linux/handler/exception_handler.cc
++++ b/src/client/linux/handler/exception_handler.cc
+@@ -105,12 +105,6 @@
+ #define PR_SET_PTRACER 0x59616d61
+ #endif
+ 
+-// A wrapper for the tgkill syscall: send a signal to a specific thread.
+-static int tgkill(pid_t tgid, pid_t tid, int sig) {
+-  return syscall(__NR_tgkill, tgid, tid, sig);
+-  return 0;
+-}
+-
+ namespace google_breakpad {
+ 
+ namespace {
+@@ -400,7 +394,7 @@ void ExceptionHandler::SignalHandler(int sig, siginfo_t* info, void* uc) {
+     // In order to retrigger it, we have to queue a new signal by calling
+     // kill() ourselves.  The special case (si_pid == 0 && sig == SIGABRT) is
+     // due to the kernel sending a SIGABRT from a user request via SysRQ.
+-    if (tgkill(getpid(), syscall(__NR_gettid), sig) < 0) {
++    if (sys_tgkill(getpid(), syscall(__NR_gettid), sig) < 0) {
+       // If we failed to kill ourselves (e.g. because a sandbox disallows us
+       // to do so), we instead resort to terminating our process. This will
+       // result in an incorrect exit code.
+-- 
+2.23.0
+

Added: chromium-SIOCGSTAMP.patch
===================================================================
--- chromium-SIOCGSTAMP.patch	                        (rev 0)
+++ chromium-SIOCGSTAMP.patch	2020-03-06 07:43:39 UTC (rev 590909)
@@ -0,0 +1,13 @@
+--- a/third_party/webrtc/rtc_base/physicalsocketserver.cc
++++ b/third_party/webrtc/rtc_base/physicalsocketserver.cc
+@@ -67,6 +67,10 @@
+
+ #endif  // WEBRTC_POSIX
+
++#if defined(WEBRTC_LINUX)
++#include <linux/sockios.h>
++#endif
++
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__)
+
+ int64_t GetSocketRecvTimestamp(int socket) {