[chromium-freeworld: 145/148] apply more workarounds to force code to compile with epel7 gcc
commit efb66ad8f9d80f9ef434b4cf6675aab61d5e4beb
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Aug 14 10:45:51 2017 -0400
apply more workarounds to force code to compile with epel7 gcc
chromium-60.0.3112.90-vulkan-force-c99.patch | 11 +++++++++++
chromium.spec | 9 +++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
---
diff --git a/chromium-60.0.3112.90-vulkan-force-c99.patch
b/chromium-60.0.3112.90-vulkan-force-c99.patch
new file mode 100644
index 0000000..a415962
--- /dev/null
+++ b/chromium-60.0.3112.90-vulkan-force-c99.patch
@@ -0,0 +1,11 @@
+diff -up chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99
chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn
+--- chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99 2017-08-14
10:40:48.028799820 -0400
++++ chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn 2017-08-14
10:41:43.054734910 -0400
+@@ -180,6 +180,7 @@ config("vulkan_internal_config") {
+ cflags += [ "-Wno-ignored-attributes" ]
+ }
+ if (is_linux) {
++ cflags = [ "-std=c99" ]
+ defines += [
+ "SYSCONFDIR=\"/etc\"",
+ "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"",
diff --git a/chromium.spec b/chromium.spec
index 40b532b..8e2d7b0 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -116,7 +116,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld}
Name: chromium%{chromium_channel}
%endif
Version: %{majorversion}.0.3112.90
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and
(MPLv1.1 or GPLv2 or LGPLv2)
@@ -197,8 +197,9 @@ Patch43: chromium-60.0.3112.78-jpeg-nomangle.patch
Patch44: chromium-60.0.3112.78-gtk2fix.patch
# Do not mangle zlib
Patch45: chromium-60.0.3112.78-no-zlib-mangle.patch
-# Apply this change to work around EPEL7 compiler issues
+# Apply these changes to work around EPEL7 compiler issues
Patch46: chromium-60.0.3112.90-init-list-hack.patch
+Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch
### Chromium Tests Patches ###
@@ -629,6 +630,7 @@ udev.
%patch45 -p1 -b .nozmangle
%if 0%{?rhel} == 7
%patch46 -p1 -b .oldgcc
+%patch47 -p1 -b .c99
%endif
### Chromium Tests Patches ###
@@ -1837,6 +1839,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%changelog
+* Mon Aug 14 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.90-3
+- apply more workarounds to coax code to build with epel7 gcc
+
* Wed Aug 9 2017 Tom Callaway <spot(a)fedoraproject.org> 60.0.3112.90-2
- apply post 60 code commit to get code building on epel7