8:52 p.m.
commit 86f726d9eb45b1401a42a815166961d79097aefd
Author: Tom Callaway <spot(a)fedoraproject.org>
Date: Mon Feb 13 12:42:02 2017 -0500
fix compilation issues
chromium-56.0.2924.87-fpermissive.patch | 13 +++++++++++++
chromium-56.0.2924.87-gcc-49.patch | 12 ++++++++++++
chromium.spec | 13 ++++++++++++-
3 files changed, 37 insertions(+), 1 deletion(-)
---
diff --git a/chromium-56.0.2924.87-fpermissive.patch
b/chromium-56.0.2924.87-fpermissive.patch
new file mode 100644
index 0000000..be68cf9
--- /dev/null
+++ b/chromium-56.0.2924.87-fpermissive.patch
@@ -0,0 +1,13 @@
+diff -up chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn.permissive
chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn
+--- chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn.permissive 2017-02-13
12:32:23.419665971 -0500
++++ chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn 2017-02-13
12:33:16.146629190 -0500
+@@ -54,6 +54,9 @@ config("config") {
+ cflags = []
+ defines = []
+
++ # error: there are no arguments to 'swapAnchor' that depend on a template
parameter, so a declaration of 'swapAnchor' must be available [-fpermissive]
++ cflags += [ "-fpermissive" ]
++
+ if (is_win) {
+ cflags += [
+ "/wd4305", # Truncation from 'type1' to 'type2'.
diff --git a/chromium-56.0.2924.87-gcc-49.patch b/chromium-56.0.2924.87-gcc-49.patch
new file mode 100644
index 0000000..f5ff3d2
--- /dev/null
+++ b/chromium-56.0.2924.87-gcc-49.patch
@@ -0,0 +1,12 @@
+diff -up
chromium-56.0.2924.87/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc.gcc49
chromium-56.0.2924.87/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc
+---
chromium-56.0.2924.87/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc.gcc49 2017-02-13
11:41:35.563497836 -0500
++++
chromium-56.0.2924.87/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc 2017-02-13
11:42:43.608161336 -0500
+@@ -412,7 +412,7 @@ std::unique_ptr<DesktopCapturer> Desktop
+ return nullptr;
+ }
+
+- return capturer;
++ return std::move(capturer);
+ }
+
+ } // namespace webrtc
diff --git a/chromium.spec b/chromium.spec
index b30ee3f..dfd6f9e 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -93,7 +93,7 @@ BuildRequires: libicu-devel >= 5.4
Name: chromium%{chromium_channel}
Version: %{majorversion}.0.2924.87
-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)
@@ -147,6 +147,11 @@ Patch27: chromium-54.0.2840.90-setopaque.patch
# Fix rvalue issue in remoting code
#
https://chromium.googlesource.com/chromium/src.git/+/29bfbecb49572b61264d...
Patch29: chromium-55.0.2883.87-rvalue-fix.patch
+# Fix compiler issue with gcc 4.9
+#
https://chromium.googlesource.com/external/webrtc/trunk/webrtc/+/69556b1c...
+Patch30: chromium-56.0.2924.87-gcc-49.patch
+# Use -fpermissive to build WebKit
+Patch31: chromium-56.0.2924.87-fpermissive.patch
### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch
@@ -526,6 +531,8 @@ members of the Chromium and WebDriver teams.
%patch26 -p1 -b .ldmemory
%patch27 -p1 -b .setopaque
%patch29 -p1 -b .rvalue
+%patch30 -p1 -b .gcc49
+%patch31 -p1 -b .permissive
### Chromium Tests Patches ###
%patch100 -p1 -b .use_system_opus
@@ -1566,6 +1573,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r
chrome-remote-deskt
%{chromium_path}/chromedriver
%changelog
+* Mon Feb 13 2017 Tom Callaway <spot(a)fedoraproject.org> 56.0.2924.87-3
+- fix compilation issue
+- build third_party/WebKit with -fpermissive
+
* Fri Feb 10 2017 Tom Callaway <spot(a)fedoraproject.org> 56.0.2924.87-2
- add BR: gtk3-devel