diff -Nru chromium-81.0.4044.92/debian/changelog chromium-81.0.4044.92/debian/changelog --- chromium-81.0.4044.92/debian/changelog 2020-04-07 23:05:20.000000000 +0000 +++ chromium-81.0.4044.92/debian/changelog 2020-05-30 12:50:26.000000000 +0000 @@ -1,3 +1,9 @@ +chromium (81.0.4044.92-1+rpi1) bullseye-staging; urgency=medium + + * Apply upstream patch to fix build with re2 20200501 (Closes: 960361) + + -- Peter Michael Green Sat, 30 May 2020 12:50:26 +0000 + chromium (81.0.4044.92-1) unstable; urgency=medium * New upstream stable release. diff -Nru chromium-81.0.4044.92/debian/patches/re2-20200501.patch chromium-81.0.4044.92/debian/patches/re2-20200501.patch --- chromium-81.0.4044.92/debian/patches/re2-20200501.patch 1970-01-01 00:00:00.000000000 +0000 +++ chromium-81.0.4044.92/debian/patches/re2-20200501.patch 2020-05-30 12:50:26.000000000 +0000 @@ -0,0 +1,32 @@ +commit ede390a0b18e4565abf8ac1e1ff717e1d43fc320 +Author: Paul Wankadia +Date: Tue Apr 14 16:54:51 2020 +0000 + + Clean up a call to set_utf8(). + + This is part of an effort to rewrite calls to utf8() and set_utf8() + (in RE2::Options) as calls to encoding() and set_encoding(), + respectively. utf8() and set_utf8() have been marked as the "legacy" + interface since 2008, so it is long past time that we get rid of them. + + R=parastoog@google.com + + Change-Id: I62c48cd575a55b519d5264ed857f927c163068b2 + Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2145261 + Reviewed-by: Parastoo Geranmayeh + Commit-Queue: Paul Wankadia + Cr-Commit-Position: refs/heads/master@{#758886} + +diff --git a/components/autofill/core/browser/address_rewriter.cc b/components/autofill/core/browser/address_rewriter.cc +index 1b85a50974cf..030a5aba146d 100644 +--- a/components/autofill/core/browser/address_rewriter.cc ++++ b/components/autofill/core/browser/address_rewriter.cc +@@ -57,7 +57,7 @@ void CompileRulesFromData(const std::string& data_string, + 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; diff -Nru chromium-81.0.4044.92/debian/patches/series chromium-81.0.4044.92/debian/patches/series --- chromium-81.0.4044.92/debian/patches/series 2020-04-07 23:05:20.000000000 +0000 +++ chromium-81.0.4044.92/debian/patches/series 2020-05-30 12:50:26.000000000 +0000 @@ -77,3 +77,5 @@ buster/vpx17.patch buster/opus13.patch buster/clang7.patch + +re2-20200501.patch