summaryrefslogtreecommitdiff
path: root/gnu/packages/chromium.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-05-08 23:24:14 +0200
committerMarius Bakke <mbakke@fastmail.com>2020-05-11 21:55:01 +0200
commit16fbbf6a85eeefda2bec987d279b097f34fdc5f4 (patch)
tree5d39353c714aa3f623a4eaa718295d82376c9ff4 /gnu/packages/chromium.scm
parentb8bb2f0793aa2c5ff32956a90a0cfdb94bbe7a89 (diff)
downloadguix-patches-16fbbf6a85eeefda2bec987d279b097f34fdc5f4.tar
guix-patches-16fbbf6a85eeefda2bec987d279b097f34fdc5f4.tar.gz
gnu: re2: Update to 2020-05-01.
* gnu/packages/regex.scm (re2): Update to 2020-05-01. [source](modules, snippet): New fields. * gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Add substitution to adjust for re2 API change. * gnu/packages/qt.scm (qtwebengine)[arguments]: Likewise.
Diffstat (limited to 'gnu/packages/chromium.scm')
-rw-r--r--gnu/packages/chromium.scm6
1 files changed, 6 insertions, 0 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 9bfe690625..9ab7ca1f91 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -527,6 +527,12 @@ from forcing GEXP-PROMISE."
(modify-phases %standard-phases
(add-after 'unpack 'patch-stuff
(lambda _
+ ;; Fix build with newer re2. Taken from:
+ ;; https://chromium-review.googlesource.com/c/chromium/src/+/2145261
+ (substitute* "components/autofill/core/browser/address_rewriter.cc"
+ (("options\\.set_utf8\\(true\\)")
+ "options.set_encoding(RE2::Options::EncodingUTF8)"))
+
(substitute*
'("base/process/launch_posix.cc"
"base/third_party/dynamic_annotations/dynamic_annotations.c"