gnu: webkitgtk: Update to 2.20.0.

* gnu/packages/webkit.scm (webkitgtk): Update to 2.20.0.
[arguments]: (Re-)disable WOFF2 web font support.
This commit is contained in:
Tobias Geerinckx-Rice 2018-03-14 10:24:35 +01:00
parent 9851688392
commit 86c9c0c118
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -3,6 +3,7 @@
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com> ;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -54,14 +55,14 @@ (define-module (gnu packages webkit)
(define-public webkitgtk (define-public webkitgtk
(package (package
(name "webkitgtk") (name "webkitgtk")
(version "2.18.6") (version "2.20.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/" (uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0g5cpdijjv5hlrbi4i4dh97yrh5apnyvm90wpr9f84hgyk12r4ck")))) "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
@ -79,7 +80,12 @@ (define-public webkitgtk
;; included. More investigation is needed. For ;; included. More investigation is needed. For
;; now, we explicitly disable it to prevent an error ;; now, we explicitly disable it to prevent an error
;; at configuration time. ;; at configuration time.
"-DUSE_GSTREAMER_GL=OFF") "-DUSE_GSTREAMER_GL=OFF"
;; XXX Disable WOFF2 web fonts. These were never
;; supported in our previous builds. Enabling them
;; requires building libwoff2 and possibly woff2dec.
"-DUSE_WOFF2=OFF")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after (add-after