From 4cfe27ecef78cb0e873bf2004a7de6d745ce0db7 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 17 Aug 2018 14:59:05 -0400 Subject: [PATCH] Fix default on redeclaration error --- ...440.106-fix-default-on-redeclaration.patch | 30 +++++++++++++++++++ chromium.spec | 9 +++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 chromium-68.0.3440.106-fix-default-on-redeclaration.patch diff --git a/chromium-68.0.3440.106-fix-default-on-redeclaration.patch b/chromium-68.0.3440.106-fix-default-on-redeclaration.patch new file mode 100644 index 00000000..4a92fba5 --- /dev/null +++ b/chromium-68.0.3440.106-fix-default-on-redeclaration.patch @@ -0,0 +1,30 @@ +diff -up chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc.122692c chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc +--- chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc.122692c 2018-08-17 14:54:30.587338865 -0400 ++++ chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc 2018-08-17 14:55:20.461184298 -0400 +@@ -14,22 +14,22 @@ LogoMetadata::LogoMetadata() = default; + LogoMetadata::LogoMetadata(const LogoMetadata&) = default; + LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default; + LogoMetadata& LogoMetadata::operator=(const LogoMetadata&) = default; +-LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default; ++LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) = default; + LogoMetadata::~LogoMetadata() = default; + + EncodedLogo::EncodedLogo() = default; + EncodedLogo::EncodedLogo(const EncodedLogo&) = default; + EncodedLogo::EncodedLogo(EncodedLogo&&) noexcept = default; + EncodedLogo& EncodedLogo::operator=(const EncodedLogo&) = default; +-EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) noexcept = default; ++EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) = default; + EncodedLogo::~EncodedLogo() = default; + + Logo::Logo() = default; + Logo::~Logo() = default; + + LogoCallbacks::LogoCallbacks() = default; +-LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default; +-LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept = default; ++LogoCallbacks::LogoCallbacks(LogoCallbacks&&) = default; ++LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) = default; + LogoCallbacks::~LogoCallbacks() = default; + + } // namespace search_provider_logos diff --git a/chromium.spec b/chromium.spec index 2ec53dc9..629d3cf7 100644 --- a/chromium.spec +++ b/chromium.spec @@ -140,7 +140,7 @@ Name: chromium%{chromium_channel}%{?freeworld:-freeworld} Name: chromium%{chromium_channel} %endif Version: %{majorversion}.0.3440.106 -Release: 1%{?dist} +Release: 2%{?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) @@ -277,6 +277,9 @@ Patch107: chromium-68.0.3440.84-libwebp-shim.patch Patch108: chromium-68.0.3440.84-move-unique-ptr.patch # https://github.com/OSSystems/meta-browser/blob/master/recipes-browser/chromium/files/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch Patch109: 0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch +# Fix default on redeclaration error +# https://chromium.googlesource.com/chromium/src/+/122692ccee62223f266a988c575ae687e3f4c056%5E%21/#F0 +Patch110: chromium-68.0.3440.106-fix-default-on-redeclaration.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -804,6 +807,7 @@ udev. %patch107 -p1 -b .webp %patch108 -p1 -b .move-unique-ptr %patch109 -p1 -b .aarch64-int64x1_t +%patch110 -p1 -b .fix-default-redeclaration # Change shebang in all relevant files in this directory and all subdirectories @@ -1749,6 +1753,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %changelog +* Fri Aug 17 2018 Tom Callaway - 68.0.3440.106-2 +- fix error with defaulting on redeclaration + * Thu Aug 9 2018 Tom Callaway - 68.0.3440.106-1 - update to 68.0.3440.106