graphics/colord: import colord-1.3.5

colord is a system activated daemon that makes it easy to manage,
install and generate color profiles to accurately color manage input and
output devices.

7 files changed, 164 insertions, 0 deletions

diff --git a/graphics/colord/patches/patch-client_cd-util.c b/graphics/colord/patches/patch-client_cd-util.c
new file mode 100644
index 00000000000..2fada84b7a4
--- /dev/null
+++ b/graphics/colord/patches/patch-client_cd-util.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-client_cd-util.c,v 1.1 2018/06/13 15:49:40 youri Exp $
+
+Fix db path.
+
+--- client/cd-util.c.orig	2016-07-27 13:49:36.000000000 +0000
++++ client/cd-util.c
+@@ -814,7 +814,7 @@ cd_util_dump (CdUtilPrivate *priv, gchar
+ {
+ 	CdDevice *device;
+ 	CdProfile *profile;
+-	const gchar *argv[] = { "sqlite3", "/var/lib/colord/mapping.db", ".dump", NULL };
++	const gchar *argv[] = { "sqlite3", "@VARBASE@/db/colord/mapping.db", ".dump", NULL };
+ 	gboolean ret = TRUE;
+ 	gchar *tmp;
+ 	GDateTime *dt;
diff --git a/graphics/colord/patches/patch-configure.ac b/graphics/colord/patches/patch-configure.ac
new file mode 100644
index 00000000000..d0b87ad6968
--- /dev/null
+++ b/graphics/colord/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2018/06/13 15:49:40 youri Exp $
+
+Fix db path.
+
+--- configure.ac.orig	2017-01-02 11:05:17.000000000 +0000
++++ configure.ac
+@@ -423,7 +423,7 @@ AC_ARG_ENABLE(installed_tests,
+ AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
+ 
+ # per-machine directory
+-AC_SUBST(CD_SYSTEM_PROFILES_DIR, "\$(localstatedir)/lib/colord/icc")
++AC_SUBST(CD_SYSTEM_PROFILES_DIR, "\$(localstatedir)/db/colord/icc")
+ 
+ # only include the colord.pc Requires.private of the libraries we actually use
+ AC_SUBST(COLORD_REQUIRES_PRIVATE)
diff --git a/graphics/colord/patches/patch-data_Makefile.am b/graphics/colord/patches/patch-data_Makefile.am
new file mode 100644
index 00000000000..17cf0241f0b
--- /dev/null
+++ b/graphics/colord/patches/patch-data_Makefile.am
@@ -0,0 +1,15 @@
+$NetBSD: patch-data_Makefile.am,v 1.1 2018/06/13 15:49:40 youri Exp $
+
+Handle CONF_FILES.
+
+--- data/Makefile.am.orig	2016-02-17 13:31:21.000000000 +0000
++++ data/Makefile.am
+@@ -9,7 +9,7 @@ SUBDIRS = 						\
+ 	ti1
+ 
+ if HAVE_DAEMON
+-dbusdir = $(sysconfdir)/dbus-1/system.d
++dbusdir = $(datadir)/examples/colord
+ dist_dbus_DATA = org.freedesktop.ColorManager.conf
+ 
+ dbusservicemaindir = $(datadir)/dbus-1/system-services
diff --git a/graphics/colord/patches/patch-lib_colord_cd-icc-store.c b/graphics/colord/patches/patch-lib_colord_cd-icc-store.c
new file mode 100644
index 00000000000..334abc87563
--- /dev/null
+++ b/graphics/colord/patches/patch-lib_colord_cd-icc-store.c
@@ -0,0 +1,29 @@
+$NetBSD: patch-lib_colord_cd-icc-store.c,v 1.1 2018/06/13 15:49:40 youri Exp $
+
+Fix db path and prefix.
+
+--- lib/colord/cd-icc-store.c.orig	2015-10-13 15:24:13.000000000 +0000
++++ lib/colord/cd-icc-store.c
+@@ -206,7 +206,7 @@ cd_icc_store_add_icc (CdIccStore *store,
+ 	icc = cd_icc_new ();
+ 	filename = g_file_get_path (file);
+ 	if (priv->cache != NULL) {
+-		if (g_str_has_prefix (filename, "/usr/share/color/icc/colord/")) {
++		if (g_str_has_prefix (filename, "@PREFIX@/share/color/icc/colord/")) {
+ 			g_autofree gchar *cache_key = NULL;
+ 			cache_key = g_build_filename ("/org/freedesktop/colord",
+ 						      "profiles",
+@@ -622,11 +622,11 @@ cd_icc_store_search_kind (CdIccStore *st
+ 		break;
+ 	case CD_ICC_STORE_SEARCH_KIND_MACHINE:
+ 		g_ptr_array_add (locations, g_strdup (CD_SYSTEM_PROFILES_DIR));
+-		g_ptr_array_add (locations, g_strdup ("/var/lib/color/icc"));
++		g_ptr_array_add (locations, g_strdup ("@VARBASE@/db/color/icc"));
+ 		break;
+ 	case CD_ICC_STORE_SEARCH_KIND_SYSTEM:
+ 		g_ptr_array_add (locations, g_strdup ("/usr/share/color/icc"));
+-		g_ptr_array_add (locations, g_strdup ("/usr/local/share/color/icc"));
++		g_ptr_array_add (locations, g_strdup ("@PREFIX@/share/color/icc"));
+ 		g_ptr_array_add (locations, g_strdup ("/Library/ColorSync/Profiles/Displays"));
+ 		break;
+ 	default:
diff --git a/graphics/colord/patches/patch-src_Makefile.am b/graphics/colord/patches/patch-src_Makefile.am
new file mode 100644
index 00000000000..7c5e6418812
--- /dev/null
+++ b/graphics/colord/patches/patch-src_Makefile.am
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_Makefile.am,v 1.1 2018/06/13 15:49:40 youri Exp $
+
+Fix installation.
+
+--- src/Makefile.am.orig	2016-07-27 13:26:53.000000000 +0000
++++ src/Makefile.am
+@@ -160,11 +160,6 @@ cd_self_test_LDADD =					\
+ cd_self_test_CFLAGS = $(WARN_CFLAGS)
+ 
+ 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
+ 
+ BUILT_SOURCES =						\
+ 	cd-resources.c					\
diff --git a/graphics/colord/patches/patch-src_Makefile.in b/graphics/colord/patches/patch-src_Makefile.in
new file mode 100644
index 00000000000..63f47e218ea
--- /dev/null
+++ b/graphics/colord/patches/patch-src_Makefile.in
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_Makefile.in,v 1.1 2018/06/13 15:49:40 youri Exp $
+
+Remove broken install.
+
+--- src/Makefile.in.orig	2017-01-02 11:05:36.000000000 +0000
++++ src/Makefile.in
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.15 from Makefile.am.
++# Makefile.in generated by automake 1.15.1 from Makefile.am.
+ # @configure_input@
+ 
+-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
++# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+ 
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -1848,11 +1848,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/patches/patch-src_cd-main.c b/graphics/colord/patches/patch-src_cd-main.c
new file mode 100644
index 00000000000..85a23b691a5
--- /dev/null
+++ b/graphics/colord/patches/patch-src_cd-main.c
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_cd-main.c,v 1.1 2018/06/13 15:49:40 youri Exp $
+
+Adjust paths.
+
+--- src/cd-main.c.orig	2016-07-27 13:55:24.000000000 +0000
++++ src/cd-main.c
+@@ -1716,8 +1716,8 @@ cd_main_icc_store_added_cb (CdIccStore *
+ 	/* create profile */
+ 	profile = cd_profile_new ();
+ 	filename = cd_icc_get_filename (icc);
+-	if (g_str_has_prefix (filename, "/usr/share/color") ||
+-	    g_str_has_prefix (filename, "/var/lib/color"))
++	if (g_str_has_prefix (filename, "@PREFIX@/share/color") ||
++	    g_str_has_prefix (filename, "@VARBASE@/db/color"))
+ 		cd_profile_set_is_system_wide (profile, TRUE);
+ 
+ 	/* parse the profile name */
+@@ -2590,7 +2590,7 @@ main (int argc, char *argv[])
+ 	/* connect to the mapping db */
+ 	priv->mapping_db = cd_mapping_db_new ();
+ 	ret = cd_mapping_db_load (priv->mapping_db,
+-				  LOCALSTATEDIR "/lib/colord/mapping.db",
++				  LOCALSTATEDIR "/db/colord/mapping.db",
+ 				  &error);
+ 	if (!ret) {
+ 		g_warning ("CdMain: failed to load mapping database: %s",
+@@ -2601,7 +2601,7 @@ main (int argc, char *argv[])
+ 	/* connect to the device db */
+ 	priv->device_db = cd_device_db_new ();
+ 	ret = cd_device_db_load (priv->device_db,
+-				 LOCALSTATEDIR "/lib/colord/storage.db",
++				 LOCALSTATEDIR "/db/colord/storage.db",
+ 				 &error);
+ 	if (!ret) {
+ 		g_warning ("CdMain: failed to load device database: %s",
+@@ -2612,7 +2612,7 @@ main (int argc, char *argv[])
+ 	/* connect to the profile db */
+ 	priv->profile_db = cd_profile_db_new ();
+ 	ret = cd_profile_db_load (priv->profile_db,
+-				  LOCALSTATEDIR "/lib/colord/storage.db",
++				  LOCALSTATEDIR "/db/colord/storage.db",
+ 				  &error);
+ 	if (!ret) {
+ 		g_warning ("CdMain: failed to load profile database: %s",