diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-18 10:15:03 +0000 |
commit | b284a3168fa91a038925d2ecf5e4791011ea5e7d (patch) | |
tree | 16fe44748708acacd909d4e2e160a09a7f6d936a /www-client/chromium/files | |
parent | 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (diff) |
gentoo resync : 18.11.2019
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r-- | www-client/chromium/files/chromium-80-gcc-noexcept.patch | 48 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-80-unbundle-libxml.patch | 101 |
2 files changed, 149 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-80-gcc-noexcept.patch b/www-client/chromium/files/chromium-80-gcc-noexcept.patch new file mode 100644 index 000000000000..93ac6c409be3 --- /dev/null +++ b/www-client/chromium/files/chromium-80-gcc-noexcept.patch @@ -0,0 +1,48 @@ +From a75a2539ca600163f2136776fdc751111e887cd7 Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jose.dapena@lge.com> +Date: Tue, 05 Nov 2019 17:57:52 +0100 +Subject: [PATCH] GCC: do not set noexcept on move assignment operator of ColorSet + +GCC build is broken because ColorSet default move assign operator is +noexcept (because the color flat_map is not noexcept). It does not +break clang because clang does not warn about this situation when +building with -fno-exception. + +../../ui/color/color_set.cc:14:11: error: function ‘ui::ColorSet& ui::ColorSet::operator=(ui::ColorSet&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ + ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default; + +Bug: 819294 +Change-Id: I00f4374fbf3d41dced9f9451c90478db528cb986 +--- + +diff --git a/ui/color/color_set.cc b/ui/color/color_set.cc +index 56564d7..0d43b2b 100644 +--- a/ui/color/color_set.cc ++++ b/ui/color/color_set.cc +@@ -9,9 +9,9 @@ + ColorSet::ColorSet(ColorSetId id, ColorMap&& colors) + : id(id), colors(std::move(colors)) {} + +-ColorSet::ColorSet(ColorSet&&) noexcept = default; ++ColorSet::ColorSet(ColorSet&&) = default; + +-ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default; ++ColorSet& ColorSet::operator=(ColorSet&&) = default; + + ColorSet::~ColorSet() = default; + +diff --git a/ui/color/color_set.h b/ui/color/color_set.h +index b273c48..3eaea42 100644 +--- a/ui/color/color_set.h ++++ b/ui/color/color_set.h +@@ -28,8 +28,8 @@ + using ColorMap = base::flat_map<ColorId, SkColor>; + + ColorSet(ColorSetId id, ColorMap&& colors); +- ColorSet(ColorSet&&) noexcept; +- ColorSet& operator=(ColorSet&&) noexcept; ++ ColorSet(ColorSet&&); ++ ColorSet& operator=(ColorSet&&); + ~ColorSet(); + + ColorSetId id; diff --git a/www-client/chromium/files/chromium-80-unbundle-libxml.patch b/www-client/chromium/files/chromium-80-unbundle-libxml.patch new file mode 100644 index 000000000000..0f369052cde2 --- /dev/null +++ b/www-client/chromium/files/chromium-80-unbundle-libxml.patch @@ -0,0 +1,101 @@ +diff --git a/build/linux/unbundle/libxml.gn b/build/linux/unbundle/libxml.gn +index c481bd3..3aaa1a4 100644 +--- a/build/linux/unbundle/libxml.gn ++++ b/build/linux/unbundle/libxml.gn +@@ -8,11 +8,52 @@ pkg_config("system_libxml") { + packages = [ "libxml-2.0" ] + } + +-static_library("libxml") { ++source_set("libxml") { ++ public_configs = [ ":system_libxml" ] ++} ++ ++static_library("libxml_utils") { ++ # Do not expand this visibility list without first consulting with the ++ # Security Team. ++ visibility = [ ++ ":xml_reader", ++ ":xml_writer", ++ "//base/test:test_support", ++ "//services/data_decoder:xml_parser_fuzzer", ++ ] + sources = [ + "chromium/libxml_utils.cc", + "chromium/libxml_utils.h", + ] +- + public_configs = [ ":system_libxml" ] + } ++ ++static_library("xml_reader") { ++ # Do not expand this visibility list without first consulting with the ++ # Security Team. ++ visibility = [ ++ "//base/test:test_support", ++ "//components/policy/core/common:unit_tests", ++ "//services/data_decoder:*", ++ "//tools/traffic_annotation/auditor:auditor_sources", ++ ] ++ sources = [ ++ "chromium/xml_reader.cc", ++ "chromium/xml_reader.h", ++ ] ++ deps = [ ++ ":libxml_utils", ++ ] ++} ++ ++static_library("xml_writer") { ++ # The XmlWriter is considered safe to use from any target. ++ visibility = [ "*" ] ++ sources = [ ++ "chromium/xml_writer.cc", ++ "chromium/xml_writer.h", ++ ] ++ deps = [ ++ ":libxml_utils", ++ ] ++} +diff --git a/third_party/libxml/chromium/libxml_utils.h b/third_party/libxml/chromium/libxml_utils.h +index ff969fa..e0f3ecd 100644 +--- a/third_party/libxml/chromium/libxml_utils.h ++++ b/third_party/libxml/chromium/libxml_utils.h +@@ -6,8 +6,7 @@ + #define THIRD_PARTY_LIBXML_CHROMIUM_LIBXML_UTILS_H_ + + #include <string> +- +-#include "third_party/libxml/src/include/libxml/xmlreader.h" ++#include <libxml/xmlreader.h> + + // libxml uses a global error function pointer for reporting errors. + // A ScopedXmlErrorFunc object lets you change the global error pointer +diff --git a/third_party/libxml/chromium/xml_reader.cc b/third_party/libxml/chromium/xml_reader.cc +index 92464f4..4779290 100644 +--- a/third_party/libxml/chromium/xml_reader.cc ++++ b/third_party/libxml/chromium/xml_reader.cc +@@ -7,7 +7,8 @@ + #include <vector> + + #include "third_party/libxml/chromium/libxml_utils.h" +-#include "third_party/libxml/src/include/libxml/xmlreader.h" ++ ++#include <libxml/xmlreader.h> + + using internal::XmlStringToStdString; + +diff --git a/third_party/libxml/chromium/xml_writer.cc b/third_party/libxml/chromium/xml_writer.cc +index 51fce8e..aa3a34f 100644 +--- a/third_party/libxml/chromium/xml_writer.cc ++++ b/third_party/libxml/chromium/xml_writer.cc +@@ -5,7 +5,8 @@ + #include "third_party/libxml/chromium/xml_writer.h" + + #include "third_party/libxml/chromium/libxml_utils.h" +-#include "third_party/libxml/src/include/libxml/xmlwriter.h" ++ ++#include <libxml/xmlwriter.h> + + XmlWriter::XmlWriter() : writer_(nullptr), buffer_(nullptr) {} + |