| 1 |
commit: f4cd99ca1d884fc887f0c50e4be397b214641d5a |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Sat May 2 19:28:08 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 19:56:52 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4cd99ca |
| 7 |
|
| 8 |
www-client/chromium: Fix building with >=dev-libs/re2-0.2020.05.01. |
| 9 |
|
| 10 |
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
www-client/chromium/chromium-81.0.4044.129.ebuild | 1 + |
| 14 |
www-client/chromium/chromium-83.0.4103.34.ebuild | 1 + |
| 15 |
.../chromium/files/chromium-81-re2-0.2020.05.01.patch | 13 +++++++++++++ |
| 16 |
3 files changed, 15 insertions(+) |
| 17 |
|
| 18 |
diff --git a/www-client/chromium/chromium-81.0.4044.129.ebuild b/www-client/chromium/chromium-81.0.4044.129.ebuild |
| 19 |
index b110b41753b..15ddde7f89c 100644 |
| 20 |
--- a/www-client/chromium/chromium-81.0.4044.129.ebuild |
| 21 |
+++ b/www-client/chromium/chromium-81.0.4044.129.ebuild |
| 22 |
@@ -156,6 +156,7 @@ PATCHES=( |
| 23 |
"${FILESDIR}/chromium-81-gcc-constexpr.patch" |
| 24 |
"${FILESDIR}/chromium-81-gcc-10.patch" |
| 25 |
"${FILESDIR}/chromium-81-icu67.patch" |
| 26 |
+ "${FILESDIR}/chromium-81-re2-0.2020.05.01.patch" |
| 27 |
) |
| 28 |
|
| 29 |
pre_build_checks() { |
| 30 |
|
| 31 |
diff --git a/www-client/chromium/chromium-83.0.4103.34.ebuild b/www-client/chromium/chromium-83.0.4103.34.ebuild |
| 32 |
index 2cb862a2cb9..65b8d3bdf9c 100644 |
| 33 |
--- a/www-client/chromium/chromium-83.0.4103.34.ebuild |
| 34 |
+++ b/www-client/chromium/chromium-83.0.4103.34.ebuild |
| 35 |
@@ -181,6 +181,7 @@ PATCHES=( |
| 36 |
"${FILESDIR}/chromium-83-gcc-serviceworker.patch" |
| 37 |
"${FILESDIR}/chromium-83-gcc-10.patch" |
| 38 |
"${FILESDIR}/chromium-83-icu67.patch" |
| 39 |
+ "${FILESDIR}/chromium-81-re2-0.2020.05.01.patch" |
| 40 |
) |
| 41 |
|
| 42 |
pre_build_checks() { |
| 43 |
|
| 44 |
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 |
| 45 |
new file mode 100644 |
| 46 |
index 00000000000..17f539060f3 |
| 47 |
--- /dev/null |
| 48 |
+++ b/www-client/chromium/files/chromium-81-re2-0.2020.05.01.patch |
| 49 |
@@ -0,0 +1,13 @@ |
| 50 |
+https://chromium.googlesource.com/chromium/src/+/ede390a0b18e4565abf8ac1e1ff717e1d43fc320 |
| 51 |
+ |
| 52 |
+--- /components/autofill/core/browser/address_rewriter.cc |
| 53 |
++++ /components/autofill/core/browser/address_rewriter.cc |
| 54 |
+@@ -57,7 +57,7 @@ |
| 55 |
+ CompiledRuleVector* compiled_rules) { |
| 56 |
+ base::StringPiece data = data_string; |
| 57 |
+ re2::RE2::Options options; |
| 58 |
+- options.set_utf8(true); |
| 59 |
++ options.set_encoding(RE2::Options::EncodingUTF8); |
| 60 |
+ options.set_word_boundary(true); |
| 61 |
+ |
| 62 |
+ size_t token_end = 0; |
Archives