gnu: gnome-maps: Update to 43.rc.
* gnu/packages/geo.scm (gnome-maps): Update to 43.rc.
[arguments]: Use gexps.
[phases]{patch-dbus-service}: Use #$output.
{wrap}: Do not wrap with LD_LIBRARY_PATH, which now seems extraneous. Delete
trailing #t.
[native-inputs]: Add glib:bin. Remove labels.
[inputs]: Remove labels and sort. Add pango-next. Replace
libchamplain with libshumate, rest with rest-next, webkitgtk-with-libsoup2
with webkitgtk and libsoup-minimal-2 with libsoup.
master
Maxim Cournoyer
parent
ab754956c1
commit
028b60a985
|
|
@ -254,7 +254,7 @@ topology functions.")
|
||||||
(define-public gnome-maps
|
(define-public gnome-maps
|
||||||
(package
|
(package
|
||||||
(name "gnome-maps")
|
(name "gnome-maps")
|
||||||
(version "42.2")
|
(version "43.rc") ;for libsoup 3 support
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnome/sources/" name "/"
|
(uri (string-append "mirror://gnome/sources/" name "/"
|
||||||
|
|
@ -262,77 +262,56 @@ topology functions.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1cb9s2zz1zib3f33c035lmgshpl679isbzdd3alrx4yclw61nvay"))))
|
"16a3j896fwxgnvrmx27jnrvhxzh3v22paaq87ad57yp8wkq946il"))))
|
||||||
(build-system meson-build-system)
|
(build-system meson-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:glib-or-gtk? #t
|
(list
|
||||||
#:phases
|
#:glib-or-gtk? #t
|
||||||
(modify-phases %standard-phases
|
#:phases
|
||||||
(add-after 'unpack 'skip-gtk-update-icon-cache
|
#~(modify-phases %standard-phases
|
||||||
;; Don't create 'icon-theme.cache'.
|
(add-after 'unpack 'skip-gtk-update-icon-cache
|
||||||
(lambda _
|
;; Don't create 'icon-theme.cache'.
|
||||||
(substitute* "meson_post_install.py"
|
(lambda _
|
||||||
(("gtk-update-icon-cache") "true"))))
|
(substitute* "meson_post_install.py"
|
||||||
(add-after 'unpack 'patch-dbus-service
|
(("gtk-update-icon-cache") "true"))))
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(add-after 'unpack 'patch-dbus-service
|
||||||
(substitute* "data/org.gnome.Maps.service.in"
|
(lambda _
|
||||||
(("@pkgdatadir@/org.gnome.Maps")
|
(substitute* "data/org.gnome.Maps.service.in"
|
||||||
(string-append (assoc-ref outputs "out")
|
(("@pkgdatadir@/org.gnome.Maps")
|
||||||
"/bin/gnome-maps")))))
|
(string-append #$output "/bin/gnome-maps")))))
|
||||||
(add-after 'install 'wrap
|
(add-after 'install 'wrap
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(lambda _
|
||||||
(let ((out (assoc-ref outputs "out"))
|
(wrap-program (string-append #$output "/bin/gnome-maps")
|
||||||
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
|
`("GI_TYPELIB_PATH" ":" prefix (,(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"))
|
|
||||||
(gdk-pixbuf-path (string-append
|
|
||||||
(assoc-ref inputs "gdk-pixbuf")
|
|
||||||
"/lib"))
|
|
||||||
(webkitgtk-path (string-append
|
|
||||||
(assoc-ref inputs "webkitgtk")
|
|
||||||
"/lib")))
|
|
||||||
(wrap-program (string-append out "/bin/gnome-maps")
|
|
||||||
`("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,
|
|
||||||
;; libgdk_pixbuf-2.0.so, libjavascriptcoregtk-4.0.so.18, and
|
|
||||||
;; libgeocode-glib.so.0
|
|
||||||
`("LD_LIBRARY_PATH" ":" prefix (,goa-path
|
|
||||||
,webkitgtk-path
|
|
||||||
,gdk-pixbuf-path
|
|
||||||
,geocode-glib-path)))
|
|
||||||
#t))))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("gettext" ,gettext-minimal)
|
(list gettext-minimal
|
||||||
("gobject-introspection" ,gobject-introspection)
|
`(,glib "bin")
|
||||||
("pkg-config" ,pkg-config)))
|
gobject-introspection
|
||||||
|
pkg-config))
|
||||||
(inputs
|
(inputs
|
||||||
`(("evolution-data-server" ,evolution-data-server)
|
(list folks
|
||||||
("folks" ,folks)
|
evolution-data-server
|
||||||
("libchamplain" ,libchamplain)
|
geoclue
|
||||||
("libgee" ,libgee)
|
geocode-glib
|
||||||
("libhandy" ,libhandy)
|
gfbgraph
|
||||||
("libsecret" ,libsecret)
|
gjs
|
||||||
("libsoup" ,libsoup-minimal-2)
|
glib
|
||||||
("libgweather" ,libgweather4)
|
glib-networking
|
||||||
("libxml2" ,libxml2)
|
gnome-online-accounts
|
||||||
("librsvg" ,librsvg)
|
gsettings-desktop-schemas
|
||||||
("glib-networking" ,glib-networking)
|
gtk+
|
||||||
("geoclue" ,geoclue)
|
libadwaita
|
||||||
("geocode-glib" ,geocode-glib)
|
libgee
|
||||||
("gfbgraph" ,gfbgraph)
|
libgweather4
|
||||||
("gjs" ,gjs)
|
libhandy
|
||||||
("glib" ,glib)
|
librsvg
|
||||||
("gnome-online-accounts" ,gnome-online-accounts)
|
libsecret
|
||||||
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
|
libshumate
|
||||||
("gtk+" ,gtk+)
|
libsoup
|
||||||
("rest" ,rest)
|
libxml2
|
||||||
("webkitgtk" ,webkitgtk-with-libsoup2)))
|
pango-next ;TODO: remove when it's the default
|
||||||
|
rest-next
|
||||||
|
webkitgtk))
|
||||||
(synopsis "Graphical map viewer and wayfinding program")
|
(synopsis "Graphical map viewer and wayfinding program")
|
||||||
(description "GNOME Maps is a graphical map viewer. It uses map data from
|
(description "GNOME Maps is a graphical map viewer. It uses map data from
|
||||||
the OpenStreetMap project. It can provide directions for walking, bicycling,
|
the OpenStreetMap project. It can provide directions for walking, bicycling,
|
||||||
|
|
|
||||||
Reference in New Issue