From ff8eb292e44f6601e74a11f94839748f55c94f85 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mon, 19 Feb 2018 11:57:56 -0500
Subject: [PATCH] update to 64.0.3282.167, include workaround for gcc8 bug in
 gn, disable unnecessary aarch64 glibc symbol change

---
 .gitignore                               |  1 +
 chromium-64.0.3282.167-gcc8-fabi11.patch | 15 +++++++++++++++
 chromium.spec                            | 17 ++++++++++++-----
 sources                                  |  2 +-
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 chromium-64.0.3282.167-gcc8-fabi11.patch

diff --git a/.gitignore b/.gitignore
index 61c1710f..7779b012 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 /chromium-63.0.3239.108-clean.tar.xz
 /chromium-64.0.3282.119-clean.tar.xz
 /chromium-64.0.3282.140-clean.tar.xz
+/chromium-64.0.3282.167-clean.tar.xz
diff --git a/chromium-64.0.3282.167-gcc8-fabi11.patch b/chromium-64.0.3282.167-gcc8-fabi11.patch
new file mode 100644
index 00000000..5f0c5274
--- /dev/null
+++ b/chromium-64.0.3282.167-gcc8-fabi11.patch
@@ -0,0 +1,15 @@
+diff -up chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py.fabi11 chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py
+--- chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py.fabi11	2018-02-19 11:39:15.807713662 -0500
++++ chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py	2018-02-19 11:39:47.038070341 -0500
+@@ -336,6 +336,11 @@ def write_gn_ninja(path, root_gen_dir, o
+   cflags = os.environ.get('CFLAGS', '').split()
+   cflags_cc = os.environ.get('CXXFLAGS', '').split()
+   ldflags = os.environ.get('LDFLAGS', '').split()
++
++  # Work around GCC8 bug gcc#84286
++  cflags.extend(['-fabi-version=11'])
++  cflags_cc.extend(['-fabi-version=11'])
++
+   include_dirs = [root_gen_dir, SRC_ROOT]
+   libs = []
+ 
diff --git a/chromium.spec b/chromium.spec
index 6b1e0d47..a477d296 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -116,7 +116,7 @@ Name:		chromium%{chromium_channel}%{?freeworld:-freeworld}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.3282.140
+Version:	%{majorversion}.0.3282.167
 Release:	1%{?dist}
 Summary:	A WebKit (Blink) powered web browser
 Url:		http://www.chromium.org/Home
@@ -215,7 +215,8 @@ Patch65:	chromium-64.0.3282.119-gcc-round-fix.patch
 Patch66:	chromium-64.0.3282.119-gcc-constexpr-fix.patch
 # Include proper headers to invoke memcpy()
 Patch67:	chromium-64.0.3282.119-memcpy-fix.patch
-
+# Work around gcc8 bug in gn
+Patch68:	chromium-64.0.3282.167-gcc8-fabi11.patch
 
 # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
 # http://build.chromium.org/buildbot/official/
@@ -651,15 +652,16 @@ udev.
 %endif
 %patch50 -p1 -b .pathfix
 %patch53 -p1 -b .nogccoptmath
-%if 0%{?fedora} >= 28
-%patch57 -p1 -b .aarch64glibc
-%endif
+# %%if 0%%{?fedora} >= 28
+# %%patch57 -p1 -b .aarch64glibc
+# %%endif
 %patch62 -p1 -b .gcc5-r3
 %patch63 -p1 -b .nolibc++
 %patch64 -p1 -b .fixunbundle
 %patch65 -p1 -b .gcc-round-fix
 %patch66 -p1 -b .gcc-const-expr
 %patch67 -p1 -b .memcpyfix
+%patch68 -p1 -b .fabi11
 
 %if 0%{?asan}
 export CC="clang"
@@ -1519,6 +1521,11 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 
 
 %changelog
+* Fri Feb 16 2018 Tom Callaway <spot@fedoraproject.org> 64.0.3282.167-1
+- update to 64.0.3282.167
+- include workaround for gcc8 bug in gn
+- disable unnecessary aarch64 glibc symbol change
+
 * Fri Feb  2 2018 Tom Callaway <spot@fedoraproject.org> 64.0.3282.140-1
 - update to 64.0.3282.140
 
diff --git a/sources b/sources
index 5cf5a637..a5f1167d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03
-SHA512 (chromium-64.0.3282.140-clean.tar.xz) = 9e8f5417bfc6a761ea50677c60c86ad4bebca3e42b2040e887a8b2ab5b97e10b07b192f6b8e15de6f4f872c324f08ef9b0fdf9df7a275526d935cbdd5faa4048
+SHA512 (chromium-64.0.3282.167-clean.tar.xz) = 83c8472507466eeabcc3036c1f6d02667632938e985caca03a21f822491f9d5d35043c0a236066ac3d5b926e36ee8e18a785c32647f848286c6b3f7a4eaa8e70