From c18e243924af7fe83f77e2e776c26663b1e8ee93 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot@fedoraproject.org>
Date: Mar 28 2017 15:44:47 +0000
Subject: Fix issue in gtk_ui.cc


---

diff --git a/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch b/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch
new file mode 100644
index 0000000..4e92fe4
--- /dev/null
+++ b/chromium-57.0.2987.110-gtk_ui-gcc-fix.patch
@@ -0,0 +1,12 @@
+diff -up chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28 chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc
+--- chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc.b95cf28	2017-03-28 11:42:53.308857207 -0400
++++ chromium-57.0.2987.110/chrome/browser/ui/libgtkui/gtk_ui.cc	2017-03-28 11:43:04.172579015 -0400
+@@ -676,7 +676,7 @@ std::unique_ptr<views::Border> GtkUi::Cr
+             : nullptr);
+   }
+ 
+-  return gtk_border;
++  return std::move(gtk_border);
+ }
+ 
+ void GtkUi::AddWindowButtonOrderObserver(
diff --git a/chromium.spec b/chromium.spec
index 54b380d..db99530 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -160,6 +160,9 @@ Patch32:	chromium-56.0.2924.87-unique-ptr-fix.patch
 Patch33:	chromium-56.0.2924.87-gcc7.patch
 # Enable mp3 support
 Patch34:	chromium-57.0.2987.110-enable-mp3.patch
+# Fix issue in gtk_ui.cc
+# https://chromium.googlesource.com/chromium/src.git/+/b95cf280873664a44297368676ff589721ddb6f2%5E%21/#F5
+Patch35:	chromium-57.0.2987.110-gtk_ui-gcc-fix.patch
 
 ### Chromium Tests Patches ###
 Patch100:	chromium-46.0.2490.86-use_system_opus.patch
@@ -544,6 +547,7 @@ members of the Chromium and WebDriver teams.
 %patch32 -p1 -b .unique-ptr-fix
 %patch33 -p1 -b .gcc7
 %patch34 -p1 -b .mp3
+%patch35 -p1 -b .gtkuifix
 
 ### Chromium Tests Patches ###
 %patch100 -p1 -b .use_system_opus
@@ -1587,6 +1591,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
 %changelog
 * Sun Mar 26 2017 Tom Callaway <spot@fedoraproject.org> 57.0.2987.110-4
 - copy compat stdatomic.h in for RHEL. Re-enable mp3 enablement.
+- fix issue in gtk_ui.cc revealed by RHEL build
 
 * Sun Mar 26 2017 Tom Callaway <spot@fedoraproject.org> 57.0.2987.110-3
 - fix mp3 enablement