- 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
This commit is contained in:
Tomáš Chvátal
2018-07-25 14:29:57 +00:00
committed by Git OBS Bridge
parent b40891be0b
commit dd924e8d5e
3 changed files with 70 additions and 0 deletions

63
chromium-gcc7.patch Normal file
View File

@@ -0,0 +1,63 @@
From 122692ccee62223f266a988c575ae687e3f4c056 Mon Sep 17 00:00:00 2001
From: Wang Qing <wangqing-hf@loongson.cn>
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 <bauerb@chromium.org>
Commit-Queue: 汪 清 <wangqing-hf@loongson.cn>
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

View File

@@ -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 Wed Jul 25 13:08:17 UTC 2018 - tchvatal@suse.com

View File

@@ -73,6 +73,7 @@ Patch10: chromium-libwebp-shim.patch
Patch11: chromium-libjpeg.patch Patch11: chromium-libjpeg.patch
Patch12: chromium-cors-string.patch Patch12: chromium-cors-string.patch
Patch13: chromium-gcc.patch Patch13: chromium-gcc.patch
Patch14: chromium-gcc7.patch
# Google seem not too keen on merging this but GPU accel is quite important # Google seem not too keen on merging this but GPU accel is quite important
# https://chromium-review.googlesource.com/c/chromium/src/+/532294 # https://chromium-review.googlesource.com/c/chromium/src/+/532294
# https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches # https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches