[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/44: gnu: appstream-glib: Update package definition.
From: |
guix-commits |
Subject: |
10/44: gnu: appstream-glib: Update package definition. |
Date: |
Thu, 25 Jun 2020 08:20:49 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit eaf87d946a3f212e47805221bb3ab3b3d3d1e5d4
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Thu May 28 10:08:58 2020 -0400
gnu: appstream-glib: Update package definition.
* gnu/packages/glib.scm (appstream-glib)[outputs]: New output 'doc'.
[arguments]<#:glib-or-gtk?>: New argument.
[arguments]<#:configure-flags>[-Dgtk-doc]: New flag.
[-Dintrospection]: Remove flag.
[arguments]<#:phases>['move-doc]: New phase.
['patch-docbook-xml]: New phase.
[native-inputs]: Add docbook-xml, docbook-xsl, gobject-introspection
and gtk-doc.
[inputs]: Add fontconfig, freetype and libxslt. Remove glib and
libarchive.
[propagated-inputs]: Add glib and libarchive. Remove gcab.
[description]: Modify.
[home-page]: Modify.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/packages/glib.scm | 96 +++++++++++++++++++++++++++++++++------------------
1 file changed, 63 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 4835c84..e6e9d00 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -41,6 +41,7 @@
#:use-module (gnu packages enlightenment)
#:use-module (gnu packages file)
#:use-module (gnu packages flex)
+ #:use-module (gnu packages fontutils)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gperf)
@@ -918,48 +919,77 @@ programming language. It also contains the utility
(package
(name "appstream-glib")
(version "0.7.17")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://people.freedesktop.org/~hughsient/"
- "appstream-glib/releases/"
- "appstream-glib-" version ".tar.xz"))
- (sha256
- (base32
- "0jg58m1p5xfrh8zkpqhhg00nqs727z5i1qy6sb0a3vyc98fyk9vw"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri
+ (string-append "https://people.freedesktop.org/~hughsient/"
+ "appstream-glib/releases/"
+ "appstream-glib-" version ".tar.xz"))
+ (sha256
+ (base32 "0jg58m1p5xfrh8zkpqhhg00nqs727z5i1qy6sb0a3vyc98fyk9vw"))))
(build-system meson-build-system)
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin") ; for glib-compile-resources
- ("pkg-config" ,pkg-config)))
- (propagated-inputs
- `(("gcab" ,gcab) ; for .pc file
- ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file
- ("libuuid" ,util-linux "lib"))) ; for .pc file
- (inputs
- `(("glib" ,glib)
- ("gperf" ,gperf)
- ("gtk+" ,gtk+)
- ("json-glib" ,json-glib)
- ("libarchive" ,libarchive)
- ("libsoup" ,libsoup)))
+ (outputs '("out" "doc"))
(arguments
- `(#:configure-flags
- (list "-Ddep11=false"
- "-Dintrospection=false" ; avoid g-ir-scanner dependency
- "-Drpm=false"
- "-Dstemmer=false")
+ `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas.
+ #:configure-flags
+ (list
+ "-Dgtk-doc=true"
+ "-Ddep11=false"
+ "-Drpm=false"
+ "-Dstemmer=false")
#:phases
(modify-phases %standard-phases
+ (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)))
+ (add-after 'unpack 'patch-docbook-xml
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
+ "/xml/dtd/docbook")))
+ (substitute* "docs/api/appstream-glib-docs.xml"
+ (("http://.*/docbookx\\.dtd")
+ (string-append xmldoc "/docbookx.dtd")))
+ #t)))
(add-after 'unpack 'patch-tests
(lambda _
(substitute* "libappstream-glib/as-self-test.c"
- (("g_test_add_func.*as_test_store_local_appdata_func);") ""))
+ (("g_test_add_func.*as_test_store_local_appdata_func);")
+ ""))
#t)))))
- (home-page "https://github.com/hughsie/appstream-glib")
+ (native-inputs
+ `(("docbook-xml" ,docbook-xml-4.2)
+ ("docbook-xsl" ,docbook-xsl)
+ ("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("gperf" ,gperf)
+ ("gtk+" ,gtk+)
+ ("json-glib" ,json-glib)
+ ("libsoup" ,libsoup)
+ ("libxslt" ,libxslt)))
+ (propagated-inputs
+ `(("glib" ,glib)
+ ("gdk-pixbuf" ,gdk-pixbuf)
+ ("libarchive" ,libarchive)
+ ("libuuid" ,util-linux "lib")))
(synopsis "Library for reading and writing AppStream metadata")
- (description "This library provides objects and helper methods to help
-reading and writing
@uref{https://www.freedesktop.org/wiki/Distributions/AppStream,AppStream}
-metadata.")
+ (description "AppStream-Glib provides objects and helper methods to help
+reading and writing AppStream metadata. It also provides a simple DOM
+implementation that makes it easy to edit nodes and convert to and from the
+standardized XML representation.")
+ (home-page "https://people.freedesktop.org/~hughsient/appstream-glib/")
(license license:lgpl2.1+)))
(define perl-net-dbus
- 08/44: gnu: Add gnome-photos., (continued)
- 08/44: gnu: Add gnome-photos., guix-commits, 2020/06/25
- 09/44: gnu: adwaita-icon-theme: Update to 3.36.1., guix-commits, 2020/06/25
- 12/44: gnu: at-spi2-atk: Update to 2.34.2., guix-commits, 2020/06/25
- 13/44: gnu: atk: Update to 2.36.0., guix-commits, 2020/06/25
- 21/44: gnu: catch-framework2: Update to 2.3.0., guix-commits, 2020/06/25
- 22/44: gnu: Add ronn., guix-commits, 2020/06/25
- 17/44: gnu: clutter-gtk: Update package definition., guix-commits, 2020/06/25
- 23/44: gnu: Add nuspell., guix-commits, 2020/06/25
- 24/44: gnu: enchant-1.6: Update package definition., guix-commits, 2020/06/25
- 25/44: gnu: enchant: Update package definition., guix-commits, 2020/06/25
- 10/44: gnu: appstream-glib: Update package definition.,
guix-commits <=
- 34/44: gnu: gjs: Update to 1.58.8., guix-commits, 2020/06/25
- 36/44: gnu: Add mutest., guix-commits, 2020/06/25
- 38/44: gnu: gsettings-desktop-schemas: Update package definition., guix-commits, 2020/06/25
- 37/44: gnu: graphene: Update package definition., guix-commits, 2020/06/25
- 27/44: gnu: fcitx: Update package definition., guix-commits, 2020/06/25
- 29/44: gnu: gcr: Update to 3.36.0., guix-commits, 2020/06/25
- 32/44: gnu: geoclue: Update to 2.5.6., guix-commits, 2020/06/25
- 39/44: gnu: Add esound., guix-commits, 2020/06/25
- 35/44: gnu: glib-networking: Update to 2.62.4., guix-commits, 2020/06/25
- 41/44: gnu: glib: Update package definition., guix-commits, 2020/06/25