Update colord to 0.1.32.

Misc files/patch-* obtained from OpenBSD ports.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18379 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 413 insertions, 50 deletions

diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 5a4c2b47d..d56cc4951 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -1,46 +1,51 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#    $MCom$
+#    $MCom: ports/graphics/colord/Makefile,v 1.10 2012/12/17 23:50:40 kwm Exp $
 
 PORTNAME=	colord
-PORTVERSION=	0.1.20
-PORTREVISION=	1
+PORTVERSION=	0.1.32
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.freedesktop.org/software/colord/releases/
 
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Manage color profiles to accurately color input/output devices
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		vala-vapigen>=0.13.0:${PORTSDIR}/lang/vala-vapigen
-LIB_DEPENDS=	polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit \
-		dbus-1.3:${PORTSDIR}/devel/dbus \
-		lcms2.2:${PORTSDIR}/graphics/lcms2
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit \
+		dbus-1:${PORTSDIR}/devel/dbus \
+		lcms2:${PORTSDIR}/graphics/lcms2
+
+USERS=		colord
+GROUPS=		colord
 
 USE_XZ=		yes
-USE_GNOME=	gnomehier gnomehack glib20 intlhack
+USES=		pathfix
+USE_GNOME=	gnomehier glib20 intlhack
+USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_SQLITE=	yes
+USE_SQLITE=	3
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ARGS=	--disable-gudev --enable-gtk-doc-html=no --disable-gtk
+CONFIGURE_ARGS=	--disable-gudev \
+		--enable-gtk-doc-html=no \
+		--disable-gusb \
+		--disable-sane \
+		--with-daemon-user=colord \
+		--disable-systemd-login
+# takes ages we don't want to wait.
+CONFIGURE_ARGS+=--disable-print-profiles
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	USB_CFLAGS="-I/usr/include" \
 		USB_LIBS="-L/usr/lib -lusb"
 
-OPTIONS_DEFINE=	SANE MANPAGES
+GLIB_SCHEMAS=	org.freedesktop.ColorHelper.gschema.xml
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	MANPAGES
 
-.if ${PORT_OPTIONS:MSANE}
-CONFIGURE_ARGS+=--disable-sane
-.else
-CONFGIURE_ARGS+=--enable-sane=yes
-LIB_DEPENDS+=	sane.1:${PORTSDIR}/graphics/sane-backends
-.endif
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
@@ -56,7 +61,12 @@ post-patch:
 		-e 's|-Wmissing-parameter-type||g' \
 		-e 's|LIBS="-lusb-1.0|LIBS="-lusb|g' \
 		${WRKSRC}/configure
