summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authortensor52019-10-23 09:22:22 +0000
committerMartin Kröning2020-06-12 10:10:17 +0200
commit201230b67ed7710575447756aacdfb425110d0c4 (patch)
tree6e0435c30c14527068c4e038a6b14e38878cb9ce
parentb89811da5b60de669edff982514c2d65b1392276 (diff)
downloadaur-201230b67ed7710575447756aacdfb425110d0c4.tar.gz
upgpkg: electron4 4.2.12-1
git-svn-id: file:///srv/repos/svn-community/svn@518611 9fca08f4-af9d-4005-b8df-a31f2cc04f65
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--chromium-SIOCGSTAMP.patch13
3 files changed, 21 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7eb3d26f748b..312442e60388 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = electron4
pkgdesc = Build cross platform desktop apps with web technologies
- pkgver = 4.2.11
+ pkgver = 4.2.12
pkgrel = 1
url = https://electronjs.org/
arch = x86_64
@@ -41,6 +41,7 @@ pkgbase = electron4
source = electron4.desktop
source = default_app-icon.patch
source = use-system-libraries-in-node.patch
+ source = chromium-SIOCGSTAMP.patch
source = chromium-skia-harmony.patch
source = chromium-system-icu.patch
source = fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
@@ -50,6 +51,7 @@ pkgbase = electron4
sha256sums = 6a4f7164c60aede9bdc866a5f8b6a1bb473e498a6dcea9bf73f64843af34f0aa
sha256sums = 37372e8afd7c2405a8e50bca95c98b3c78e4c9b681cbef16da9c7a84b45e41e3
sha256sums = 3a81953701ac976a311db4e17999e67ab7c6de97ff63388f287d6497ef9adb9b
+ sha256sums = 7acc4dd59b70fb64f602ceda2846ccddcb46f64a18f912658d1034965f6c1276
sha256sums = feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3
sha256sums = c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5
sha256sums = 97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478
diff --git a/PKGBUILD b/PKGBUILD
index 7c36f4fe04b4..3c952b10dcdf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Nicola Squartini <tensor5@gmail.com>
pkgname=electron4
-pkgver=4.2.11
-_commit=530bf8b69a9364e0aa24f5c851df401abfb40eb0
+pkgver=4.2.12
+_commit=3e0e966662c0ef2994d52566aaeb0850e18cdb3e
_chromiumver=69.0.3497.128
pkgrel=1
pkgdesc='Build cross platform desktop apps with web technologies'
@@ -21,6 +21,7 @@ source=('git+https://github.com/electron/electron.git'
'electron4.desktop'
'default_app-icon.patch'
'use-system-libraries-in-node.patch'
+ 'chromium-SIOCGSTAMP.patch'
'chromium-skia-harmony.patch'
'chromium-system-icu.patch'
'fix-cfi-icall-failure-with-use_system_libjpeg-true.patch'
@@ -31,6 +32,7 @@ sha256sums=('SKIP'
'6a4f7164c60aede9bdc866a5f8b6a1bb473e498a6dcea9bf73f64843af34f0aa'
'37372e8afd7c2405a8e50bca95c98b3c78e4c9b681cbef16da9c7a84b45e41e3'
'3a81953701ac976a311db4e17999e67ab7c6de97ff63388f287d6497ef9adb9b'
+ '7acc4dd59b70fb64f602ceda2846ccddcb46f64a18f912658d1034965f6c1276'
'feca54ab09ac0fc9d0626770a6b899a6ac5a12173c7d0c1005bc3964ec83e7b3'
'c4f2d1bed9034c02b8806f00c2e8165df24de467803855904bff709ceaf11af5'
'97b421bc60a4abdf37de2d88a51b973e9f68fb44d1eccd464adfb3d9f5d71478'
@@ -128,6 +130,7 @@ prepare() {
"${_system_libs[@]}"
echo "Applying local patches..."
+ patch -Np1 -i ../chromium-SIOCGSTAMP.patch
patch -Np4 -i ../chromium-skia-harmony.patch
patch -Np1 -i ../chromium-system-icu.patch
patch -Np1 -i ../fix-cfi-icall-failure-with-use_system_libjpeg-true.patch
diff --git a/chromium-SIOCGSTAMP.patch b/chromium-SIOCGSTAMP.patch
new file mode 100644
index 000000000000..4e7ae275e246
--- /dev/null
+++ b/chromium-SIOCGSTAMP.patch
@@ -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) {