Rene wrote 7 years ago
(name . guix-patches@gnu.org)(address . guix-patches@gnu.org)
2y0kyEsTOAduJ1_FpISXs6nmDsVHGRE1NamDEsT3Jen6VWv7hxvAUOsogyyZqNpu0wMVqzgVEddQ4cfAlSKNQ1HMd8MfBKLjedGHyzq5GN4=@protonmail.com
Hello team,
this is a proposed patch to update epiphany to 3.28.1.
Also tested inside a vm with ´guix system vm-image'.
Thank you
Rene
From 7a72a5f3dba61f42deb4af86e219d0a6309dc076 Mon Sep 17 00:00:00 2001
From: Rene <pacoon@protonmail.com>
Date: Sun, 15 Apr 2018 23:24:05 -0500
Subject: [PATCH] gnu: epiphany: Update to 3.28.1.
* gnu/packages/gnome.scm (epiphany): Update to 3.28.1.
[build-system]: Use meson-build-system.
[native-inputs]: Add desktop-file-utils, glib:bin and gtk+:bin.
[inputs]: Add gdk-pixbuf+svg and nettle. Remove gdk-pixbuf.
[arguments]: Remove #:configure-flags.
---
gnu/packages/gnome.scm | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
Toggle diff (60 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ed9f54be8..931ba329d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4166,7 +4166,7 @@ a secret password store, an adblocker, and a modern UI.")
(define-public epiphany
(package
(name "epiphany")
- (version "3.24.4")
+ (version "3.28.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -4174,8 +4174,9 @@ a secret password store, an adblocker, and a modern UI.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1jg59s98aljf603w24r5a3cr4fw6z88gc0warqy1946iprjgdw0m"))))
- (build-system glib-or-gtk-build-system)
+ "0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md"))))
+
+ (build-system meson-build-system)
(arguments
;; FIXME: tests run under Xvfb, but fail with:
;; /src/bookmarks/ephy-bookmarks/create:
@@ -4183,18 +4184,21 @@ a secret password store, an adblocker, and a modern UI.")
;; subsystem
;; FAIL
'(#:tests? #f
- #:configure-flags '("CFLAGS=-std=gnu99")))
+ #:glib-or-gtk? #t))
(propagated-inputs
`(("dconf" ,dconf)))
(native-inputs
- `(("intltool" ,intltool)
+ `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database
+ ("glib:bin" ,glib "bin") ; for glib-mkenums
+ ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache
+ ("intltool" ,intltool)
("itstool" ,itstool)
("pkg-config" ,pkg-config)
("xmllint" ,libxml2)))
(inputs
`(("avahi" ,avahi)
("gcr" ,gcr)
- ("gdk-pixbuf" ,gdk-pixbuf) ; for loading SVG files
+ ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) ; for loading SVG files
("glib-networking" ,glib-networking)
("gnome-desktop" ,gnome-desktop)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
@@ -4203,6 +4207,7 @@ a secret password store, an adblocker, and a modern UI.")
("libnotify" ,libnotify)
("libsecret" ,libsecret)
("libxslt" ,libxslt)
+ ("nettle" ,nettle) ; for hogweed
("sqlite" ,sqlite)
("webkitgtk" ,webkitgtk)))
(home-page "https://wiki.gnome.org/Apps/Web")
--
2.14.1