-.if empty(PORT_OPTIONS:MMANPAGES}
+	@${REINPLACE_CMD} -e 's|lib/color|db/color|g' \
+		-e 's|/usr/share/color|${PREFIX}/share/color|g' \
+		${WRKSRC}/src/cd-main.c \
+		${WRKSRC}/src/cd-profile-store.c \
+		${WRKSRC}/src/cd-profile.c
+.if ! ${PORT_OPTIONS:MMANPAGES}
 	@${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \
 		s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure
 .endif
diff --git a/graphics/colord/distinfo b/graphics/colord/distinfo
index 2db4de59d..e48244e8f 100644
--- a/graphics/colord/distinfo
+++ b/graphics/colord/distinfo
@@ -1,2 +1,2 @@
-SHA256 (colord-0.1.20.tar.xz) = 45d6e7e73c9eab9f3f3c0eec8d008fd96c147333aeb4a77a2c2695657e48ae58
-SIZE (colord-0.1.20.tar.xz) = 551408
+SHA256 (colord-0.1.32.tar.xz) = c7034a8f21948d4458c63f4cf5fd70ee6caab508ce08f33a9752b0f0099cabea
+SIZE (colord-0.1.32.tar.xz) = 992544
diff --git a/graphics/colord/files/patch-Makefile.in b/graphics/colord/files/patch-Makefile.in
index 8adde6874..262c61c66 100644
--- a/graphics/colord/files/patch-Makefile.in
+++ b/graphics/colord/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	2012-05-15 23:46:55.000000000 +0200
-+++ Makefile.in	2012-05-15 23:47:27.000000000 +0200
-@@ -329,7 +329,7 @@
- # this needs libcolord and libcolord-gtk
- 
+--- Makefile.in.orig	2013-03-29 15:05:15.000000000 +0000
++++ Makefile.in	2013-03-29 15:06:06.000000000 +0000
+@@ -387,7 +387,7 @@
  # this needs client/cd-create-profile
--SUBDIRS = etc policy man libcolord rules po $(am__append_1) client \
-+SUBDIRS = etc policy man libcolord po $(am__append_1) client \
- 	contrib doc examples src data
+ 
+ # this needs data/profiles/*.icc
+-SUBDIRS = etc policy man lib rules po client contrib doc examples data \
++SUBDIRS = etc policy man lib po client contrib doc examples data \
+ 	src
  DISTCHECK_CONFIGURE_FLAGS = \
  	--enable-introspection				\
diff --git a/graphics/colord/files/patch-client_Makefile.in b/graphics/colord/files/patch-client_Makefile.in
deleted file mode 100644
index 4c832e9f1..000000000
--- a/graphics/colord/files/patch-client_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- client/Makefile.in.orig	2012-05-16 20:35:37.000000000 +0200
-+++ client/Makefile.in	2012-05-16 20:35:57.000000000 +0200
-@@ -36,8 +36,8 @@
- POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
--bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \
--	cd-fix-profile$(EXEEXT)
-+@HAVE_GTK_TRUE@bin_PROGRAMS = colormgr$(EXEEXT) cd-create-profile$(EXEEXT) \
-+@HAVE_GTK_TRUE@	cd-fix-profile$(EXEEXT)
- @HAVE_GTK_TRUE@noinst_PROGRAMS = colord-convert$(EXEEXT)
- subdir = client
- DIST_COMMON = $(dist_bashcompletion_DATA) $(srcdir)/Makefile.am \
diff --git a/graphics/colord/files/patch-client_cd-create-profile_c b/graphics/colord/files/patch-client_cd-create-profile_c
new file mode 100644
index 000000000..bc05b3726
--- /dev/null
+++ b/graphics/colord/files/patch-client_cd-create-profile_c
@@ -0,0 +1,70 @@
+$OpenBSD: patch-client_cd-create-profile_c,v 1.1 2013/03/31 19:41:23 ajacoutot Exp $
+
+FIXED upstream (not committed just yet)
+cd-create-profile.c:326: warning: declaration of 'tgamma' shadows a global declaration
+/usr/include/math.h:201: warning: shadowed declaration is here
+cd-create-profile.c:460: warning: declaration of 'gamma' shadows a global declaration
+/usr/include/math.h:238: warning: shadowed declaration is here
+
+--- client/cd-create-profile.c.orig	Sun Mar 31 12:28:09 2013
++++ client/cd-create-profile.c	Sun Mar 31 12:29:36 2013
+@@ -323,7 +323,7 @@ cd_util_create_standard_space (CdUtilPrivate *priv,
+ 	const GNode *tmp;
+ 	gboolean ret;
+ 	gchar *endptr = NULL;
+-	gdouble tgamma;
++	gdouble cd_tgamma;
+ 
+ 	/* parse gamma */
+ 	tmp = cd_dom_get_node (dom, root, "gamma");
+@@ -346,7 +346,7 @@ cd_util_create_standard_space (CdUtilPrivate *priv,
+ 		transfer[1] = transfer[0];
+ 		transfer[2] = transfer[0];
+ 	} else {
+-		tgamma = g_ascii_strtod (data, &endptr);
++		cd_tgamma = g_ascii_strtod (data, &endptr);
+ 		if (endptr != NULL && endptr[0] != '\0') {
+ 			ret = FALSE;
+ 			g_set_error (error, 1, 0,
+@@ -354,7 +354,7 @@ cd_util_create_standard_space (CdUtilPrivate *priv,
+ 				     data);
+ 			goto out;
+ 		}
+-		transfer[0] = cmsBuildGamma (NULL, tgamma);
++		transfer[0] = cmsBuildGamma (NULL, cd_tgamma);
+ 		transfer[1] = transfer[0];
+ 		transfer[2] = transfer[0];
+ 	}
+@@ -457,7 +457,7 @@ cd_util_create_temperature (CdUtilPrivate *priv,
+ 	const guint size = 256;
+ 	gboolean ret;
+ 	gchar *endptr = NULL;
+-	gdouble gamma;
++	gdouble cd_gamma;
+ 	guint16 data[3][256];
+ 	guint i;
+ 	guint temp;
+@@ -487,7 +487,7 @@ cd_util_create_temperature (CdUtilPrivate *priv,
+ 		g_set_error_literal (error, 1, 0, "XML error, expected gamma");
+ 		goto out;
+ 	}
+-	gamma = g_ascii_strtod (cd_dom_get_node_data (tmp), &endptr);
++	cd_gamma = g_ascii_strtod (cd_dom_get_node_data (tmp), &endptr);
+ 	if (endptr != NULL && endptr[0] != '\0') {
+ 		ret = FALSE;
+ 		g_set_error (error, 1, 0,
+@@ -499,11 +499,11 @@ cd_util_create_temperature (CdUtilPrivate *priv,
+ 	/* generate the VCGT table */
+ 	cd_color_get_blackbody_rgb (temp, &white_point);
+ 	for (i = 0; i < size; i++) {
+-		data[0][i] = pow ((gdouble) i / size, 1.0 / gamma) *
++		data[0][i] = pow ((gdouble) i / size, 1.0 / cd_gamma) *
+ 				  0xffff * white_point.R;
+-		data[1][i] = pow ((gdouble) i / size, 1.0 / gamma) *
++		data[1][i] = pow ((gdouble) i / size, 1.0 / cd_gamma) *
+ 				  0xffff * white_point.G;
+-		data[2][i] = pow ((gdouble) i / size, 1.0 / gamma) *
++		data[2][i] = pow ((gdouble) i / size, 1.0 / cd_gamma) *
+ 				  0xffff * white_point.B;
+ 	}
+ 
diff --git a/graphics/colord/files/patch-configure b/graphics/colord/files/patch-configure
new file mode 100644
index 000000000..bd3d39bae
--- /dev/null
+++ b/graphics/colord/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2013-04-11 10:05:05.000000000 +0000
++++ configure	2013-04-11 10:06:38.000000000 +0000
+@@ -17763,7 +17763,7 @@
+ fi
+ 
+ # per-machine directory
+-CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/colord/icc"
++CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/colord/icc"
+ 
+ 
+ ac_config_files="$ac_config_files Makefile etc/Makefile contrib/Makefile contrib/session-helper/Makefile contrib/colord-sane/Makefile examples/Makefile man/Makefile doc/Makefile doc/api/Makefile doc/api/dbus/Makefile doc/api/version.xml data/Makefile data/figures/Makefile data/profiles/Makefile data/ti1/Makefile data/org.freedesktop.ColorManager.conf data/tests/Makefile policy/Makefile rules/Makefile rules/69-cd-sensors.rules po/Makefile.in src/Makefile src/plugins/Makefile src/sensors/Makefile client/Makefile lib/Makefile lib/colord/cd-version.h lib/colord/colord.pc lib/colord/Makefile lib/colorhug/Makefile lib/colorhug/colorhug.pc lib/colorhug/ch-version.h lib/dtp94/Makefile lib/huey/Makefile lib/munki/Makefile"
diff --git a/graphics/colord/files/patch-lib_colord_cd-icc_c b/graphics/colord/files/patch-lib_colord_cd-icc_c
new file mode 100644
index 000000000..3e52f97c9
--- /dev/null
+++ b/graphics/colord/files/patch-lib_colord_cd-icc_c
@@ -0,0 +1,192 @@
+$OpenBSD: patch-lib_colord_cd-icc_c,v 1.1 2013/03/31 19:41:23 ajacoutot Exp $
+
+From e13946311e57981d060225a3ec67a76e825d0248 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 28 Mar 2013 14:42:39 +0000
+Subject: [PATCH] trivial: Add a gobject-introspection element-type
+
+From 9f7ef87460b4b40103c59ea8a3839dc8706a7d53 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 28 Mar 2013 14:43:45 +0000
+Subject: [PATCH] trivial: Sanity check the written profile size to be less than 16Mb
+
+From 653d0569dd960f607b58ec6b9ee91bf867fdb039 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 28 Mar 2013 14:44:38 +0000
+Subject: [PATCH] trivial: Be more paranoid when writing ICC wchar_t values
+
+From 085b32b6ca9802bbfce509fcb5bf8bf231afaa48 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Thu, 28 Mar 2013 15:24:00 +0000
+Subject: [PATCH] Ensure mbstowcs() has an LC_CTYPE of 'en_US.UTF-8'
+
+--- lib/colord/cd-icc.c.orig	Sun Mar 31 21:33:15 2013
++++ lib/colord/cd-icc.c	Sun Mar 31 21:33:47 2013
+@@ -28,6 +28,7 @@
+ 
+ #include <glib.h>
+ #include <lcms2.h>
++#include <locale.h>
+ #include <string.h>
+ #include <stdlib.h>
+ 
+@@ -813,10 +814,14 @@ out:
+ static wchar_t *
+ utf8_to_wchar_t (const char *src)
+ {
++	const gchar *orig_locale;
+ 	gssize len;
+ 	gssize converted;
+ 	wchar_t *buf = NULL;
+ 
++	/* switch the locale to a known UTF-8 LC_CTYPE */
++	orig_locale = setlocale (LC_CTYPE, NULL);
++	setlocale (LC_CTYPE, "en_US.UTF-8");
+ 	len = mbstowcs (NULL, src, 0);
+ 	if (len < 0) {
+ 		g_warning ("Invalid UTF-8 in string %s", src);
+@@ -828,28 +833,49 @@ utf8_to_wchar_t (const char *src)
+ 	g_assert (converted != -1);
+ 	buf[converted] = '\0';
+ out:
++	setlocale (LC_CTYPE, orig_locale);
+ 	return buf;
+ }
+ 
+ /**
+- * _cmsDictAddEntryAscii:
++ * cd_util_write_dict_entry:
+  **/
+-static cmsBool
+-_cmsDictAddEntryAscii (cmsHANDLE dict,
+-		       const gchar *key,
+-		       const gchar *value)
++static gboolean
++cd_util_write_dict_entry (cmsHANDLE dict,
++			  const gchar *key,
++			  const gchar *value,
++			  GError **error)
+ {
+-	cmsBool ret = FALSE;
++	gboolean ret = FALSE;
+ 	wchar_t *mb_key = NULL;
+ 	wchar_t *mb_value = NULL;
+ 
+ 	mb_key = utf8_to_wchar_t (key);
+-	if (mb_key == NULL)
++	if (mb_key == NULL) {
++		g_set_error (error,
++			     CD_ICC_ERROR,
++			     CD_ICC_ERROR_FAILED_TO_SAVE,
++			     "Failed to write invalid ASCII key: '%s'",
++			     key);
+ 		goto out;
++	}
+ 	mb_value = utf8_to_wchar_t (value);
+-	if (mb_value == NULL)
++	if (mb_value == NULL) {
++		g_set_error (error,
++			     CD_ICC_ERROR,
++			     CD_ICC_ERROR_FAILED_TO_SAVE,
++			     "Failed to write invalid ASCII value: '%s'",
++			     value);
+ 		goto out;
++	}
+ 	ret = cmsDictAddEntry (dict, mb_key, mb_value, NULL, NULL);
++	if (!ret) {
++		g_set_error_literal (error,
++				     CD_ICC_ERROR,
++				     CD_ICC_ERROR_FAILED_TO_SAVE,
++				     "Failed to write dict entry");
++		goto out;
++	}
+ out:
+ 	g_free (mb_key);
+ 	g_free (mb_value);
+@@ -889,8 +915,11 @@ cd_util_mlu_object_parse (const gchar *locale, const g
+ 
+ 	/* untranslated version */
+ 	if (locale == NULL || locale[0] == '\0') {
++		wtext = utf8_to_wchar_t (utf8_text);
++		if (wtext == NULL)
++			goto out;
+ 		obj = g_new0 (CdMluObject, 1);
+-		obj->wtext = utf8_to_wchar_t (utf8_text);
++		obj->wtext = wtext;
+ 		goto out;
+ 	}
+ 
+@@ -946,6 +975,7 @@ cd_util_write_tag_localized (CdIcc *icc,
+ 	CdMluObject *obj;
+ 	cmsMLU *mlu = NULL;
+ 	const gchar *locale;
++	const gchar *value;
+ 	gboolean ret = TRUE;
+ 	GList *keys;
+ 	GList *l;
+@@ -957,10 +987,13 @@ cd_util_write_tag_localized (CdIcc *icc,
+ 	array = g_ptr_array_new_with_free_func (cd_util_mlu_object_free);
+ 	for (l = keys; l != NULL; l = l->next) {
+ 		locale = l->data;
+-		obj = cd_util_mlu_object_parse (locale,
+-						g_hash_table_lookup (hash, locale));
+-		if (obj == NULL)
++		value = g_hash_table_lookup (hash, locale);
++		obj = cd_util_mlu_object_parse (locale, value);
++		if (obj == NULL) {
++			g_warning ("failed to parse localized text: %s[%s]",
++				   value, locale);
+ 			continue;
++		}
+ 		g_ptr_array_add (array, obj);
+ 	}
+ 
+@@ -1053,7 +1086,7 @@ cd_icc_save_file (CdIcc *icc,
+ 	GError *error_local = NULL;
+ 	GList *l;
+ 	GList *md_keys = NULL;
+-	gsize length;
++	gsize length = 0;
+ 	guint i;
+ 
+ 	g_return_val_if_fail (CD_IS_ICC (icc), FALSE);
+@@ -1089,7 +1122,10 @@ cd_icc_save_file (CdIcc *icc,
+ 			for (l = md_keys; l != NULL; l = l->next) {
+ 				key = l->data;
+ 				value = g_hash_table_lookup (priv->metadata, key);
+-				_cmsDictAddEntryAscii (dict, key, value);
++				ret = cd_util_write_dict_entry (dict, key,
++								value, error);
++				if (!ret)
++					goto out;
+ 			}
+ 		}
+ 		ret = cmsWriteTag (priv->lcms_profile, cmsSigMetaTag, dict);
+@@ -1152,6 +1188,18 @@ cd_icc_save_file (CdIcc *icc,
+ 		goto out;
+ 	}
+ 
++	/* sanity check to 16Mb */
++	if (length == 0 || length > 16 * 1024 * 1024) {
++		ret = FALSE;
++		g_set_error (error,
++			     CD_ICC_ERROR,
++			     CD_ICC_ERROR_FAILED_TO_SAVE,
++			     "failed to save ICC file, requested %" G_GSIZE_FORMAT
++			     "bytes and limit is 16Mb",
++			     length);
++		goto out;
++	}
++
+ 	/* allocate and get profile data */
+ 	data = g_new0 (gchar, length);
+ 	ret = cmsSaveProfileToMem (priv->lcms_profile,
+@@ -1648,7 +1696,7 @@ out:
+  * This function will only return results if the profile was loaded with the
+  * %CD_ICC_LOAD_FLAGS_NAMED_COLORS flag.
+  *
+- * Return value: (transfer container): An array of #CdColorSwatch
++ * Return value: (transfer container) (element-type CdColorSwatch): An array of color swatches
+  *
+  * Since: 0.1.32
+  **/
diff --git a/graphics/colord/files/patch-src_Makefile_in b/graphics/colord/files/patch-src_Makefile_in
new file mode 100644
index 000000000..15edb6bfb
--- /dev/null
+++ b/graphics/colord/files/patch-src_Makefile_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_Makefile_in,v 1.6 2013/03/31 19:41:23 ajacoutot Exp $
+--- src/Makefile.in.orig	Thu Mar 28 11:16:10 2013
++++ src/Makefile.in	Sat Mar 30 16:25:48 2013
+@@ -1774,11 +1774,6 @@ cd-resources.h: colord.gresource.xml
+ 		$(srcdir)/colord.gresource.xml
+ 
+ install-data-hook:
+-	if test -w $(DESTDIR)$(prefix)/; then \
+-		mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \
+-		chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \
+-		chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \
+-	fi
+ 
+ -include $(top_srcdir)/git.mk
+ 
diff --git a/graphics/colord/pkg-plist b/graphics/colord/pkg-plist
index d48f60969..387ac3e7b 100644
--- a/graphics/colord/pkg-plist
+++ b/graphics/colord/pkg-plist
@@ -1,23 +1,37 @@
+bin/cd-create-profile
+bin/cd-fix-profile
+bin/cd-iccdump
+bin/colormgr
 etc/bash_completion.d/colormgr-completion.bash
 etc/colord.conf
 etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
-etc/dbus-1/system.d/org.freedesktop.colord-sane.conf
-include/colord-1/colord.h
 include/colord-1/colord-private.h
+include/colord-1/colord-session/cd-session.h
+include/colord-1/colord.h
+include/colord-1/colord/cd-buffer.h
 include/colord-1/colord/cd-client-sync.h
 include/colord-1/colord/cd-client.h
 include/colord-1/colord/cd-color.h
+include/colord-1/colord/cd-deprecated.h
 include/colord-1/colord/cd-device-sync.h
 include/colord-1/colord/cd-device.h
+include/colord-1/colord/cd-dom.h
 include/colord-1/colord/cd-enum.h
-include/colord-1/colord/cd-it8.h
+include/colord-1/colord/cd-icc.h
+include/colord-1/colord/cd-interp-akima.h
+include/colord-1/colord/cd-interp-linear.h
+include/colord-1/colord/cd-interp.h
 include/colord-1/colord/cd-it8-utils.h
+include/colord-1/colord/cd-it8.h
 include/colord-1/colord/cd-math.h
 include/colord-1/colord/cd-profile-sync.h
 include/colord-1/colord/cd-profile.h
 include/colord-1/colord/cd-sensor-sync.h
 include/colord-1/colord/cd-sensor.h
 include/colord-1/colord/cd-version.h
+lib/colord-sensors/libcolord_sensor_argyll.a
+lib/colord-sensors/libcolord_sensor_argyll.la
+lib/colord-sensors/libcolord_sensor_argyll.so
 lib/colord-sensors/libcolord_sensor_dummy.a
 lib/colord-sensors/libcolord_sensor_dummy.la
 lib/colord-sensors/libcolord_sensor_dummy.so
@@ -26,17 +40,65 @@ lib/libcolord.a
 lib/libcolord.la
 lib/libcolord.so
 lib/libcolord.so.1
+lib/libcolordprivate.a
+lib/libcolordprivate.la
+lib/libcolordprivate.so
+lib/libcolordprivate.so.1
 libdata/pkgconfig/colord.pc
 libexec/colord
-share/color/icc/colord/crayons.icc
+libexec/colord-session
+share/color/icc/colord/AdobeRGB1998.icc
+share/color/icc/colord/AppleRGB.icc
+share/color/icc/colord/BestRGB.icc
+share/color/icc/colord/BetaRGB.icc
+share/color/icc/colord/Bluish.icc
+share/color/icc/colord/BruceRGB.icc
+share/color/icc/colord/CIE-RGB.icc
+share/color/icc/colord/ColorMatchRGB.icc
+share/color/icc/colord/Crayons.icc
+share/color/icc/colord/DonRGB4.icc
+share/color/icc/colord/ECI-RGBv2.icc
+share/color/icc/colord/EktaSpacePS5.icc
+share/color/icc/colord/Gamma5000K.icc
+share/color/icc/colord/Gamma5500K.icc
+share/color/icc/colord/Gamma6500K.icc
+share/color/icc/colord/NTSC-RGB.icc
+share/color/icc/colord/PAL-RGB.icc
+share/color/icc/colord/ProPhotoRGB.icc
+share/color/icc/colord/SMPTE-C-RGB.icc
+share/color/icc/colord/SwappedRedAndGreen.icc
+share/color/icc/colord/WideGamutRGB.icc
+share/color/icc/colord/sRGB.icc
 share/color/icc/colord/x11-colors.icc
+share/colord/icons/color-munki-photo-ambient.svg
+share/colord/icons/color-munki-photo-attach.svg
+share/colord/icons/color-munki-photo-calibrate.svg
+share/colord/icons/color-munki-photo-projector.svg
+share/colord/icons/color-munki-photo-screen.svg
+share/colord/icons/color-munki-smile-attach.svg
+share/colord/icons/colorhug-attach.svg
+share/colord/icons/dtp94-attach.svg
+share/colord/icons/hcfr-attach.svg
+share/colord/icons/huey-attach.svg
+share/colord/icons/i1-display3-attach.svg
+share/colord/icons/i1-monitor-attach.svg
+share/colord/icons/i1-pro-attach.svg
+share/colord/icons/spyder2-attach.svg
+share/colord/icons/spyder3-attach.svg
+share/colord/icons/spyder4-attach.svg
+share/colord/ti1/display-long.ti1
+share/colord/ti1/display-normal.ti1
+share/colord/ti1/display-short.ti1
+share/colord/ti1/printer-long.ti1
+share/colord/ti1/printer-normal.ti1
+share/colord/ti1/printer-short.ti1
+share/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
 share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
-share/dbus-1/interfaces/org.freedesktop.colord.sane.xml
+share/dbus-1/services/org.freedesktop.ColorHelper.service
 share/dbus-1/system-services/org.freedesktop.ColorManager.service
-share/dbus-1/system-services/org.freedesktop.colord-sane.service
 share/gir-1.0/Colord-1.0.gir
 share/locale/as/LC_MESSAGES/colord.mo
 share/locale/bg/LC_MESSAGES/colord.mo
@@ -51,6 +113,7 @@ share/locale/en_GB/LC_MESSAGES/colord.mo
 share/locale/eo/LC_MESSAGES/colord.mo
 share/locale/es/LC_MESSAGES/colord.mo
 share/locale/eu/LC_MESSAGES/colord.mo
+share/locale/fa/LC_MESSAGES/colord.mo
 share/locale/fi/LC_MESSAGES/colord.mo
 share/locale/fr/LC_MESSAGES/colord.mo
 share/locale/ga/LC_MESSAGES/colord.mo
@@ -58,11 +121,14 @@ share/locale/gl/LC_MESSAGES/colord.mo
 share/locale/gu/LC_MESSAGES/colord.mo
 share/locale/he/LC_MESSAGES/colord.mo
 share/locale/hi/LC_MESSAGES/colord.mo
+share/locale/hr/LC_MESSAGES/colord.mo
 share/locale/hu/LC_MESSAGES/colord.mo
+share/locale/ia/LC_MESSAGES/colord.mo
 share/locale/id/LC_MESSAGES/colord.mo
 share/locale/it/LC_MESSAGES/colord.mo
 share/locale/it_IT/LC_MESSAGES/colord.mo
 share/locale/ja/LC_MESSAGES/colord.mo
+share/locale/ka/LC_MESSAGES/colord.mo
 share/locale/kk/LC_MESSAGES/colord.mo
 share/locale/kn/LC_MESSAGES/colord.mo
 share/locale/ko/LC_MESSAGES/colord.mo
@@ -82,6 +148,7 @@ share/locale/ro/LC_MESSAGES/colord.mo
 share/locale/ru/LC_MESSAGES/colord.mo
 share/locale/sk/LC_MESSAGES/colord.mo
 share/locale/sl/LC_MESSAGES/colord.mo
+share/locale/sq/LC_MESSAGES/colord.mo
 share/locale/sr/LC_MESSAGES/colord.mo
 share/locale/sr@latin/LC_MESSAGES/colord.mo
 share/locale/sv/LC_MESSAGES/colord.mo
@@ -91,9 +158,11 @@ share/locale/th/LC_MESSAGES/colord.mo
 share/locale/tr/LC_MESSAGES/colord.mo
 share/locale/uk/LC_MESSAGES/colord.mo
 share/locale/zh_CN/LC_MESSAGES/colord.mo
+share/locale/zh_HK/LC_MESSAGES/colord.mo
 share/locale/zh_TW/LC_MESSAGES/colord.mo
 share/polkit-1/actions/org.freedesktop.color.policy
-share/vala/vapi/colord.vapi
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
@@ -104,16 +173,25 @@ share/vala/vapi/colord.vapi
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/it_IT/LC_MESSAGES
 @dirrmtry share/locale/it_IT
+@dirrmtry share/locale/ia/LC_MESSAGES
+@dirrmtry share/locale/ia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/bg_BG/LC_MESSAGES
 @dirrmtry share/locale/bg_BG
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrm share/colord/ti1
+@dirrm share/colord/icons
+@dirrm share/colord
 @dirrm share/color/icc/colord
 @dirrm share/color/icc
 @dirrm share/color
 @dirrm lib/colord-sensors
+@dirrm include/colord-1/colord-session
 @dirrm include/colord-1/colord
 @dirrm include/colord-1
 @dirrmtry etc/bash_completion.d
+@cwd /
+@dirrmtry var/db/colord/icc
+@dirrmtry var/db/colord