[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
132/133: gnu: gnome-maps: Update to 3.30.2.1.
From: |
guix-commits |
Subject: |
132/133: gnu: gnome-maps: Update to 3.30.2.1. |
Date: |
Sun, 6 Jan 2019 16:59:53 -0500 (EST) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit d26612616479cee0081d455459c2273c29d44a93
Author: Ricardo Wurmus <address@hidden>
Date: Thu Dec 6 23:26:25 2018 +0100
gnu: gnome-maps: Update to 3.30.2.1.
* gnu/packages/geo.scm (gnome-maps): Update to 3.30.2.1.
[build-system]: Use meson-build-system.
[arguments]: Remove configure flags; set glib-or-gtk? flag; update "wrap"
phase.
[native-inputs]: Add gtk+:bin.
---
gnu/packages/geo.scm | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 675c851..63ee5e3 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -28,6 +28,7 @@
#:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system gnu)
#:use-module (guix build-system go)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix build-system scons)
#:use-module (guix build-system r)
@@ -99,7 +100,7 @@ topology functions.")
(define-public gnome-maps
(package
(name "gnome-maps")
- (version "3.28.2")
+ (version "3.30.2.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -107,20 +108,19 @@ topology functions.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7"))))
- (build-system glib-or-gtk-build-system)
+ "01hqv36j5ji0djq4vl151113bqhh4hpz72d88fm8zds4pdlx7l57"))))
+ (build-system meson-build-system)
(arguments
- `(#:configure-flags ;; Ensure that geoclue is referred to by output.
- (list (string-append "LDFLAGS=-L"
- (assoc-ref %build-inputs "geoclue") "/lib")
- (string-append "CFLAGS=-I"
- (assoc-ref %build-inputs "geoclue") "/include"))
+ `(#:glib-or-gtk? #t
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
+ (geocode-glib-path (string-append
+ (assoc-ref inputs "geocode-glib")
+ "/lib"))
(goa-path (string-append
(assoc-ref inputs "gnome-online-accounts")
"/lib"))
@@ -131,12 +131,15 @@ topology functions.")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
;; There seems to be no way to embed the path of
- ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37 and
- ;; libjavascriptcoregtk-4.0.so.18.
- `("LD_LIBRARY_PATH" ":" prefix (,goa-path ,webkitgtk-path)))
+ ;; libgoa-1.0.so.0, libwebkit2gtk-4.0.so.37,
+ ;; libjavascriptcoregtk-4.0.so.18, and libgeocode-glib.so.0
+ `("LD_LIBRARY_PATH" ":" prefix (,goa-path
+ ,webkitgtk-path
+ ,geocode-glib-path)))
#t))))))
(native-inputs
- `(("gobject-introspection" ,gobject-introspection)
+ `(("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache
+ ("gobject-introspection" ,gobject-introspection)
("intltool" ,intltool)
("pkg-config" ,pkg-config)))
(inputs
- 104/133: gnu: pangomm: Update to 2.42.0., (continued)
- 104/133: gnu: pangomm: Update to 2.42.0., guix-commits, 2019/01/06
- 98/133: gnu: json-glib: Update to 1.4.4., guix-commits, 2019/01/06
- 106/133: gnu: at-spi2-core: Update to 2.30.0., guix-commits, 2019/01/06
- 112/133: gnu: gnome-settings-daemon: Update to 3.30.1.2., guix-commits, 2019/01/06
- 110/133: gnu: gdm: Update to 3.30.2., guix-commits, 2019/01/06
- 128/133: gnu: libgnome-games-support: Update to 1.4.2., guix-commits, 2019/01/06
- 118/133: gnu: gvfs: Update to 1.38.1., guix-commits, 2019/01/06
- 127/133: gnu: glib-networking: Update to 2.58.0., guix-commits, 2019/01/06
- 121/133: gnu: colord: Update to 1.4.3., guix-commits, 2019/01/06
- 133/133: gnu: gtksourceview: Update to 4.0.3., guix-commits, 2019/01/06
- 132/133: gnu: gnome-maps: Update to 3.30.2.1.,
guix-commits <=
- 130/133: gnu: evolution-data-server: Update to 3.30.2., guix-commits, 2019/01/06
- 115/133: gnu: libdazzle: Update to 3.30.2., guix-commits, 2019/01/06
- 131/133: gnu: gnome-online-accounts: Update to 3.30.0., guix-commits, 2019/01/06
- 119/133: gnu: nautilus: Update to 3.30.4., guix-commits, 2019/01/06
- 116/133: gnu: libgdata: Update to 0.17.9., guix-commits, 2019/01/06