[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/13: gnu: re2: Update to 2020-05-01.
From: |
guix-commits |
Subject: |
02/13: gnu: re2: Update to 2020-05-01. |
Date: |
Mon, 11 May 2020 16:04:17 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 16fbbf6a85eeefda2bec987d279b097f34fdc5f4
Author: Marius Bakke <address@hidden>
AuthorDate: Fri May 8 23:24:14 2020 +0200
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/chromium.scm | 6 ++++++
gnu/packages/qt.scm | 9 +++++++++
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 9bfe690..9ab7ca1 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 8a57127..abd1dc6 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 5654104..c90ab88 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 <address@hidden>
-;;; Copyright © 2016 Marius Bakke <address@hidden>
+;;; Copyright © 2016, 2020 Marius Bakke <address@hidden>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; 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)
- branch master updated (fef052b -> bdc801e), guix-commits, 2020/05/11
- 01/13: gnu: OpenEXR: Update to 2.5.0., guix-commits, 2020/05/11
- 02/13: gnu: re2: Update to 2020-05-01.,
guix-commits <=
- 04/13: gnu: i3-wm: Update to 4.18.1., guix-commits, 2020/05/11
- 06/13: gnu: oniguruma: Update to 6.9.5-rev1., guix-commits, 2020/05/11
- 09/13: gnu: lvm2: Update to 2.03.09., guix-commits, 2020/05/11
- 05/13: gnu: wxwidgets: Update to 3.0.5.1., guix-commits, 2020/05/11
- 11/13: gnu: capnproto: Update to 0.8.0., guix-commits, 2020/05/11
- 12/13: gnu: wl-clipboard: Update to 2.0.0., guix-commits, 2020/05/11
- 03/13: gnu: bitcoin: Fix test failure with Python 3.8., guix-commits, 2020/05/11
- 10/13: gnu: rng-tools: Update to 6.10., guix-commits, 2020/05/11
- 07/13: gnu: oniguruma: Do not build the static library., guix-commits, 2020/05/11
- 08/13: gnu: libsecret: Update to 0.20.3., guix-commits, 2020/05/11