From aea19164cf36e2fcf1e715eb822bf51683e6a1b3 Mon Sep 17 00:00:00 2001
From: seppiofish <seppia@seppia.net>
Date: Tue, 2 Jul 2019 00:09:48 +0200
Subject: Update to version 75.0.3770.100-1

---
 .SRCINFO        | 16 +++++++++-------
 PKGBUILD        | 16 ++++++++++------
 gcc-9-fix.patch | 22 ++++++++++++++++++++++
 3 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 gcc-9-fix.patch

diff --git a/.SRCINFO b/.SRCINFO
index 78b15fb..8659004 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
-	pkgver = 75.0.3770.80
+	pkgver = 75.0.3770.100
 	pkgrel = 1
 	url = https://github.com/Eloston/ungoogled-chromium
 	arch = x86_64
@@ -60,14 +60,16 @@ pkgbase = ungoogled-chromium
 	optdepends = libva-vdpau-driver: for hardware video acceleration with NVIDIA GPUs
 	provides = chromium
 	conflicts = chromium
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-75.0.3770.80.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-75.0.3770.100.tar.xz
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
-	source = https://github.com/Eloston/ungoogled-chromium/archive/75.0.3770.80-1.tar.gz
-	source = https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/fd5c39f86aadb4b7fe7724aa6b05000218cbbfe6.tar.gz
-	sha256sums = da828bc8d887821380b461abfbbd0e17538c211d56f240f03711b918c77a66d6
+	source = https://github.com/Eloston/ungoogled-chromium/archive/75.0.3770.100-1.tar.gz
+	source = https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/af242f55185ff0ff530d9be502099af0b9f6349b.tar.gz
+	source = gcc-9-fix.patch
+	sha256sums = 9e1360101b6d9f9635e540db77626e3e15b452f413d8750518244ac37b73fca0
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
-	sha256sums = a50251006b0056cad5b80216060002b7f979ace69c97799a3412d10a0fc19afb
-	sha256sums = 1f917c3dc3948fb37784994195233e8929fe65433ea18cf83545cf81ae61a34f
+	sha256sums = 6a0dbafd12f369e4a20e08565c80d8348603b49f7dcc6ada11b2ca6ae3acb7c1
+	sha256sums = 25116b9affc7ffb93c11dc2e3f15e50d74da405b7b79d868ee65b482daa66777
+	sha256sums = dbebf3f50660c30e36ffdf05d9fc3abb338beed5510e051eaee6a2c3fe23a0fa
 
 pkgname = ungoogled-chromium
 
diff --git a/PKGBUILD b/PKGBUILD
index 3b5f734..cc8118f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,9 @@
 # Derived from official Chromium and Inox PKGBUILDS and ungoogled-chromium buildkit
 
 pkgname=ungoogled-chromium
-pkgver=75.0.3770.80
+pkgver=75.0.3770.100
 _rev=1
-_archver=fd5c39f86aadb4b7fe7724aa6b05000218cbbfe6
+_archver=af242f55185ff0ff530d9be502099af0b9f6349b
 pkgrel=${_rev}
 _launcher_ver=6
 pkgdesc="A lightweight approach to removing Google web service dependency"
@@ -29,11 +29,13 @@ conflicts=('chromium')
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
         chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
         https://github.com/Eloston/ungoogled-chromium/archive/$pkgver-$pkgrel.tar.gz
-        https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/${_archver}.tar.gz)
-sha256sums=('da828bc8d887821380b461abfbbd0e17538c211d56f240f03711b918c77a66d6'
+        https://github.com/ungoogled-software/ungoogled-chromium-archlinux/archive/${_archver}.tar.gz
+        gcc-9-fix.patch)
+sha256sums=('9e1360101b6d9f9635e540db77626e3e15b452f413d8750518244ac37b73fca0'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
-            'a50251006b0056cad5b80216060002b7f979ace69c97799a3412d10a0fc19afb'
-            '1f917c3dc3948fb37784994195233e8929fe65433ea18cf83545cf81ae61a34f')
+            '6a0dbafd12f369e4a20e08565c80d8348603b49f7dcc6ada11b2ca6ae3acb7c1'
+            '25116b9affc7ffb93c11dc2e3f15e50d74da405b7b79d868ee65b482daa66777'
+            'dbebf3f50660c30e36ffdf05d9fc3abb338beed5510e051eaee6a2c3fe23a0fa')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
 # Keys are the names in the above script; values are the dependencies in Arch
@@ -71,6 +73,8 @@ prepare() {
 
   cd "$srcdir/chromium-$pkgver"
 
+  msg2 'Fixing compile time bug on gcc9'
+  patch -p1 --ignore-whitespace -i ../gcc-9-fix.patch --no-backup-if-mismatch
   msg2 'Pruning binaries'
   python "$_utils/prune_binaries.py" ./ "$_ungoogled_repo/pruning.list"
   msg2 'Applying patches'
diff --git a/gcc-9-fix.patch b/gcc-9-fix.patch
new file mode 100644
index 0000000..264922a
--- /dev/null
+++ b/gcc-9-fix.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/686982
+
+TabStripModelChange has a defaulted default constructor and a const data member
+without a user-defined default constructor.  This leads to a bug:
+
+error: defaulting this default constructor would delete it after
+its first declaration
+
+We declare the data member as non-const instead.
+
+--- a/chrome/browser/ui/tabs/tab_strip_model_observer.h
++++ b/chrome/browser/ui/tabs/tab_strip_model_observer.h
+@@ -103,7 +103,7 @@ class TabStripModelChange {
+ 
+  private:
+   const Type type_ = kSelectionOnly;
+-  const std::vector<Delta> deltas_;
++  std::vector<Delta> deltas_;
+ 
+   DISALLOW_COPY_AND_ASSIGN(TabStripModelChange);
+ };
+
-- 
cgit v1.2.3