[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
123/135: gnu: colord: Update to 1.4.3.
From: |
guix-commits |
Subject: |
123/135: gnu: colord: Update to 1.4.3. |
Date: |
Fri, 21 Dec 2018 14:37:50 -0500 (EST) |
rekado pushed a commit to branch wip-gnome3.30
in repository guix.
commit 1af97a44e98568ae934d6ffca028b46afdaa43ad
Author: Ricardo Wurmus <address@hidden>
Date: Thu Dec 6 18:39:55 2018 +0100
gnu: colord: Update to 1.4.3.
* gnu/packages/gnome.scm (colord): Update to 1.4.3.
[build-system]: Use meson-build-system.
[arguments]: Add glib-or-gtk? flag; update configure flags; remove phase
"patch-/bin/true"; add phase "patch-build-system".
[native-inputs]: Add glib:bin and gtk-doc.
[inputs]: Add gusb and python-wrapper.
---
gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++----------------------
1 file changed, 28 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d5ba279..bf5c0f9 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2828,7 +2828,7 @@ keyboard shortcuts.")
(define-public colord
(package
(name "colord")
- (version "1.1.8")
+ (version "1.4.3")
(source
(origin
(method url-fetch)
@@ -2836,38 +2836,42 @@ keyboard shortcuts.")
name "-" version ".tar.xz"))
(sha256
(base32
- "01w97rgzk4qi6fp03scq5jyw0ayx11b479p7dkm2r77k84b9agph"))))
- (build-system glib-or-gtk-build-system)
+ "1xwxahg9mgmapc16xkb4kgmc40zpadrwav33xqmn6cgaw6g6d3ls"))))
+ (build-system meson-build-system)
(arguments
- '(;; The tests want to run valgrind. Punt for now.
+ '(;; FIXME: One test fails:
+ ;; /colord/icc-store (in lib/colord/colord-self-test-private):
+ ;; Incorrect content type for /tmp/colord-vkve/already-exists.icc, got
+ ;; application/x-zerosize
#:tests? #f
- #:configure-flags (list "--localstatedir=/var"
- ;; GUSB not packaged yet.
- "--disable-gusb"
+ #:glib-or-gtk? #t
+ #:configure-flags (list "-Dlocalstatedir=/var"
;; No dep on systemd.
- "--disable-systemd-login"
+ "-Dsystemd=false"
;; Wants to install to global completion dir;
;; punt.
- "--disable-bash-completion"
+ "-Dbash_completion=false"
;; colord-gtk not packaged yet.
- "--disable-session-example"
- "--with-daemon-user=colord"
- "--enable-sane"
- (string-append "--with-udevrulesdir="
- (assoc-ref %outputs "out")
- "/lib/udev/rules.d"))
+ "-Dsession_example=false"
+ "-Ddaemon_user=colord"
+ "-Dsane=true"
+ ;; Requires spotread
+ "-Dargyllcms_sensor=false"
+ ;; TODO: Requires docbook2x
+ "-Dman=false")
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'patch-/bin/true
- (lambda _
- (substitute* "configure"
- (("/bin/true") (which "true")))
- (substitute* "src/Makefile.in"
- (("if test -w \\$\\(DESTDIR\\)\\$\\(prefix\\)/;")
- "if test -w $(DESTDIR)$(localstatedir);")))))))
+ (add-before 'configure 'patch-build-system
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "rules/meson.build"
+ (("udev.get_pkgconfig_variable\\('udevdir'\\)")
+ (string-append "'" (assoc-ref outputs "out") "/lib/udev'")))
+ #t)))))
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("glib:bin" ,glib "bin") ; for glib-compile-resources, etc.
("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
("libtool" ,libtool)
("intltool" ,intltool)))
(propagated-inputs
@@ -2877,10 +2881,12 @@ keyboard shortcuts.")
("lcms" ,lcms)))
(inputs
`(("dbus-glib" ,dbus-glib)
+ ("gusb" ,gusb)
("libgudev" ,libgudev)
("libusb" ,libusb)
("sqlite" ,sqlite)
("polkit" ,polkit)
+ ("python" ,python-wrapper)
("sane-backends" ,sane-backends)))
(home-page "https://www.freedesktop.org/software/colord/")
(synopsis "Color management service")
- 57/135: gnu: gnome-screenshot: Update to 3.26.0., (continued)
- 57/135: gnu: gnome-screenshot: Update to 3.26.0., guix-commits, 2018/12/21
- 05/135: gnu: graphene: Remove custom autogen phase., guix-commits, 2018/12/21
- 98/135: gnu: gnome-mines: Update to 3.30.1.1., guix-commits, 2018/12/21
- 52/135: gnu: gnome-shell-extensions: Update to 3.28.1., guix-commits, 2018/12/21
- 78/135: gnu: gmime: Update to 3.2.3., guix-commits, 2018/12/21
- 72/135: gnu: gnome-shell: Update to 3.28.2., guix-commits, 2018/12/21
- 04/135: gnu: gtk-doc: Update to 1.28., guix-commits, 2018/12/21
- 34/135: gnu: libgnome-games-support: Update to 1.4.1., guix-commits, 2018/12/21
- 107/135: gnu: at-spi2-atk: Update to 2.30.0., guix-commits, 2018/12/21
- 99/135: gnu: gnome-sudoku: Update to 3.30.0., guix-commits, 2018/12/21
- 123/135: gnu: colord: Update to 1.4.3.,
guix-commits <=
- 109/135: gnu: gnome-system-monitor: Update to 3.30.0., guix-commits, 2018/12/21
- 82/135: gnu: glibmm: Update to 2.58.0., guix-commits, 2018/12/21
- 81/135: gnu: libsigc++: Update to 2.10.1., guix-commits, 2018/12/21
- 56/135: gnu: gnome-clocks: Update to 3.28.0., guix-commits, 2018/12/21
- 108/135: gnu: at-spi2-core: Update to 2.30.0., guix-commits, 2018/12/21
- 135/135: gnu: gtksourceview: Update to 4.0.3., guix-commits, 2018/12/21
- 115/135: gnu: network-manager: Update to 1.14.4., guix-commits, 2018/12/21
- 45/135: gnu: zenity: Update to 3.28.1., guix-commits, 2018/12/21
- 129/135: gnu: glib-networking: Update to 2.58.0., guix-commits, 2018/12/21
- 14/135: gnu: Add libusbmuxd., guix-commits, 2018/12/21