diff options
| author | Efraim Flashner <[email protected]> | 2021-04-16 14:39:48 +0300 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2021-04-16 14:39:48 +0300 |
| commit | fcc39864dba82e14895afbe841091091366c96bc (patch) | |
| tree | 6e0f05495fd6512051224dc85fd3ab495cbf1a24 /gnu/packages/webkit.scm | |
| parent | 76fc36d0a7215979bb74c05840f5a4de4ab5ea93 (diff) | |
| parent | 44f9432705d04c069a8acf9e37e3ad856ac0bf82 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/boost.scm
gnu/packages/chez.scm
gnu/packages/compression.scm
gnu/packages/crates-io.scm
gnu/packages/docbook.scm
gnu/packages/engineering.scm
gnu/packages/gcc.scm
gnu/packages/gl.scm
gnu/packages/gtk.scm
gnu/packages/nettle.scm
gnu/packages/python-check.scm
gnu/packages/python-xyz.scm
gnu/packages/radio.scm
gnu/packages/rust.scm
gnu/packages/sqlite.scm
guix/build-system/node.scm
Diffstat (limited to 'gnu/packages/webkit.scm')
| -rw-r--r-- | gnu/packages/webkit.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 89eee74def..083c8ccb08 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -174,7 +174,7 @@ engine that uses Wayland for graphics output.") ("docbook-xsl" ,docbook-xsl) ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc) + ("gtk-doc" ,gtk-doc/stable) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) @@ -226,14 +226,14 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") (define-public webkitgtk (package (name "webkitgtk") - (version "2.30.6") + (version "2.32.0") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" "webkitgtk-" version ".tar.xz")) (sha256 (base32 - "07kwkn7gnlfw4idl5vyyzhzbj2bjzvjrclbikn9vaw0pm73nwwsh")) + "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx")) (patches (search-patches "webkitgtk-share-store.patch" "webkitgtk-bind-all-fonts.patch")))) (build-system cmake-build-system) @@ -244,6 +244,9 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") #:configure-flags (list "-DPORT=GTK" "-DENABLE_GTKDOC=ON" ; No doc by default + ;; Requires libmanette, new dependency added in 2.32.0. + ;; TODO Decide if we should enable this + "-DENABLE_GAMEPAD=OFF" "-DUSE_SYSTEMD=OFF" (string-append ; uses lib64 by default "-DLIB_INSTALL_DIR=" @@ -301,7 +304,7 @@ acceleration in mind, leveraging common 3D graphics APIs for best performance.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-wrapper) - ("gtk-doc" ,gtk-doc) ; For documentation generation + ("gtk-doc" ,gtk-doc/stable) ; For documentation generation ("docbook-xml" ,docbook-xml) ; For documentation generation ("ruby" ,ruby))) (propagated-inputs |