guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: re2: Update to 2020-05-01.

Browse source 
* 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.
This commit is contained in:
Marius Bakke 2020-05-08 23:24:14 +02:00
parent b8bb2f0793
commit 16fbbf6a85
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/packages/chromium.scm
View file

@ -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"

9
gnu/packages/qt.scm
View file

@ -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

15
gnu/packages/regex.scm
View file

@ -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)