gnu: WebKitGTK: Update to 2.26.1.
* gnu/packages/webkit.scm (webkitgtk-2.24): Rename to ... (webkitgtk-2.26): ... this. Update to 2.26.1. [inputs]: Add BUBBLEWRAP, LIBSECCOMP, LIBWPE, WPEBACKEND-FDO, and XDG-DBUS-PROXY. * gnu/packages/gnome.scm (eolie, epiphany)[inputs]: Adjust for changed variable name. * gnu/packages/web-browsers.scm (next-gtk-webkit)[inputs]: Likewise.
This commit is contained in:
parent
9e0cb9d79d
commit
689b44bc3f
|
@ -4386,7 +4386,7 @@ work and the interface is well tested.")
|
||||||
("libsecret" ,libsecret)
|
("libsecret" ,libsecret)
|
||||||
("gtkspell3" ,gtkspell3)
|
("gtkspell3" ,gtkspell3)
|
||||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||||
("webkitgtk" ,webkitgtk-2.24)))
|
("webkitgtk" ,webkitgtk-2.26)))
|
||||||
(home-page "https://wiki.gnome.org/Apps/Eolie")
|
(home-page "https://wiki.gnome.org/Apps/Eolie")
|
||||||
(synopsis "Web browser for GNOME")
|
(synopsis "Web browser for GNOME")
|
||||||
(description
|
(description
|
||||||
|
@ -4445,7 +4445,7 @@ a secret password store, an adblocker, and a modern UI.")
|
||||||
("libxslt" ,libxslt)
|
("libxslt" ,libxslt)
|
||||||
("nettle" ,nettle) ; for hogweed
|
("nettle" ,nettle) ; for hogweed
|
||||||
("sqlite" ,sqlite)
|
("sqlite" ,sqlite)
|
||||||
("webkitgtk" ,webkitgtk-2.24)))
|
("webkitgtk" ,webkitgtk-2.26)))
|
||||||
(home-page "https://wiki.gnome.org/Apps/Web")
|
(home-page "https://wiki.gnome.org/Apps/Web")
|
||||||
(synopsis "GNOME web browser")
|
(synopsis "GNOME web browser")
|
||||||
(description
|
(description
|
||||||
|
|
|
@ -398,7 +398,7 @@ driven and does not detract you from your daily work.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("glib-networking" ,glib-networking)
|
`(("glib-networking" ,glib-networking)
|
||||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
||||||
("webkitgtk" ,webkitgtk-2.24)))
|
("webkitgtk" ,webkitgtk-2.26)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.24 and above are compiled with gcc-7
|
`(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.24 and above are compiled with gcc-7
|
||||||
("pkg-config" ,pkg-config)))
|
("pkg-config" ,pkg-config)))
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
#:use-module (gnu packages icu4c)
|
#:use-module (gnu packages icu4c)
|
||||||
#:use-module (gnu packages image)
|
#:use-module (gnu packages image)
|
||||||
#:use-module (gnu packages libreoffice)
|
#:use-module (gnu packages libreoffice)
|
||||||
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages perl)
|
#:use-module (gnu packages perl)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
|
@ -55,6 +56,7 @@
|
||||||
#:use-module (gnu packages sqlite)
|
#:use-module (gnu packages sqlite)
|
||||||
#:use-module (gnu packages tls)
|
#:use-module (gnu packages tls)
|
||||||
#:use-module (gnu packages video)
|
#:use-module (gnu packages video)
|
||||||
|
#:use-module (gnu packages virtualization)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages xdisorg)
|
#:use-module (gnu packages xdisorg)
|
||||||
#:use-module (gnu packages xorg))
|
#:use-module (gnu packages xorg))
|
||||||
|
@ -225,22 +227,27 @@ HTML/CSS applications to full-fledged web browsers.")
|
||||||
;; newer version of GCC than our default compiler, and this causes problems
|
;; newer version of GCC than our default compiler, and this causes problems
|
||||||
;; when linked with C++ libraries built using our default compiler. For now,
|
;; when linked with C++ libraries built using our default compiler. For now,
|
||||||
;; we use this newer webkitgtk only for selected packages, e.g. epiphany.
|
;; we use this newer webkitgtk only for selected packages, e.g. epiphany.
|
||||||
(define-public webkitgtk-2.24
|
(define-public webkitgtk-2.26
|
||||||
(package/inherit webkitgtk
|
(package/inherit webkitgtk
|
||||||
(name "webkitgtk")
|
(name "webkitgtk")
|
||||||
(version "2.24.4")
|
(version "2.26.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
|
(base32
|
||||||
"1n3x5g1z6rg9n1ssna7wi0z6zlprjm4wzk544v14wqi6q0lv2s46"))))
|
"0mfikjfjhwcnrxbzdyh3fl9bbs2azgbdnx8h5910h41b3n022jvb"))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer
|
`(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer
|
||||||
,@(package-native-inputs webkitgtk)))
|
,@(package-native-inputs webkitgtk)))
|
||||||
(inputs
|
(inputs
|
||||||
`(("openjpeg" ,openjpeg)
|
`(("bubblewrap" ,bubblewrap)
|
||||||
|
("libseccomp" ,libseccomp)
|
||||||
|
("libwpe" ,libwpe)
|
||||||
|
("openjpeg" ,openjpeg)
|
||||||
|
("wpebackend-fdo" ,wpebackend-fdo)
|
||||||
|
("xdg-dbus-proxy" ,xdg-dbus-proxy)
|
||||||
,@(package-inputs webkitgtk)))
|
,@(package-inputs webkitgtk)))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments webkitgtk)
|
(substitute-keyword-arguments (package-arguments webkitgtk)
|
||||||
|
|
Loading…
Reference in New Issue