[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
173/277: gnu: geocode-glib: Update package definition.
From: |
guix-commits |
Subject: |
173/277: gnu: geocode-glib: Update package definition. |
Date: |
Thu, 6 Aug 2020 17:03:27 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit 019930d0a39f0a0492b8a1625644e23f55d8a1b0
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Tue Jul 21 04:29:16 2020 -0400
gnu: geocode-glib: Update package definition.
* gnu/packages/gnome.scm (geocode-glib) [version]: Update to 3.26.2.
[source]<origin>[sha256]: Modify base32.
[outputs]: New output "doc".
[arguments]<#:glib-or-gtk?>: New argument.
<#:configure-flags>[-D-Denable-installed-tests]: New flag.
<#:phases>['patch-docbook-xml]: New phase.
['move-doc]: New phase.
[native-inputs]: Add docbook-xml and python-wrapper. Remove json-glib.
[inputs]: Add json-glib.
[propagated-inputs]: Add glib-networking.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/gnome.scm | 72 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 48 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index e4f6908..0dfe9f1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4956,46 +4956,70 @@ possible.")
(define-public geocode-glib
(package
(name "geocode-glib")
- (version "3.26.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/geocode-glib/"
- (version-major+minor version) "/"
- "geocode-glib-" version ".tar.xz"))
- (sha256
- (base32
- "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"))))
+ (version "3.26.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "mirror://gnome/sources/geocode-glib/"
+ (version-major+minor version) "/"
+ "geocode-glib-" version ".tar.xz"))
+ (sha256
+ (base32 "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"))))
(build-system meson-build-system)
+ (outputs '("out" "doc"))
(arguments
- `(#:phases
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
+ #:configure-flags
+ (list
+ "-Denable-installed-tests=false")
+ #:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (substitute* "geocode-glib-docs.xml"
+ (("http://www.oasis-open.org/docbook/xml/4.3/")
+ (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook/"))))
+ #t))
;; The tests require a bunch of locales.
(add-before 'check 'set-locales
(lambda* (#:key inputs #:allow-other-keys)
(setenv "GUIX_LOCPATH"
(string-append (assoc-ref inputs "glibc-locales")
"/lib/locale"))
- #t)))))
+ #t))
+ (add-after 'install 'move-doc
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (rename-file
+ (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ #t))))))
(native-inputs
- `(("glib:bin" ,glib "bin") ; for glib-mkenums
- ("glibc-locales" ,glibc-locales) ; for tests
+ `(("docbook-xml" ,docbook-xml-4.3)
("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("glibc-locales" ,glibc-locales)
("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc)
("pkg-config" ,pkg-config)
- ("json-glib" ,json-glib)))
- (propagated-inputs
- ;; geocode-glib-1.0.pc refers to GIO.
- `(("glib" ,glib)))
+ ("python" ,python-wrapper)))
(inputs
- `(("libsoup" ,libsoup)))
- (home-page "https://github.com/GNOME/geocode-glib/")
+ `(("json-glib" ,json-glib)
+ ("libsoup" ,libsoup)))
+ (propagated-inputs
+ `(("glib" ,glib)
+ ("glib-networking" ,glib-networking)))
(synopsis "Geocoding and reverse-geocoding library")
- (description
- "geocode-glib is a convenience library for geocoding (finding longitude,
-and latitude from an address) and reverse geocoding (finding an address from
-coordinates) using the Nominatim service. geocode-glib caches requests for
-faster results and to avoid unnecessary server load.")
+ (description "Geocode-Glib is a convenience library for geocoding (finding
+longitude, and latitude from an address) and reverse geocoding (finding an
+address from coordinates) using the Nominatim service. It also caches requests
+for faster results and to avoid unnecessary server load.")
+ (home-page "https://developer.gnome.org/geocode-glib/")
(license license:lgpl2.0+)))
(define-public upower
- 160/277: gnu: gtksourceviewmm: Update package definition., (continued)
- 160/277: gnu: gtksourceviewmm: Update package definition., guix-commits, 2020/08/06
- 122/277: gnu: Add rust-xml5ever@0.16.1., guix-commits, 2020/08/06
- 135/277: gnu: wpebackend-fdo: Update package definition., guix-commits, 2020/08/06
- 141/277: gnu: webkitgtk: Update package definition., guix-commits, 2020/08/06
- 144/277: gnu: yelp: Update package definition., guix-commits, 2020/08/06
- 155/277: gnu: pangomm: Update package definition., guix-commits, 2020/08/06
- 161/277: gnu: gobject-introspection: Propagate glib., guix-commits, 2020/08/06
- 165/277: gnu: Add gtx., guix-commits, 2020/08/06
- 167/277: gnu: Add zeitgeist., guix-commits, 2020/08/06
- 170/277: gnu: Add mmm., guix-commits, 2020/08/06
- 173/277: gnu: geocode-glib: Update package definition.,
guix-commits <=
- 174/277: gnu: gexiv2: Update package definition., guix-commits, 2020/08/06
- 140/277: gnu: pipewire: Update package definition., guix-commits, 2020/08/06
- 143/277: gnu: yelp-tools: Update package definition., guix-commits, 2020/08/06
- 145/277: gnu: zenity: Update package definition., guix-commits, 2020/08/06
- 163/277: gnu: babl: Update package definition., guix-commits, 2020/08/06
- 148/277: gnu: libsigc++: Update package definition., guix-commits, 2020/08/06
- 149/277: gnu: Add libsigc++-2., guix-commits, 2020/08/06
- 164/277: gnu: evolution-data-server: Update package definition., guix-commits, 2020/08/06
- 166/277: gnu: Add dee., guix-commits, 2020/08/06
- 168/277: gnu: folks: Update package definition., guix-commits, 2020/08/06