diff options
Diffstat (limited to 'gnu/packages/webkit.scm')
| -rw-r--r-- | gnu/packages/webkit.scm | 49 |
1 files changed, 13 insertions, 36 deletions
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index aa7f7aafe8..a82601096f 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> -;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -124,18 +124,18 @@ the WPE-flavored port of WebKit.") engine that uses Wayland for graphics output.") (license license:bsd-2))) -(define %webkit-version "2.36.7") ;webkit2gtk4 +(define %webkit-version "2.38.3") (define-public webkitgtk (package - (name "webkitgtk") + (name "webkitgtk") ; webkit2gtk4 (version %webkit-version) (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0hqpfgzbb7lzdih9aw86rmkljm8ynv8zw3b72z88211gngr0q9hc")) + (base32 "0njac0878ksh53gn50phly1vzvj08q7g5aclncv6k324xp8h3w21")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -166,6 +166,11 @@ engine that uses Wayland for graphics output.") #:make-flags #~(list "-j" (number->string (max 2 (parallel-job-count)))) #:phases #~(modify-phases %standard-phases + (add-before 'build 'set-CC + (lambda _ + ;; Some Perl scripts check for the CC environment variable, else + ;; use /usr/bin/gcc. + (setenv "CC" #$(cc-for-target)))) (add-after 'unpack 'configure-bubblewrap-store-directory (lambda _ ;; This phase works in tandem with @@ -189,12 +194,6 @@ engine that uses Wayland for graphics output.") ;; the pkg-config search to locate headers. (("pkg_check_modules\\(PC_SYSTEMD QUIET libsystemd") "pkg_check_modules(PC_SYSTEMD QUIET libelogind")))) - (add-after 'unpack 'patch-gtk-doc-scan - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (substitute* (find-files "Source" "\\.sgml$") - (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") - (search-input-file (or native-inputs inputs) - "xml/dtd/docbook/docbookx.dtd"))))) (add-after 'unpack 'embed-absolute-wpebackend-reference (lambda* (#:key inputs #:allow-other-keys) (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) @@ -223,9 +222,7 @@ engine that uses Wayland for graphics output.") perl pkg-config python-wrapper - ;; These are required to build the documentation. - gtk-doc/stable - docbook-xml + gi-docgen ruby)) (propagated-inputs (list gtk+ libsoup)) @@ -282,33 +279,13 @@ propagated by default) such as @code{gst-plugins-good} and (define-public webkitgtk-next (package (inherit webkitgtk) - (name "webkitgtk") - (version "2.37.91") ;webkit2gtk5 - (source (origin - (inherit (package-source webkitgtk)) - (method url-fetch) - (uri (string-append "https://www.webkitgtk.org/releases/" - name "-" version ".tar.xz")) - (sha256 - (base32 "0r2d1dbx6s8bad011dkmx7j34gcxlz9bs14pip1qn7n1rhgxb3qi")))) - (build-system cmake-build-system) + (name "webkitgtk-next") ; webkit2gtk5 (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) #~(cons* "-DENABLE_INTROSPECTION=ON" "-DUSE_GTK4=ON" - (delete "-DENABLE_GTKDOC=ON" #$flags))) - ((#:phases phases) - #~(modify-phases #$phases - (add-before 'build 'set-CC - (lambda _ - ;; Some Perl scripts check for the CC environment variable, else - ;; use /usr/bin/gcc. - (setenv "CC" "gcc"))))))) - (native-inputs - (modify-inputs (package-native-inputs webkitgtk) - (delete "docbook-xml" "gtk-doc") - (append gi-docgen))) + (delete "-DENABLE_GTKDOC=ON" #$flags))))) (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) (replace "gtk+" gtk))) @@ -339,7 +316,7 @@ propagated by default) such as @code{gst-plugins-good} and (uri (string-append "https://wpewebkit.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "1jcm5fjzn1k9l87qwqgmvd5qriwpv3vgs632zc6asqn5zxr7sx7k")))) + (base32 "160456k4yiml0zn2fxba9qwp94dvvn93z9rqs2qa2lvjxig0gn8x")))) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) |