diff options
author | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 17:50:17 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-13 18:18:48 +0100 |
commit | 8c986ab12034d67db836a881f57c69754d8073ae (patch) | |
tree | bf5183011119695ac549d4cfff4dc2175e659397 /gnu/packages/webkit.scm | |
parent | 203795aceaabec0e0e5818e1650ad407d825d1b3 (diff) | |
parent | 7a2eed3aac1ecd0bdf293e33a234fad58f2e5f9e (diff) | |
download | guix-8c986ab12034d67db836a881f57c69754d8073ae.tar guix-8c986ab12034d67db836a881f57c69754d8073ae.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/webkit.scm')
-rw-r--r-- | gnu/packages/webkit.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index d22aacd12f..dd05446603 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) + #:use-module (gnu packages libreoffice) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -52,14 +53,14 @@ (define-public webkitgtk (package (name "webkitgtk") - (version "2.8.5") + (version "2.10.4") (source (origin (method url-fetch) (uri (string-append "http://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 (base32 - "082dw0d8jxvsapx30ypmy5h2srzfzi42c3zr9pbkzx1m959hq7rx")))) + "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no tests @@ -105,6 +106,7 @@ ("gst-plugins-base" ,gst-plugins-base) ("gtk+-2" ,gtk+-2) ("harfbuzz" ,harfbuzz) + ("hyphen" ,hyphen) ("icu4c" ,icu4c) ("libjpeg" ,libjpeg) ("libnotify" ,libnotify) |