From dd924e8d5ec2f4a898a1eb8e1557a1cc336d8eac54bd8e95562a63a67d6dd0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 Jul 2018 14:29:57 +0000 Subject: [PATCH] - Add patch trying to build chromium on Leap 42.3: * chromium-gcc7.patch OBS-URL: https://build.opensuse.org/package/show/network:chromium/chromium?expand=0&rev=1151 --- chromium-gcc7.patch | 63 +++++++++++++++++++++++++++++++++++++++++++++ chromium.changes | 6 +++++ chromium.spec | 1 + 3 files changed, 70 insertions(+) create mode 100644 chromium-gcc7.patch diff --git a/chromium-gcc7.patch b/chromium-gcc7.patch new file mode 100644 index 0000000..bd369a2 --- /dev/null +++ b/chromium-gcc7.patch @@ -0,0 +1,63 @@ +From 122692ccee62223f266a988c575ae687e3f4c056 Mon Sep 17 00:00:00 2001 +From: Wang Qing +Date: Fri, 18 May 2018 11:20:09 +0000 +Subject: [PATCH] Remove noexcept from file + "components/search_provider_logos/logo_common.cc". +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes the build error with the following message: + + ../../components/search_provider_logos/logo_common.cc:17:15: error: function ‘search_provider_logos::LogoMetadata& search_provider_logos::LogoMetadata::operator=(search_provider_logos::LogoMetadata&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ + LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default; + ^ + ../../components/search_provider_logos/logo_common.cc:31:1: error: function ‘search_provider_logos::LogoCallbacks::LogoCallbacks(search_provider_logos::LogoCallbacks&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ + LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default; + ^ + ../../components/search_provider_logos/logo_common.cc:32:16: error: function ‘search_provider_logos::LogoCallbacks& search_provider_logos::LogoCallbacks::operator=(search_provider_logos::LogoCallbacks&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ + LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept = default; + +BUG= 844355 +R= bauerb@chromium.org + +Change-Id: I084d0d22f8a2cc976f5f8b24a8c623cd38f86876 +Reviewed-on: https://chromium-review.googlesource.com/1065521 +Reviewed-by: Bernhard Bauer +Commit-Queue: 汪 清 +Cr-Commit-Position: refs/heads/master@{#559859} +--- + components/search_provider_logos/logo_common.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/components/search_provider_logos/logo_common.cc b/components/search_provider_logos/logo_common.cc +index 05aae77a8a8d1..f0d2c674c505d 100644 +--- a/components/search_provider_logos/logo_common.cc ++++ b/components/search_provider_logos/logo_common.cc +@@ -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.changes b/chromium.changes index 27ebbb8..e754a30 100644 --- a/chromium.changes +++ b/chromium.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jul 25 14:29:16 UTC 2018 - tchvatal@suse.com + +- Add patch trying to build chromium on Leap 42.3: + * chromium-gcc7.patch + ------------------------------------------------------------------- Wed Jul 25 13:08:17 UTC 2018 - tchvatal@suse.com diff --git a/chromium.spec b/chromium.spec index 550421b..1468993 100644 --- a/chromium.spec +++ b/chromium.spec @@ -73,6 +73,7 @@ Patch10: chromium-libwebp-shim.patch Patch11: chromium-libjpeg.patch Patch12: chromium-cors-string.patch Patch13: chromium-gcc.patch +Patch14: chromium-gcc7.patch # Google seem not too keen on merging this but GPU accel is quite important # https://chromium-review.googlesource.com/c/chromium/src/+/532294 # https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches