* [bug#30167] [PATCH 2/3] gnu: Add msitools.
2018-01-19 1:52 ` [bug#30167] [PATCH 1/3] gnu: Add gcab Tobias Geerinckx-Rice
@ 2018-01-19 1:52 ` Tobias Geerinckx-Rice
2018-01-19 1:52 ` [bug#30167] [PATCH 3/3] gnu: appstream-glib: Update to 0.7.4 Tobias Geerinckx-Rice
1 sibling, 0 replies; 5+ messages in thread
From: Tobias Geerinckx-Rice @ 2018-01-19 1:52 UTC (permalink / raw)
To: 30167
* gnu/packages/package-management.scm (msitools): New public variable.
---
gnu/packages/package-management.scm | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 252f055a2..4b933521b 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -35,10 +35,12 @@
#:use-module (gnu packages file)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages guile)
+ #:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages man)
#:use-module (gnu packages nettle)
@@ -56,6 +58,7 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages vim)
#:use-module (gnu packages web)
+ #:use-module (gnu packages xml)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
@@ -830,3 +833,31 @@ on top of GNU Guix.")
Microsoft cabinet (.@dfn{CAB}) files.")
(license (list license:gpl2+ ; tests/testsuite.at
license:lgpl2.1+)))) ; the rest
+
+(define-public msitools
+ (package
+ (name "msitools")
+ (version "0.97")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ version "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
+ (inputs
+ `(("gcab" ,gcab)
+ ("glib" ,glib)
+ ("libgsf" ,libgsf)
+ ("libxml2" ,libxml2)
+ ("uuid" ,util-linux)))
+ (home-page "https://wiki.gnome.org/msitools")
+ (synopsis "Windows Installer file manipulation tool")
+ (description
+ "msitools is a collection of command-line tools to inspect, extract, build,
+and sign Windows@tie{}Installer (.@dfn{MSI}) files. It aims to be a solution
+for packaging and deployment of cross-compiled Windows applications.")
+ (license license:lgpl2.1+)))
--
2.15.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [bug#30167] [PATCH 3/3] gnu: appstream-glib: Update to 0.7.4.
2018-01-19 1:52 ` [bug#30167] [PATCH 1/3] gnu: Add gcab Tobias Geerinckx-Rice
2018-01-19 1:52 ` [bug#30167] [PATCH 2/3] gnu: Add msitools Tobias Geerinckx-Rice
@ 2018-01-19 1:52 ` Tobias Geerinckx-Rice
1 sibling, 0 replies; 5+ messages in thread
From: Tobias Geerinckx-Rice @ 2018-01-19 1:52 UTC (permalink / raw)
To: 30167
* 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.
---
gnu/packages/glib.scm | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b3d7da166..96d9410cf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,19 +36,23 @@
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
+ #:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages m4)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pcre)
+ #:use-module (gnu packages package-management)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix download)
@@ -714,7 +719,7 @@ programming langauage. It also contains the utility
(define-public appstream-glib
(package
(name "appstream-glib")
- (version "0.6.7")
+ (version "0.7.4")
(source (origin
(method url-fetch)
(uri (string-append "https://people.freedesktop.org/~hughsient/"
@@ -722,30 +727,35 @@ programming langauage. It also contains the utility
"appstream-glib-" version ".tar.xz"))
(sha256
(base32
- "08mrf4k0jhnpdd4fig2grmi2vbxkgdhrwk0d0zq0j1wp5ip7arwp"))))
- (build-system gnu-build-system)
+ "09f8lq8nkr3gaws7fc3pzyz12lhz771l1p7lv8ni8z1gi470r7d0"))))
+ (build-system meson-build-system)
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("gettext" ,gettext-minimal)
+ ("glib:bin" ,glib "bin") ; for glib-compile-resources
+ ("pkg-config" ,pkg-config)))
(inputs
`(("gdk-pixbuf" ,gdk-pixbuf)
+ ("gcab" ,gcab)
("glib" ,glib)
+ ("gperf" ,gperf)
("gtk+" ,gtk+)
("json-glib" ,json-glib)
("libarchive" ,libarchive)
("libsoup" ,libsoup)
- ("nettle" ,nettle)
- ("util-linux" ,util-linux)))
+ ("libyaml" ,libyaml)
+ ("util-linux" ,util-linux))) ; for libuuid
(arguments
`(#: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
(modify-phases %standard-phases
(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_speed_appdata_func);") "")
- (("g_test_add_func.*as_test_store_speed_desktop_func);") ""))
+ (("g_test_add_func.*as_test_store_local_appdata_func);") ""))
#t)))))
(home-page "https://github.com/hughsie/appstream-glib")
(synopsis "Library for reading and writing AppStream metadata")
--
2.15.0
^ permalink raw reply related [flat|nested] 5+ messages in thread