me/guix
Archived
1
0
Fork 0
Code Activity

gnu: webkitgtk: Update to 2.8.5.

Browse source 
* gnu/packages/webkit.scm (webkitgtk): Update to 2.8.5.
  [arguments]: Add 'add-gst-plugins-base-include-path' phase.
This commit is contained in:
Mark H Weaver 2015-08-12 22:55:15 -04:00
parent 625c91767f
commit f6a9bf848f
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/webkit.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com> ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; 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 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -51,14 +52,14 @@
(define-public webkitgtk (define-public webkitgtk
(package (package
(name "webkitgtk") (name "webkitgtk")
(version "2.8.3") (version "2.8.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.webkitgtk.org/releases/" (uri (string-append "http://www.webkitgtk.org/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"05igg61lflgwy83cmxgyzmvf2bkhplmp8710ssrlpmbfcz461pmk")))) "082dw0d8jxvsapx30ypmy5h2srzfzi42c3zr9pbkzx1m959hq7rx"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no tests '(#:tests? #f ; no tests
@ -67,7 +68,22 @@
"-DPORT=GTK" "-DPORT=GTK"
(string-append ; uses lib64 by default (string-append ; uses lib64 by default
"-DLIB_INSTALL_DIR=" "-DLIB_INSTALL_DIR="
(assoc-ref %outputs "out") "/lib")))) (assoc-ref %outputs "out") "/lib"))
#:phases
(modify-phases %standard-phases
(add-after
'set-paths 'add-gst-plugins-base-include-path
(lambda* (#:key inputs #:allow-other-keys)
;; XXX Work around a problem in the build system, which neglects
;; to add -I for gst-plugins-base when compiling
;; Source/WebKit2/UIProcess/WebPageProxy.cpp, apparently assuming
;; that it will be in the same directory as gstreamer's header
;; files.
(setenv "CPATH"
(string-append (getenv "CPATH")
":"
(assoc-ref inputs "gst-plugins-base")
"/include/gstreamer-1.0")))))))
(native-inputs (native-inputs
`(("bison" ,bison) `(("bison" ,bison)
("gettext" ,gnu-gettext) ("gettext" ,gnu-gettext)