[gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/

[Mike Gilbert]

commit:     f4cd99ca1d884fc887f0c50e4be397b214641d5a
Author:     Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat May  2 19:28:08 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  3 19:56:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4cd99ca

www-client/chromium: Fix building with >=dev-libs/re2-0.2020.05.01.

Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 www-client/chromium/chromium-81.0.4044.129.ebuild           |  1 +
 www-client/chromium/chromium-83.0.4103.34.ebuild            |  1 +
 .../chromium/files/chromium-81-re2-0.2020.05.01.patch       | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/www-client/chromium/chromium-81.0.4044.129.ebuild 
b/www-client/chromium/chromium-81.0.4044.129.ebuild
index b110b41753b..15ddde7f89c 100644
--- a/www-client/chromium/chromium-81.0.4044.129.ebuild
+++ b/www-client/chromium/chromium-81.0.4044.129.ebuild
@@ -156,6 +156,7 @@ PATCHES=(
        "${FILESDIR}/chromium-81-gcc-constexpr.patch"
        "${FILESDIR}/chromium-81-gcc-10.patch"
        "${FILESDIR}/chromium-81-icu67.patch"
+       "${FILESDIR}/chromium-81-re2-0.2020.05.01.patch"
 )
 
 pre_build_checks() {

diff --git a/www-client/chromium/chromium-83.0.4103.34.ebuild 
b/www-client/chromium/chromium-83.0.4103.34.ebuild
index 2cb862a2cb9..65b8d3bdf9c 100644
--- a/www-client/chromium/chromium-83.0.4103.34.ebuild
+++ b/www-client/chromium/chromium-83.0.4103.34.ebuild
@@ -181,6 +181,7 @@ PATCHES=(
        "${FILESDIR}/chromium-83-gcc-serviceworker.patch"
        "${FILESDIR}/chromium-83-gcc-10.patch"
        "${FILESDIR}/chromium-83-icu67.patch"
+       "${FILESDIR}/chromium-81-re2-0.2020.05.01.patch"
 )
 
 pre_build_checks() {

diff --git a/www-client/chromium/files/chromium-81-re2-0.2020.05.01.patch 
b/www-client/chromium/files/chromium-81-re2-0.2020.05.01.patch
new file mode 100644
index 00000000000..17f539060f3
--- /dev/null
+++ b/www-client/chromium/files/chromium-81-re2-0.2020.05.01.patch
@@ -0,0 +1,13 @@
+https://chromium.googlesource.com/chromium/src/+/ede390a0b18e4565abf8ac1e1ff717e1d43fc320
+
+--- /components/autofill/core/browser/address_rewriter.cc
++++ /components/autofill/core/browser/address_rewriter.cc
+@@ -57,7 +57,7 @@
+                           CompiledRuleVector* compiled_rules) {
+   base::StringPiece data = data_string;
+   re2::RE2::Options options;
+-  options.set_utf8(true);
++  options.set_encoding(RE2::Options::EncodingUTF8);
+   options.set_word_boundary(true);
+ 
+   size_t token_end = 0;