From 2076c5a1aaa06fe1c89986eb2be6206e82c154ba Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 24 Feb 2017 07:55:05 -0500 Subject: [PATCH] fix issue with unique ptr move on return with old gcc --- chromium-56.0.2924.87-unique-ptr-fix.patch | 12 ++++++++++++ chromium.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 chromium-56.0.2924.87-unique-ptr-fix.patch diff --git a/chromium-56.0.2924.87-unique-ptr-fix.patch b/chromium-56.0.2924.87-unique-ptr-fix.patch new file mode 100644 index 00000000..4542143a --- /dev/null +++ b/chromium-56.0.2924.87-unique-ptr-fix.patch @@ -0,0 +1,12 @@ +diff -up chromium-56.0.2924.87/remoting/host/security_key/fake_security_key_ipc_server.cc.unique-ptr-fix chromium-56.0.2924.87/remoting/host/security_key/fake_security_key_ipc_server.cc +--- chromium-56.0.2924.87/remoting/host/security_key/fake_security_key_ipc_server.cc.unique-ptr-fix 2017-02-24 07:50:09.183551244 -0500 ++++ chromium-56.0.2924.87/remoting/host/security_key/fake_security_key_ipc_server.cc 2017-02-24 07:50:31.619111443 -0500 +@@ -130,7 +130,7 @@ std::unique_ptr Fa + + ipc_server_map_[connection_id] = fake_ipc_server->AsWeakPtr(); + +- return fake_ipc_server; ++ return std::move(fake_ipc_server); + } + + base::WeakPtr diff --git a/chromium.spec b/chromium.spec index 87d48fd8..28374b8b 100644 --- a/chromium.spec +++ b/chromium.spec @@ -97,7 +97,7 @@ BuildRequires: libicu-devel >= 5.4 Name: chromium%{chromium_channel} Version: %{majorversion}.0.2924.87 -Release: 3%{?dist} +Release: 4%{?dist}.1 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) @@ -156,6 +156,9 @@ Patch29: chromium-55.0.2883.87-rvalue-fix.patch Patch30: chromium-56.0.2924.87-gcc-49.patch # Use -fpermissive to build WebKit Patch31: chromium-56.0.2924.87-fpermissive.patch +# Fix issue with unique_ptr move on return with older gcc +Patch32: chromium-56.0.2924.87-unique-ptr-fix.patch + ### Chromium Tests Patches ### Patch100: chromium-46.0.2490.86-use_system_opus.patch @@ -534,6 +537,7 @@ members of the Chromium and WebDriver teams. %patch29 -p1 -b .rvalue %patch30 -p1 -b .gcc49 %patch31 -p1 -b .permissive +%patch32 -p1 -b .unique-ptr-fix ### Chromium Tests Patches ### %patch100 -p1 -b .use_system_opus @@ -1569,6 +1573,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Fri Feb 24 2017 Tom Callaway 56.0.2924.87-4.1 +- fix issue with unique_ptr move on return with old gcc + * Tue Feb 21 2017 Tom Callaway 56.0.2924.87-4 - disable debuginfo