⬆️ [email protected]

Author: tensor5

electron/PKGBUILD

@@ -1,9 +1,9 @@
 # Maintainer: Nicola Squartini <[email protected]>
 
 _use_suffix=0
-pkgver=18.2.1
-_commit=3bc25c997d8b80f6f7f8e95e8d1e1f2d6bbfe543
-_chromiumver=100.0.4896.143
+pkgver=18.2.4
+_commit=f4ba63536a3558f814a81015ecbfaf3451be5694
+_chromiumver=100.0.4896.160
 _gcc_patchset=4
 # shellcheck disable=SC2034
 pkgrel=1
@@ -56,6 +56,9 @@ source=('git+https://github.com/electron/electron.git'
         'use-system-libraries-in-node.patch'
         'webcodecs-stop-using-AudioOpusEncoder.patch'
         'webrtc-check-existence-of-cursor-metadata.patch'
+        'fix-no-member-named-tie-in-namespace-std.patch'
+        'iwyu-add-utility-for-std-exchange.patch'
+        'iwyu-add-vector-needed-by-statsentry.patch'
         'enable-GlobalMediaControlsCastStartStop.patch'
         'sql-make-VirtualCursor-standard-layout-type.patch'
        )
@@ -71,6 +74,9 @@ sha256sums=('SKIP'
             'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c'
             '064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af'
             '88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95'
+            '7ad0106161bbf25e2e603ae1a723ae4217155ebb26eb4778363ad396e8c14156'
+            '6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c'
+            '0ec88c8022c946ac333cbc1060d6b9cacbef6c4a86fe8763d23add6939a3c490'
             '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
             'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a'
            )
@@ -170,6 +176,11 @@ prepare() {
   patch -Np1 -i ../webcodecs-stop-using-AudioOpusEncoder.patch
   patch -Np1 -d third_party/webrtc <../webrtc-check-existence-of-cursor-metadata.patch
 
+  # Upstream fixes
+  patch -Np1 -i ../fix-no-member-named-tie-in-namespace-std.patch
+  patch -Np1 -i ../iwyu-add-utility-for-std-exchange.patch
+  patch -Np1 -i ../iwyu-add-vector-needed-by-statsentry.patch
+
   # Revert kGlobalMediaControlsCastStartStop enabled by default
   # https://crbug.com/1314342
   patch -Rp1 -F3 -i ../enable-GlobalMediaControlsCastStartStop.patch

electron/fix-no-member-named-tie-in-namespace-std.patch

@@ -0,0 +1,28 @@
+From 68c9c63c0b148ff5246a0cdad59000697bbd8645 Mon Sep 17 00:00:00 2001
+From: Maksim Sisov <[email protected]>
+Date: Tue, 12 Apr 2022 15:11:34 +0000
+Subject: [PATCH] Fix no member named 'tie' in namespace 'std'
+
+Bug: None
+Change-Id: I8a097af2b16b738fa9bbb8231536bca85522f350
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3581869
+Auto-Submit: Maksim Sisov <[email protected]>
+Reviewed-by: Matt Menke <[email protected]>
+Commit-Queue: Matt Menke <[email protected]>
+Cr-Commit-Position: refs/heads/main@{#991529}
+---
+ net/base/address_list.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/net/base/address_list.h b/net/base/address_list.h
+index 029af1aded3..a93093e41f3 100644
+--- a/net/base/address_list.h
++++ b/net/base/address_list.h
+@@ -8,6 +8,7 @@
+ #include <stdint.h>
+ 
+ #include <string>
++#include <tuple>
+ #include <utility>
+ #include <vector>
+ 

electron/iwyu-add-utility-for-std-exchange.patch

@@ -0,0 +1,27 @@
+From 9dd0503835dc875807ab63efb1f477bffed2a852 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <[email protected]>
+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 <[email protected]>
+Commit-Queue: Stephan Hartmann <[email protected]>
+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__)

electron/iwyu-add-vector-needed-by-statsentry.patch

@@ -0,0 +1,29 @@
+From 72b521be7640a1b06adf6881b12277276ab8609d Mon Sep 17 00:00:00 2001
+From: Piotr Tworek <[email protected]>
+Date: Wed, 06 Apr 2022 19:34:29 +0000
+Subject: [PATCH] IWYU: Add vector needed by StatsEntry.
+
+This builds fine with libc++, but fails due to std::vector being
+undefined when using libstdc++. Add missing vector include to fix this.
+
+Bug: 957519
+Change-Id: I12f91636fe9c69046ae36528e48782acf741b66c
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3557455
+Auto-Submit: Piotr Tworek <[email protected]>
+Reviewed-by: Chrome Cunningham <[email protected]>
+Commit-Queue: Chrome Cunningham <[email protected]>
+Cr-Commit-Position: refs/heads/main@{#989578}
+---
+
+diff --git a/media/capabilities/webrtc_video_stats_db.h b/media/capabilities/webrtc_video_stats_db.h
+index 8a5c0cf..0e8653b 100644
+--- a/media/capabilities/webrtc_video_stats_db.h
++++ b/media/capabilities/webrtc_video_stats_db.h
+@@ -7,6 +7,7 @@
+ 
+ #include <memory>
+ #include <string>
++#include <vector>
+ 
+ #include "base/callback_forward.h"
+ #include "base/check.h"