nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: appstream-glib: Update to 0.7.4. 

* gnu/packages/glib.scm (appstream-glib): Update to 0.7.4.
[build-system]: Switch to meson-build-system.
[native-inputs]: Add gettext and glib:bin.
[inputs]: Add gcab, gperf, and libyaml.  Remove nettle.
[arguments]: Adapt #:configure-flags to new build system.
Patch fewer tests in ‘patch-tests’ phase.
This commit is contained in:
Tobias Geerinckx-Rice 2018-01-19 02:52:24 +01:00
parent cb3909256d
commit 318bc42946
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gnu/packages/glib.scm
View File

@ -7,6 +7,7 @@
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org> ;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch> ;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -35,19 +36,23 @@
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
#:use-module (gnu packages nettle) #:use-module (gnu packages nettle)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages package-management)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages perl-check) #:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages web)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix download) #:use-module (guix download)
@ -714,7 +719,7 @@ programming langauage. It also contains the utility
(define-public appstream-glib (define-public appstream-glib
(package (package
(name "appstream-glib") (name "appstream-glib")
(version "0.6.7") (version "0.7.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://people.freedesktop.org/~hughsient/" (uri (string-append "https://people.freedesktop.org/~hughsient/"
@ -722,30 +727,35 @@ programming langauage. It also contains the utility
"appstream-glib-" version ".tar.xz")) "appstream-glib-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"08mrf4k0jhnpdd4fig2grmi2vbxkgdhrwk0d0zq0j1wp5ip7arwp")))) "09f8lq8nkr3gaws7fc3pzyz12lhz771l1p7lv8ni8z1gi470r7d0"))))
(build-system gnu-build-system) (build-system meson-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-compile-resources
("pkg-config" ,pkg-config)))
(inputs (inputs
`(("gdk-pixbuf" ,gdk-pixbuf) `(("gdk-pixbuf" ,gdk-pixbuf)
("gcab" ,gcab)
("glib" ,glib) ("glib" ,glib)
("gperf" ,gperf)
("gtk+" ,gtk+) ("gtk+" ,gtk+)
("json-glib" ,json-glib) ("json-glib" ,json-glib)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
("libsoup" ,libsoup) ("libsoup" ,libsoup)
("nettle" ,nettle) ("libyaml" ,libyaml)
("util-linux" ,util-linux))) ("util-linux" ,util-linux))) ; for libuuid
(arguments (arguments
`(#:configure-flags `(#:configure-flags
'("--disable-firmware" "--disable-dep11") (list "-Denable-dep11=false"
"-Denable-introspection=false" ; avoid g-ir-scanner dependency
"-Denable-rpm=false"
"-Denable-stemmer=false")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-tests (add-after 'unpack 'patch-tests
(lambda _ (lambda _
(substitute* "libappstream-glib/as-self-test.c" (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);") ""))
(("g_test_add_func.*as_test_store_speed_appdata_func);") "")
(("g_test_add_func.*as_test_store_speed_desktop_func);") ""))
#t))))) #t)))))
(home-page "https://github.com/hughsie/appstream-glib") (home-page "https://github.com/hughsie/appstream-glib")
(synopsis "Library for reading and writing AppStream metadata") (synopsis "Library for reading and writing AppStream metadata")