From 16fbbf6a85eeefda2bec987d279b097f34fdc5f4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 8 May 2020 23:24:14 +0200 Subject: 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. --- gnu/packages/qt.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/qt.scm') diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8a571277718..abd1dc6d6be 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1810,6 +1810,15 @@ message."))) (substitute-keyword-arguments (package-arguments qtsvg) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'fix-build-with-newer-re2 + (lambda _ + ;; Adjust for API change in re2, taken from + ;; https://chromium-review.googlesource.com/c/chromium/src/+/2145261 + (substitute* "src/3rdparty/chromium/components/autofill/core\ +/browser/address_rewriter.cc" + (("options\\.set_utf8\\(true\\)") + "options.set_encoding(RE2::Options::EncodingUTF8)")) + #t)) (add-after 'unpack 'patch-ninja-version-check (lambda _ ;; The build system assumes the system Ninja is too old because -- cgit v1.2.3