02/02: gnu: webkitgtk: Update to 2.8.5.

[Mark H. Weaver]

mhw pushed a commit to branch master
in repository guix.

commit f6a9bf848f711b933ae7b6438204ab896d218727
Author: Mark H Weaver <address@hidden>
Date:   Wed Aug 12 22:55:15 2015 -0400

    gnu: webkitgtk: Update to 2.8.5.
    
    * gnu/packages/webkit.scm (webkitgtk): Update to 2.8.5.
      [arguments]: Add 'add-gst-plugins-base-include-path' phase.
---
 gnu/packages/webkit.scm |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 4483d71..6be1f91 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Sou Bunnbu <address@hidden>
 ;;; Copyright © 2015 David Hashe <address@hidden>
 ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015 Mark H Weaver <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -51,14 +52,14 @@
 (define-public webkitgtk
   (package
     (name "webkitgtk")
-    (version "2.8.3")
+    (version "2.8.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.webkitgtk.org/releases/";
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "05igg61lflgwy83cmxgyzmvf2bkhplmp8710ssrlpmbfcz461pmk"))))
+                "082dw0d8jxvsapx30ypmy5h2srzfzi42c3zr9pbkzx1m959hq7rx"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f ; no tests
@@ -67,7 +68,22 @@
                           "-DPORT=GTK"
                           (string-append ; uses lib64 by default
                            "-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
      `(("bison" ,bison)
        ("gettext" ,gnu-gettext)