diff options
| -rw-r--r-- | gnu/packages/chromium.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/regex.scm | 15 |
3 files changed, 27 insertions, 3 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" diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8a57127771..abd1dc6d6b 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 diff --git a/gnu/packages/regex.scm b/gnu/packages/regex.scm index 5654104bcf..c90ab88db1 100644 --- a/gnu/packages/regex.scm +++ b/gnu/packages/regex.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; ;;; This file is part of GNU Guix. @@ -30,7 +30,7 @@ (define-public re2 (package (name "re2") - (version "2020-03-03") + (version "2020-05-01") (home-page "https://github.com/google/re2") (source (origin (method git-fetch) @@ -38,7 +38,16 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0f1fncvg41dg9k06jiqbd7k51ljihk7rjb0kvxkbrlvgbzlpb860")))) + "0daav6ja99v5hdlwh1xzmja950y7767yw0phcbd0wpn42km39i20")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Fix test failure on 32-bit platforms, see + ;; <https://github.com/google/re2/issues/256>. + (substitute* "re2/testing/compile_test.cc" + (("re->CompileToProg\\(920\\)") + "re->CompileToProg(850)")) + #t)))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) |