summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authortensor52022-07-11 02:23:45 +0000
committersvntogit2022-07-11 02:23:45 +0000
commitdd5f449512051d9611d4982cf37588bf25e8b7d6 (patch)
tree2ccbe90efbaae11860d719f6d66462ecb24b9f38
parent5705741386d6191bb42c29e40940ac61d40a7c0b (diff)
downloadaur-dd5f449512051d9611d4982cf37588bf25e8b7d6.tar.gz
upgpkg: electron16 16.2.8-1
git-svn-id: file:///srv/repos/svn-community/svn@1249480 9fca08f4-af9d-4005-b8df-a31f2cc04f65
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD13
-rw-r--r--cppgc-fix-include.patch28
-rw-r--r--iwyu-add-utility-for-std-exchange.patch27
4 files changed, 69 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1de0780524e6..23d15d26c0dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = electron16
pkgdesc = Build cross platform desktop apps with web technologies
- pkgver = 16.2.5
+ pkgver = 16.2.8
pkgrel = 1
url = https://electronjs.org/
arch = x86_64
@@ -30,7 +30,6 @@ pkgbase = electron16
depends = c-ares
depends = ffmpeg
depends = gtk3
- depends = libevent
depends = libxslt
depends = minizip
depends = nss
@@ -53,6 +52,8 @@ pkgbase = electron16
source = sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch
source = std-vector-non-const.patch
source = use-system-libraries-in-node.patch
+ source = cppgc-fix-include.patch
+ source = iwyu-add-utility-for-std-exchange.patch
source = sql-make-VirtualCursor-standard-layout-type.patch
source = wayland-fix-binding-to-wrong-version.patch
source = unbundle-fix-visibility-of-build-config-freetype.patch
@@ -68,6 +69,8 @@ pkgbase = electron16
sha256sums = f910be9370c880de6e1d61cc30383c069e421d7acf406166e4fbfad324fc7d61
sha256sums = 4fbef42aaa7bf60d059f1a6b0a92dc997d475256110bd4df32c12de7f4f175a7
sha256sums = c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c
+ sha256sums = 7987b106dbb35b74d6ff28dc8cf2c897647d5ce59d5d6dbe36b2f72542e713b6
+ sha256sums = 6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c
sha256sums = dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150
sha256sums = fc2be146412d117869368f8559afef76ad39a3442ace16e5c7000bd45aa56b27
sha256sums = d0b17162211dd49e3a58c16d1697e7d8c322dcfd3b7890f0c2f920b711f52293
diff --git a/PKGBUILD b/PKGBUILD
index 25560dbc9485..35e188211b84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Nicola Squartini <tensor5@gmail.com>
_use_suffix=1
-pkgver=16.2.5
-_commit=32f91f19e08ddf96ac114ae6b0f0c7483241ec1e
+pkgver=16.2.8
+_commit=10ce3725c280131d7b7ad5b1440680b76d25a4d5
_chromiumver=96.0.4664.174
_gcc_patchset=4
# shellcheck disable=SC2034
@@ -23,8 +23,7 @@ url='https://electronjs.org/'
# shellcheck disable=SC2034
license=('MIT' 'custom')
# shellcheck disable=SC2034
-depends=('c-ares' 'ffmpeg' 'gtk3' 'libevent' 'libxslt' 'minizip' 'nss' 're2'
- 'snappy')
+depends=('c-ares' 'ffmpeg' 'gtk3' 'libxslt' 'minizip' 'nss' 're2' 'snappy')
# shellcheck disable=SC2034
makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'http-parser'
'java-runtime-headless' 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja'
@@ -56,6 +55,8 @@ source=('git+https://github.com/electron/electron.git'
'sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch'
'std-vector-non-const.patch'
'use-system-libraries-in-node.patch'
+ 'cppgc-fix-include.patch'
+ 'iwyu-add-utility-for-std-exchange.patch'
'sql-make-VirtualCursor-standard-layout-type.patch'
'wayland-fix-binding-to-wrong-version.patch'
'unbundle-fix-visibility-of-build-config-freetype.patch'
@@ -73,6 +74,8 @@ sha256sums=('SKIP'
'f910be9370c880de6e1d61cc30383c069e421d7acf406166e4fbfad324fc7d61'
'4fbef42aaa7bf60d059f1a6b0a92dc997d475256110bd4df32c12de7f4f175a7'
'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c'
+ '7987b106dbb35b74d6ff28dc8cf2c897647d5ce59d5d6dbe36b2f72542e713b6'
+ '6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c'
'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
'fc2be146412d117869368f8559afef76ad39a3442ace16e5c7000bd45aa56b27'
'd0b17162211dd49e3a58c16d1697e7d8c322dcfd3b7890f0c2f920b711f52293'
@@ -176,6 +179,8 @@ prepare() {
patch -Np1 -i ../patches/chromium-96-DrmRenderNodePathFinder-include.patch
patch -Np1 -i ../patches/chromium-96-CouponDB-include.patch
+ patch -Np1 -d v8 < ../cppgc-fix-include.patch
+ patch -Np1 -i ../iwyu-add-utility-for-std-exchange.patch
patch -Np1 -d third_party/breakpad/breakpad < ../breakpad-fix-for-non-constant-SIGSTKSZ.patch
patch -Np1 -i ../unbundle-fix-visibility-of-build-config-freetype.patch
patch -Np1 -i ../sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch
diff --git a/cppgc-fix-include.patch b/cppgc-fix-include.patch
new file mode 100644
index 000000000000..8d6113dcd8e6
--- /dev/null
+++ b/cppgc-fix-include.patch
@@ -0,0 +1,28 @@
+From 84cf3230a9680aac3b73c410c2b758760b6d3066 Mon Sep 17 00:00:00 2001
+From: Michael Lippautz <mlippautz@chromium.org>
+Date: Thu, 27 Jan 2022 14:14:11 +0100
+Subject: [PATCH] cppgc: Fix include
+
+Add <utility> to cover for std::exchange.
+
+Bug: v8:12585
+Change-Id: Ida65144e93e466be8914527d0e646f348c136bcb
+Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3420309
+Auto-Submit: Michael Lippautz <mlippautz@chromium.org>
+Reviewed-by: Omer Katz <omerkatz@chromium.org>
+Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#78820}
+---
+
+diff --git a/src/heap/cppgc/prefinalizer-handler.h b/src/heap/cppgc/prefinalizer-handler.h
+index bc17c99..c82c91f 100644
+--- a/src/heap/cppgc/prefinalizer-handler.h
++++ b/src/heap/cppgc/prefinalizer-handler.h
+@@ -5,6 +5,7 @@
+ #ifndef V8_HEAP_CPPGC_PREFINALIZER_HANDLER_H_
+ #define V8_HEAP_CPPGC_PREFINALIZER_HANDLER_H_
+
++#include <utility>
+ #include <vector>
+
+ #include "include/cppgc/prefinalizer.h"
diff --git a/iwyu-add-utility-for-std-exchange.patch b/iwyu-add-utility-for-std-exchange.patch
new file mode 100644
index 000000000000..3bc4693e19fb
--- /dev/null
+++ b/iwyu-add-utility-for-std-exchange.patch
@@ -0,0 +1,27 @@
+From 9dd0503835dc875807ab63efb1f477bffed2a852 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 25 Apr 2022 23:18:30 +0000
+Subject: [PATCH] IWYU: add utility for std::exchange
+
+Bug: 957519
+Change-Id: I307d520fdc34d2452018ed32a505e7e519739410
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
+Reviewed-by: Wez <wez@chromium.org>
+Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
+Cr-Commit-Position: refs/heads/main@{#995855}
+---
+ base/third_party/symbolize/symbolize.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h
+index 99029a968d5..278078f6071 100644
+--- a/base/third_party/symbolize/symbolize.h
++++ b/base/third_party/symbolize/symbolize.h
+@@ -61,6 +61,7 @@
+ #ifdef HAVE_SYMBOLIZE
+
+ #include <algorithm>
++#include <utility>
+
+ #if defined(__ELF__) // defined by gcc
+ #if defined(__OpenBSD__)