apteryx pushed a commit to branch core-updates-frozen-batched-changes in repository guix.
commit 97a0e4fb4f75d4c036cd6c5dbb64d1d03a31d8bb Author: Maxim Cournoyer <[email protected]> AuthorDate: Sat Oct 16 02:26:49 2021 -0400 gnu: webkitgtk: Update to 2.34.1. * gnu/packages/webkit.scm (webkitgtk): Update to 2.34.1. Remove trailing #t. [inputs]: Add lcms. --- gnu/packages/webkit.scm | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index dab8af2..2b27ffc 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -40,6 +40,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -226,14 +227,14 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.32.4") + (version "2.34.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/"; "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "1zfkfyhm4i7901pp32wcwcfxax69qgq5k44x0glwaywdg4zjvkh0")) + "1vix0w24m7mq82rzxrk8xvcrkli44gimzs282xs29q2xf0b16g24")) (patches (search-patches "webkitgtk-share-store.patch" "webkitgtk-bind-all-fonts.patch")))) (build-system cmake-build-system) @@ -272,8 +273,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (let ((store-directory (%store-directory))) (substitute* "Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp" - (("@storedir@") store-directory)) - #t))) + (("@storedir@") store-directory))))) (add-after 'unpack 'patch-gtk-doc-scan (lambda* (#:key inputs #:allow-other-keys) (for-each (lambda (file) @@ -281,23 +281,20 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";) (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/docbookx.dtd")))) - (find-files "Source" "\\.sgml$")) - #t)) + (find-files "Source" "\\.sgml$")))) (add-after 'unpack 'embed-absolute-wpebackend-reference (lambda* (#:key inputs #:allow-other-keys) (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) (substitute* "Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp" (("libWPEBackend-fdo-([\\.0-9]+)\\.so" all version) - (string-append wpebackend-fdo "/lib/" all))) - #t))) + (string-append wpebackend-fdo "/lib/" all)))))) (add-after 'install 'move-doc-files (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) (doc (assoc-ref outputs "doc"))) (mkdir-p (string-append doc "/share")) (rename-file (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t)))))) + (string-append doc "/share/gtk-doc")))))))) (native-inputs `(("bison" ,bison) ("gettext" ,gettext-minimal) @@ -323,6 +320,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") ("harfbuzz" ,harfbuzz) ("hyphen" ,hyphen) ("icu4c" ,icu4c) + ("lcms" ,lcms) ("libgcrypt" ,libgcrypt) ("libjpeg" ,libjpeg-turbo) ("libnotify" ,libnotify)
