Wed Jun 13 15:49:40 2018 UTC ()
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.
(youri)
diff -r0 -r1.1 pkgsrc/graphics/colord/DESCR
diff -r0 -r1.1 pkgsrc/graphics/colord/Makefile
diff -r0 -r1.1 pkgsrc/graphics/colord/PLIST
diff -r0 -r1.1 pkgsrc/graphics/colord/buildlink3.mk
diff -r0 -r1.1 pkgsrc/graphics/colord/distinfo
diff -r0 -r1.1 pkgsrc/graphics/colord/patches/patch-client_cd-util.c
diff -r0 -r1.1 pkgsrc/graphics/colord/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/graphics/colord/patches/patch-data_Makefile.am
diff -r0 -r1.1 pkgsrc/graphics/colord/patches/patch-lib_colord_cd-icc-store.c
diff -r0 -r1.1 pkgsrc/graphics/colord/patches/patch-src_Makefile.am
diff -r0 -r1.1 pkgsrc/graphics/colord/patches/patch-src_Makefile.in
diff -r0 -r1.1 pkgsrc/graphics/colord/patches/patch-src_cd-main.c
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.
# $NetBSD: Makefile,v 1.1 2018/06/13 15:49:40 youri Exp $
DISTNAME= colord-1.3.5
CATEGORIES= graphics gnome
MASTER_SITES= https://www.freedesktop.org/software/colord/releases/
EXTRACT_SUFX= .tar.xz
MAINTAINER= youri@NetBSD.org
HOMEPAGE= https://www.freedesktop.org/software/colord/
COMMENT= Device color profile management daemon
LICENSE= gnu-gpl-v2
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake intltool autoconf aclocal automake
COLORD_USER= colord
COLORD_GROUP= colord
PKG_GROUPS+= ${COLORD_GROUP}
PKG_USERS+= ${COLORD_USER}:${COLORD_GROUP}
BUILD_DEFS+= VARBASE
PKGCONFIG_OVERRIDE+= lib/colorhug/colorhug.pc.in
PKGCONFIG_OVERRIDE+= lib/colord/colord.pc.in
CONFIGURE_ARGS+= --disable-gusb
CONFIGURE_ARGS+= --disable-udev
CONFIGURE_ARGS+= --disable-bash-completion
CONFIGURE_ARGS+= --disable-systemd-login
CONFIGURE_ARGS+= --disable-argyllcms-sensor # XXX not useful?
CONFIGURE_ARGS+= --disable-print-profiles
CONFIGURE_ARGS+= --with-daemon-user=colord
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
PKGCONFIG_OVERRIDE+= lib/colorhug/colorhug.pc.in
PKGCONFIG_OVERRIDE+= lib/colord/colord.pc.in
CONF_DIR= ${PREFIX}/share/examples/colord
CONF_FILES+= ${CONF_DIR}/org.freedesktop.ColorManager.conf \
${PKG_SYSCONFDIR}/dbus-1/system.d/org.freedesktop.ColorManager.conf
SUBST_CLASSES+= prefix
SUBST_MESSAGE.prefix= Fix prefix
SUBST_STAGE.prefix= post-patch
SUBST_FILES.prefix= lib/colord/cd-icc-store.c
SUBST_FILES.prefix+= src/cd-main.c
SUBST_FILES.prefix+= client/cd-util.c
SUBST_VARS.prefix= PREFIX VARBASE
pre-configure:
cd ${WRKSRC} && autoreconf
BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
.include "../../devel/glib2/schemas.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../security/polkit/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/consolekit/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@comment $NetBSD: PLIST,v 1.1 2018/06/13 15:49:40 youri Exp $
bin/cd-create-profile
bin/cd-fix-profile
bin/cd-iccdump
bin/cd-it8
bin/colormgr
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-device-sync.h
include/colord-1/colord/cd-device.h
include/colord-1/colord/cd-dom.h
include/colord-1/colord/cd-edid.h
include/colord-1/colord/cd-enum.h
include/colord-1/colord/cd-icc-store.h
include/colord-1/colord/cd-icc-utils.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-quirk.h
include/colord-1/colord/cd-sensor-sync.h
include/colord-1/colord/cd-sensor.h
include/colord-1/colord/cd-spectrum.h
include/colord-1/colord/cd-transform.h
include/colord-1/colord/cd-version.h
lib/colord-sensors/libcolord_sensor_dummy.la
lib/libcolord.la
lib/libcolordprivate.la
lib/pkgconfig/colord.pc
lib/systemd/user/colord-session.service
libexec/colord
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-RGBv1.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/cmf/CIE1931-2deg-XYZ.cmf
share/colord/cmf/CIE1964-10deg-XYZ.cmf
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/colorhug2-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/icons/spyder5-attach.svg
share/colord/illuminant/CIE-A.sp
share/colord/illuminant/CIE-B.sp
share/colord/illuminant/CIE-C.sp
share/colord/illuminant/CIE-D50.sp
share/colord/illuminant/CIE-D55.sp
share/colord/illuminant/CIE-D65.sp
share/colord/illuminant/CIE-D93.sp
share/colord/illuminant/CIE-E.sp
share/colord/illuminant/CIE-F1.sp
share/colord/illuminant/CIE-F10.sp
share/colord/illuminant/CIE-F11.sp
share/colord/illuminant/CIE-F12.sp
share/colord/illuminant/CIE-F2.sp
share/colord/illuminant/CIE-F3.sp
share/colord/illuminant/CIE-F4.sp
share/colord/illuminant/CIE-F5.sp
share/colord/illuminant/CIE-F6.sp
share/colord/illuminant/CIE-F7.sp
share/colord/illuminant/CIE-F8.sp
share/colord/illuminant/CIE-F9.sp
share/colord/ref/CIE-1986-daylight-SPD.cmf
share/colord/ref/CIE-TCS.sp
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/services/org.freedesktop.ColorHelper.service
share/dbus-1/system-services/org.freedesktop.ColorManager.service
share/examples/colord/org.freedesktop.ColorManager.conf
share/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
share/locale/as/LC_MESSAGES/colord.mo
share/locale/bn_IN/LC_MESSAGES/colord.mo
share/locale/ca/LC_MESSAGES/colord.mo
share/locale/cs/LC_MESSAGES/colord.mo
share/locale/da/LC_MESSAGES/colord.mo
share/locale/de/LC_MESSAGES/colord.mo
share/locale/el/LC_MESSAGES/colord.mo
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/fi/LC_MESSAGES/colord.mo
share/locale/fr/LC_MESSAGES/colord.mo
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/hu/LC_MESSAGES/colord.mo
share/locale/id/LC_MESSAGES/colord.mo
share/locale/is/LC_MESSAGES/colord.mo
share/locale/it/LC_MESSAGES/colord.mo
share/locale/ja/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
share/locale/lt/LC_MESSAGES/colord.mo
share/locale/lv/LC_MESSAGES/colord.mo
share/locale/ml/LC_MESSAGES/colord.mo
share/locale/mr/LC_MESSAGES/colord.mo
share/locale/nb/LC_MESSAGES/colord.mo
share/locale/nl/LC_MESSAGES/colord.mo
share/locale/oc/LC_MESSAGES/colord.mo
share/locale/or/LC_MESSAGES/colord.mo
share/locale/pa/LC_MESSAGES/colord.mo
share/locale/pl/LC_MESSAGES/colord.mo
share/locale/pt/LC_MESSAGES/colord.mo
share/locale/pt_BR/LC_MESSAGES/colord.mo
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/sr/LC_MESSAGES/colord.mo
share/locale/sr@latin/LC_MESSAGES/colord.mo
share/locale/sv/LC_MESSAGES/colord.mo
share/locale/ta/LC_MESSAGES/colord.mo
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_TW/LC_MESSAGES/colord.mo
share/polkit-1/actions/org.freedesktop.color.policy
# $NetBSD: buildlink3.mk,v 1.1 2018/06/13 15:49:40 youri Exp $
BUILDLINK_TREE+= colord
.if !defined(COLORD_BUILDLINK3_MK)
COLORD_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.colord+= colord>=1.2.12
BUILDLINK_PKGSRCDIR.colord?= ../../cinnamon/colord
# XXX
# XXX Uncomment and keep only the buildlink3 lines below which are directly
# XXX needed for dependencies to compile, link, and run. If this package
# XXX provides a wrappered API or otherwise does not expose the APIs of the
# XXX buildlink3 lines below to dependencies, remove them.
# XXX
#.include "../../print/cups-base/buildlink3.mk"
#.include "../../wip/geocode-glib/buildlink3.mk"
#.include "../../devel/nss/buildlink3.mk"
.include "../../graphics/lcms2/buildlink3.mk"
#.include "../../databases/sqlite3/buildlink3.mk"
#.include "../../security/polkit/buildlink3.mk"
#.include "../../devel/libdbusmenu-qt/buildlink3.mk"
#.include "../../sysutils/dbus/buildlink3.mk"
#.include "../../devel/gobject-introspection/buildlink3.mk"
.endif # COLORD_BUILDLINK3_MK
BUILDLINK_TREE+= -colord
$NetBSD: distinfo,v 1.1 2018/06/13 15:49:40 youri Exp $
SHA1 (colord-1.3.5.tar.xz) = 17123eceefe56fc60ca347e8e4980e6e2b04f4b5
RMD160 (colord-1.3.5.tar.xz) = de68b32ae72ab37204197ccf68c6a7d40b6100c0
SHA512 (colord-1.3.5.tar.xz) = a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
Size (colord-1.3.5.tar.xz) = 1263488 bytes
SHA1 (patch-client_cd-util.c) = 1044802d94fab3ffc9bd884959d6f5bf55ffea16
SHA1 (patch-configure.ac) = cc2d522faee09f3af388210962ea7283879ff4a6
SHA1 (patch-data_Makefile.am) = 1e0a3bfc0c8a76d44b619906c9fd77e0f4a83486
SHA1 (patch-lib_colord_cd-icc-store.c) = 6c379033d35a696496d9300db5845279a61136db
SHA1 (patch-src_Makefile.am) = e0667c0408e6dc5ee0536a84ed992c962ec8e8a7
SHA1 (patch-src_Makefile.in) = 7f9ebf08ca8fec6c0e6a5f8a948e5a979fd6ca02
SHA1 (patch-src_cd-main.c) = e9a8f970a5f1a2e761bd271a42e37a531953dca9
$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;
$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)
$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
$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:
$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 \
$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
$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",