[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: gnu: WebKitGTK: Update to 2.24.0.
From: |
guix-commits |
Subject: |
04/09: gnu: WebKitGTK: Update to 2.24.0. |
Date: |
Thu, 14 Mar 2019 09:51:04 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 72663b48221668f30b7bdcc502c299757a647156
Author: Marius Bakke <address@hidden>
Date: Wed Mar 13 15:00:30 2019 +0100
gnu: WebKitGTK: Update to 2.24.0.
* gnu/packages/webkit.scm (webkitgtk-2.22): Rename to ...
(webkitgtk-2.24): ... this. Update to 2.24.0.
[inputs]: Add OPENJPEG.
* gnu/packages/gnome.scm (eolie, epiphany)[inputs]: Adjust accordingly.
* gnu/packages/web-browsers.scm (next-gtk-webkit)[inputs]: Likewise.
---
gnu/packages/gnome.scm | 4 ++--
gnu/packages/web-browsers.scm | 2 +-
gnu/packages/webkit.scm | 9 ++++++---
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2697bee..ea6d255 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4235,7 +4235,7 @@ work and the interface is well tested.")
("libsecret" ,libsecret)
("gtkspell3" ,gtkspell3)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("webkitgtk" ,webkitgtk-2.22)))
+ ("webkitgtk" ,webkitgtk-2.24)))
(home-page "https://wiki.gnome.org/Apps/Eolie")
(synopsis "Web browser for GNOME")
(description
@@ -4294,7 +4294,7 @@ a secret password store, an adblocker, and a modern UI.")
("libxslt" ,libxslt)
("nettle" ,nettle) ; for hogweed
("sqlite" ,sqlite)
- ("webkitgtk" ,webkitgtk-2.22)))
+ ("webkitgtk" ,webkitgtk-2.24)))
(home-page "https://wiki.gnome.org/Apps/Web")
(synopsis "GNOME web browser")
(description
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index a19a0dc..b6af572 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -397,7 +397,7 @@ driven and does not detract you from your daily work.")
(inputs
`(("glib-networking" ,glib-networking)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("webkitgtk" ,webkitgtk-2.22)))
+ ("webkitgtk" ,webkitgtk-2.24)))
(native-inputs
`(("gcc-7" ,gcc-7) ; needed because webkitgtk-2.22 is compiled with gcc-7
("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 7a48186..14c374d 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -165,20 +165,23 @@ HTML/CSS applications to full-fledged web browsers.")
;; newer version of GCC than our default compiler, and this causes problems
;; when linked with C++ libraries built using our default compiler. For now,
;; we use this newer webkitgtk only for selected packages, e.g. epiphany.
-(define-public webkitgtk-2.22
+(define-public webkitgtk-2.24
(package/inherit webkitgtk
(name "webkitgtk")
- (version "2.22.7")
+ (version "2.24.0")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz"))
(sha256
(base32
- "1zrhmz90sn30zgyflj4i86fsscws10xsi2kfs87nj2nd0pbggrjb"))))
+ "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif"))))
(native-inputs
`(("gcc" ,gcc-7) ; webkitgtk-2.22 requires gcc-6 or newer
,@(package-native-inputs webkitgtk)))
+ (inputs
+ `(("openjpeg" ,openjpeg)
+ ,@(package-inputs webkitgtk)))
(arguments
(substitute-keyword-arguments (package-arguments webkitgtk)
((#:phases phases)
- branch master updated (209393a -> 8cc3983), guix-commits, 2019/03/14
- 01/09: gnu: Add waylandpp., guix-commits, 2019/03/14
- 02/09: gnu: Kodi: Add Wayland variant., guix-commits, 2019/03/14
- 04/09: gnu: WebKitGTK: Update to 2.24.0.,
guix-commits <=
- 09/09: gnu: jasper: Update to 2.0.16., guix-commits, 2019/03/14
- 03/09: gnu: libsoup: Update to 2.66.0., guix-commits, 2019/03/14
- 07/09: gnu: samba: Update to 4.9.5., guix-commits, 2019/03/14
- 08/09: gnu: rapidjson: Update home page., guix-commits, 2019/03/14
- 06/09: gnu: libzip: Update to 1.5.2., guix-commits, 2019/03/14
- 05/09: gnu: libzip: Don't use NAME in source URI., guix-commits, 2019/03/14