gnu: webkitgtk: Update to 2.44.1.
* gnu/packages/webkit.scm (webkitgtk): Update to 2.44.1. [#:configure-flags]: Add “-DUSE_LIBBACKTRACE=OFF”. [#:phases]: Refer to $prefix/share/doc instead of the now unused $prefix/share/gtk-doc. (webkitgtk-for-gtk3)[#:configure-flags]: Add 0“-DUSE_GTK4=OFF”. Retain “-DENABLE_INTROSPECTION=ON”.master
parent
6b09647bab
commit
5105b07d47
|
@ -127,13 +127,13 @@ engine that uses Wayland for graphics output.")
|
||||||
(define-public webkitgtk
|
(define-public webkitgtk
|
||||||
(package
|
(package
|
||||||
(name "webkitgtk")
|
(name "webkitgtk")
|
||||||
(version "2.42.5")
|
(version "2.44.1")
|
||||||
(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 "0jg7c7z572afywwrnvdj3m5agaviv0vkqmzznnzzv30byb0phhmn"))
|
(base32 "0qamkk9db8m6x4qv5y10lihc18yzgrgbn6ldqw00ckghn1ci8ns2"))
|
||||||
(snippet
|
(snippet
|
||||||
#~(begin
|
#~(begin
|
||||||
(use-modules (guix build utils))
|
(use-modules (guix build utils))
|
||||||
|
@ -162,6 +162,7 @@ engine that uses Wayland for graphics output.")
|
||||||
;; tool to validate the good operation of
|
;; tool to validate the good operation of
|
||||||
;; webkitgtk.
|
;; webkitgtk.
|
||||||
"-DENABLE_MINIBROWSER=ON"
|
"-DENABLE_MINIBROWSER=ON"
|
||||||
|
"-DUSE_LIBBACKTRACE=OFF" ; XXX: circular dependency
|
||||||
;; The default lib installation prefix is lib64.
|
;; The default lib installation prefix is lib64.
|
||||||
(string-append "-DLIB_INSTALL_DIR=" #$output "/lib")
|
(string-append "-DLIB_INSTALL_DIR=" #$output "/lib")
|
||||||
;; XXX: WebKitGTK makes use of elogind's systemd-compatible
|
;; XXX: WebKitGTK makes use of elogind's systemd-compatible
|
||||||
|
@ -222,8 +223,8 @@ engine that uses Wayland for graphics output.")
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let ((doc (assoc-ref outputs "doc")))
|
(let ((doc (assoc-ref outputs "doc")))
|
||||||
(mkdir-p (string-append doc "/share"))
|
(mkdir-p (string-append doc "/share"))
|
||||||
(rename-file (string-append #$output "/share/gtk-doc")
|
(rename-file (string-append #$output "/share/doc")
|
||||||
(string-append doc "/share/gtk-doc"))))))))
|
(string-append doc "/share/doc"))))))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list bison
|
(list bison
|
||||||
gettext-minimal
|
gettext-minimal
|
||||||
|
@ -295,9 +296,8 @@ propagated by default) such as @code{gst-plugins-good} and
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments webkitgtk)
|
(substitute-keyword-arguments (package-arguments webkitgtk)
|
||||||
((#:configure-flags flags)
|
((#:configure-flags flags)
|
||||||
#~(cons* "-DENABLE_GTKDOC=ON"
|
#~(cons* "-DUSE_GTK4=OFF"
|
||||||
(delete "-DENABLE_INTROSPECTION=ON"
|
(delete "-DUSE_GTK4=ON" #$flags)))))
|
||||||
(delete "-DUSE_GTK4=ON" #$flags))))))
|
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(modify-inputs (package-propagated-inputs webkitgtk)
|
(modify-inputs (package-propagated-inputs webkitgtk)
|
||||||
(replace "gtk" gtk+)))
|
(replace "gtk" gtk+)))
|
||||||
|
|
Reference in New Issue