23245618 Deliver colord 1.1.8 in Solaris
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Tue, 23 Aug 2016 18:13:17 -0700
changeset 6676 447ee8f869db
parent 6675 21b7fffbffb4
child 6677 67bdf73b3b85
23245618 Deliver colord 1.1.8 in Solaris PSARC/2016/378 colord
components/desktop/colord/Makefile
components/desktop/colord/colord.p5m
components/desktop/colord/depend.mk
components/desktop/colord/files/colord.xml
components/desktop/colord/files/svc-colord
components/desktop/colord/patches/01-lcms-build.patch
components/gnome/gtk3/Makefile
components/gnome/gtk3/depend.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/colord/Makefile	Tue Aug 23 18:13:17 2016 -0700
@@ -0,0 +1,107 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS =            64_and_32
+# All components using gobject-introspection must be built with gcc as
+# gobject-introspection does not produce correct results when using Studio.
+# Additionally, colord requires support for __attribute__(cleanup), which
+# Studio does not yet support until 12.5 (ER 17630845).
+COMPILER =              gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		colord
+COMPONENT_VERSION=	1.1.8
+COMPONENT_PROJECT_URL=	http://www.freedesktop.org/software/colord/
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.xz
+COMPONENT_ARCHIVE_HASH= \
+	sha256:f03e951641f39c2cea6ce7a6435608dd2bc0bd2c98e901ae331193f95f3e8907
+COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)/releases/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	gnome/libraries
+
+TPNO=			25612
+
+TEST_TARGET = $(NO_TESTS)
+
+# Needs gobject-introspection, not available on S11.
+include $(WS_MAKE_RULES)/no-evaluation.mk
+
+include $(WS_MAKE_RULES)/gnome-component.mk
+
+# Requires fpclassify (c99).
+CFLAGS += -std=gnu99
+
+# Required due to patches.
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv; intltoolize --force);
+
+# Make sure we haven't broken the SMF manifest formatting
+COMPONENT_PREP_ACTION += \
+    ( /usr/sbin/svccfg validate $(COMPONENT_DIR)/files/colord.xml );
+
+# Requires external package (https://bash-completion.alioth.debian.org) that we
+# don't currently have in Solaris.
+CONFIGURE_OPTIONS += --disable-bash-completion
+# gusb appears to be an abandoned project.
+CONFIGURE_OPTIONS += --disable-gusb
+CONFIGURE_OPTIONS += --enable-polkit
+CONFIGURE_OPTIONS += --disable-static
+# Linux-specific.
+CONFIGURE_OPTIONS += --disable-systemd-login
+# Linux-specific.
+CONFIGURE_OPTIONS += --disable-udev
+CONFIGURE_OPTIONS += --enable-gtk-doc
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-introspection
+CONFIGURE_OPTIONS += --enable-shared
+# Required for other components.
+CONFIGURE_OPTIONS += --enable-vala
+# may need tweaking to give colord user sufficient rights
+CONFIGURE_OPTIONS += --with-daemon-user=daemon
+CONFIGURE_OPTIONS += --with-pic
+# Mostly a placebo value; udev support is disabled above, but it still delivers
+# 'rule' files for udev (omitted from package manifest).
+CONFIGURE_OPTIONS += --with-udevrulesdir=/etc/udev/rules.d
+
+# Assumes GNU xgettext and tail in PATH
+COMPONENT_BUILD_ENV += PATH=$(GNUBIN):$(PATH)
+CONFIGURE_ENV += PATH=$(GNUBIN):$(PATH)
+
+# Tell g-ir-scanner not to cache results in homedir of user running the build
+COMPONENT_BUILD_ENV += GI_SCANNER_DISABLE_CACHE=""
+
+# Temporary until lcms2 with fix for 24494517 is installed on build machines
+# Allows running binaries during build to process profiles without bus errors
+LCMS2_LIB_DIR = $(WS_COMPONENTS)/lcms2/build/prototype/$(MACH)$(USRLIB)
+COMPONENT_BUILD_ENV += LD_LIBRARY_PATH="$(LCMS2_LIB_DIR)"
+# End temporary workaround section
+
+REQUIRED_PACKAGES += database/sqlite-3
+REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc
+REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/lcms2
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library/dbus
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/polkit
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/colord/colord.p5m	Tue Aug 23 18:13:17 2016 -0700
@@ -0,0 +1,271 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> \
+    default mangler.man.stability "pass-through volatile">
+# pie executables confuse this pkglint check due to bug 24457293
+<transform file path=usr/bin/.+ -> default pkg.linted.userland.action001.2 True>
+set name=pkg.fmri \
+    value=pkg:/service/image/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="A system service to manage, install, and generate color profiles"
+set name=pkg.description \
+    value="colord is a system service that makes it easy to manage, install and generate color profiles to accurately color manage input and output devices."
+set name=com.oracle.info.description value=colord
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification value=org.opensolaris.category.2008:System/Services
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2016/378
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=etc/dbus-1/system.d/org.freedesktop.ColorManager.conf
+# Not useful since we don't have udev support on Solaris
+# file path=etc/udev/rules.d/69-cd-sensors.rules
+# file path=etc/udev/rules.d/95-cd-devices.rules
+file files/colord.xml path=lib/svc/manifest/system/colord.xml
+file files/svc-colord path=lib/svc/method/svc-colord
+file path=usr/bin/cd-create-profile
+file path=usr/bin/cd-fix-profile
+file path=usr/bin/cd-iccdump
+file path=usr/bin/colormgr
+file path=usr/include/colord-1/colord-private.h
+file path=usr/include/colord-1/colord-session/cd-session.h
+file path=usr/include/colord-1/colord.h
+file path=usr/include/colord-1/colord/cd-buffer.h
+file path=usr/include/colord-1/colord/cd-client-sync.h
+file path=usr/include/colord-1/colord/cd-client.h
+file path=usr/include/colord-1/colord/cd-color.h
+file path=usr/include/colord-1/colord/cd-device-sync.h
+file path=usr/include/colord-1/colord/cd-device.h
+file path=usr/include/colord-1/colord/cd-dom.h
+file path=usr/include/colord-1/colord/cd-edid.h
+file path=usr/include/colord-1/colord/cd-enum.h
+file path=usr/include/colord-1/colord/cd-icc-store.h
+file path=usr/include/colord-1/colord/cd-icc-utils.h
+file path=usr/include/colord-1/colord/cd-icc.h
+file path=usr/include/colord-1/colord/cd-interp-akima.h
+file path=usr/include/colord-1/colord/cd-interp-linear.h
+file path=usr/include/colord-1/colord/cd-interp.h
+file path=usr/include/colord-1/colord/cd-it8-utils.h
+file path=usr/include/colord-1/colord/cd-it8.h
+file path=usr/include/colord-1/colord/cd-math.h
+file path=usr/include/colord-1/colord/cd-profile-sync.h
+file path=usr/include/colord-1/colord/cd-profile.h
+file path=usr/include/colord-1/colord/cd-quirk.h
+file path=usr/include/colord-1/colord/cd-sensor-sync.h
+file path=usr/include/colord-1/colord/cd-sensor.h
+file path=usr/include/colord-1/colord/cd-transform.h
+file path=usr/include/colord-1/colord/cd-version.h
+file path=usr/lib/$(MACH64)/colord mode=0555 \
+    restart_fmri=svc:/system/colord:default
+# colord complains if colord-plugins directory is missing, even though
+# we have no plugins to put in it
+dir  path=usr/lib/$(MACH64)/colord-plugins
+file path=usr/lib/$(MACH64)/colord-sensors/libcolord_sensor_argyll.so
+file path=usr/lib/$(MACH64)/colord-sensors/libcolord_sensor_dummy.so
+file path=usr/lib/$(MACH64)/colord-session
+file path=usr/lib/$(MACH64)/girepository-1.0/Colord-1.0.typelib
+link path=usr/lib/$(MACH64)/libcolord.so target=libcolord.so.2.0.3
+link path=usr/lib/$(MACH64)/libcolord.so.2 target=libcolord.so.2.0.3
+file path=usr/lib/$(MACH64)/libcolord.so.2.0.3
+link path=usr/lib/$(MACH64)/libcolordprivate.so target=libcolordprivate.so.2.0.3
+link path=usr/lib/$(MACH64)/libcolordprivate.so.2 \
+    target=libcolordprivate.so.2.0.3
+file path=usr/lib/$(MACH64)/libcolordprivate.so.2.0.3
+file path=usr/lib/$(MACH64)/pkgconfig/colord.pc
+file path=usr/lib/girepository-1.0/Colord-1.0.typelib
+link path=usr/lib/libcolord.so target=libcolord.so.2.0.3
+link path=usr/lib/libcolord.so.2 target=libcolord.so.2.0.3
+file path=usr/lib/libcolord.so.2.0.3
+link path=usr/lib/libcolordprivate.so target=libcolordprivate.so.2.0.3
+link path=usr/lib/libcolordprivate.so.2 target=libcolordprivate.so.2.0.3
+file path=usr/lib/libcolordprivate.so.2.0.3
+file path=usr/lib/pkgconfig/colord.pc
+file path=usr/share/color/icc/colord/AdobeRGB1998.icc
+file path=usr/share/color/icc/colord/AppleRGB.icc
+file path=usr/share/color/icc/colord/BestRGB.icc
+file path=usr/share/color/icc/colord/BetaRGB.icc
+file path=usr/share/color/icc/colord/Bluish.icc
+file path=usr/share/color/icc/colord/BruceRGB.icc
+file path=usr/share/color/icc/colord/CIE-RGB.icc
+file path=usr/share/color/icc/colord/ColorMatchRGB.icc
+file path=usr/share/color/icc/colord/Crayons.icc
+file path=usr/share/color/icc/colord/DonRGB4.icc
+file path=usr/share/color/icc/colord/ECI-RGBv1.icc
+file path=usr/share/color/icc/colord/ECI-RGBv2.icc
+file path=usr/share/color/icc/colord/EktaSpacePS5.icc
+file path=usr/share/color/icc/colord/Gamma5000K.icc
+file path=usr/share/color/icc/colord/Gamma5500K.icc
+file path=usr/share/color/icc/colord/Gamma6500K.icc
+file path=usr/share/color/icc/colord/NTSC-RGB.icc
+file path=usr/share/color/icc/colord/PAL-RGB.icc
+file path=usr/share/color/icc/colord/ProPhotoRGB.icc
+file path=usr/share/color/icc/colord/SMPTE-C-RGB.icc
+file path=usr/share/color/icc/colord/SwappedRedAndGreen.icc
+file path=usr/share/color/icc/colord/WideGamutRGB.icc
+file path=usr/share/color/icc/colord/sRGB.icc
+file path=usr/share/color/icc/colord/x11-colors.icc
+file path=usr/share/colord/icons/color-munki-photo-ambient.svg
+file path=usr/share/colord/icons/color-munki-photo-attach.svg
+file path=usr/share/colord/icons/color-munki-photo-calibrate.svg
+file path=usr/share/colord/icons/color-munki-photo-projector.svg
+file path=usr/share/colord/icons/color-munki-photo-screen.svg
+file path=usr/share/colord/icons/color-munki-smile-attach.svg
+file path=usr/share/colord/icons/colorhug-attach.svg
+file path=usr/share/colord/icons/colorhug2-attach.svg
+file path=usr/share/colord/icons/dtp94-attach.svg
+file path=usr/share/colord/icons/hcfr-attach.svg
+file path=usr/share/colord/icons/huey-attach.svg
+file path=usr/share/colord/icons/i1-display3-attach.svg
+file path=usr/share/colord/icons/i1-monitor-attach.svg
+file path=usr/share/colord/icons/i1-pro-attach.svg
+file path=usr/share/colord/icons/spyder2-attach.svg
+file path=usr/share/colord/icons/spyder3-attach.svg
+file path=usr/share/colord/icons/spyder4-attach.svg
+file path=usr/share/colord/ti1/display-long.ti1
+file path=usr/share/colord/ti1/display-normal.ti1
+file path=usr/share/colord/ti1/display-short.ti1
+file path=usr/share/colord/ti1/printer-long.ti1
+file path=usr/share/colord/ti1/printer-normal.ti1
+file path=usr/share/colord/ti1/printer-short.ti1
+file path=usr/share/dbus-1/interfaces/org.freedesktop.ColorHelper.xml
+file path=usr/share/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml
+file path=usr/share/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml
+file path=usr/share/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml
+file path=usr/share/dbus-1/interfaces/org.freedesktop.ColorManager.xml
+file path=usr/share/dbus-1/services/org.freedesktop.ColorHelper.service
+file path=usr/share/dbus-1/system-services/org.freedesktop.ColorManager.service
+file path=usr/share/glib-2.0/schemas/org.freedesktop.ColorHelper.gschema.xml
+file path=usr/share/gtk-doc/html/colord/CdEdid.html
+file path=usr/share/gtk-doc/html/colord/CdIccStore.html
+file path=usr/share/gtk-doc/html/colord/ColorManager.html
+file path=usr/share/gtk-doc/html/colord/Device.html
+file path=usr/share/gtk-doc/html/colord/Profile.html
+file path=usr/share/gtk-doc/html/colord/Sensor.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-client-sync.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-client.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-color.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-device-sync.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-device.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-dom.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-icc-utils.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-icc.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-interp-akima.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-interp-linear.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-interp.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-it8-utils.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-it8.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-math.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-profile-sync.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-profile.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-sensor-sync.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-sensor.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-transform.html
+file path=usr/share/gtk-doc/html/colord/colord-cd-version.html
+file path=usr/share/gtk-doc/html/colord/colord.devhelp2
+file path=usr/share/gtk-doc/html/colord/home.png
+file path=usr/share/gtk-doc/html/colord/index.html
+file path=usr/share/gtk-doc/html/colord/index.sgml
+file path=usr/share/gtk-doc/html/colord/ix01.html
+file path=usr/share/gtk-doc/html/colord/left-insensitive.png
+file path=usr/share/gtk-doc/html/colord/left.png
+file path=usr/share/gtk-doc/html/colord/libcolord.html
+file path=usr/share/gtk-doc/html/colord/libcolordprivate.html
+file path=usr/share/gtk-doc/html/colord/license.html
+file path=usr/share/gtk-doc/html/colord/ref-dbus.html
+file path=usr/share/gtk-doc/html/colord/right-insensitive.png
+file path=usr/share/gtk-doc/html/colord/right.png
+file path=usr/share/gtk-doc/html/colord/style.css
+file path=usr/share/gtk-doc/html/colord/up-insensitive.png
+file path=usr/share/gtk-doc/html/colord/up.png
+file path=usr/share/locale/as/LC_MESSAGES/colord.mo
+file path=usr/share/locale/bg/LC_MESSAGES/colord.mo
+file path=usr/share/locale/bg_BG/LC_MESSAGES/colord.mo
+file path=usr/share/locale/bn_IN/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ca/LC_MESSAGES/colord.mo
+file path=usr/share/locale/cs/LC_MESSAGES/colord.mo
+file path=usr/share/locale/da/LC_MESSAGES/colord.mo
+file path=usr/share/locale/de/LC_MESSAGES/colord.mo
+file path=usr/share/locale/el/LC_MESSAGES/colord.mo
+file path=usr/share/locale/en_GB/LC_MESSAGES/colord.mo
+file path=usr/share/locale/eo/LC_MESSAGES/colord.mo
+file path=usr/share/locale/es/LC_MESSAGES/colord.mo
+file path=usr/share/locale/eu/LC_MESSAGES/colord.mo
+file path=usr/share/locale/fa/LC_MESSAGES/colord.mo
+file path=usr/share/locale/fi/LC_MESSAGES/colord.mo
+file path=usr/share/locale/fr/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ga/LC_MESSAGES/colord.mo
+file path=usr/share/locale/gl/LC_MESSAGES/colord.mo
+file path=usr/share/locale/gu/LC_MESSAGES/colord.mo
+file path=usr/share/locale/he/LC_MESSAGES/colord.mo
+file path=usr/share/locale/hi/LC_MESSAGES/colord.mo
+file path=usr/share/locale/hr/LC_MESSAGES/colord.mo
+file path=usr/share/locale/hu/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ia/LC_MESSAGES/colord.mo
+file path=usr/share/locale/id/LC_MESSAGES/colord.mo
+file path=usr/share/locale/it/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ja/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ka/LC_MESSAGES/colord.mo
+file path=usr/share/locale/kk/LC_MESSAGES/colord.mo
+file path=usr/share/locale/kn/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ko/LC_MESSAGES/colord.mo
+file path=usr/share/locale/lt/LC_MESSAGES/colord.mo
+file path=usr/share/locale/lv/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ml/LC_MESSAGES/colord.mo
+file path=usr/share/locale/mr/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ms/LC_MESSAGES/colord.mo
+file path=usr/share/locale/nb/LC_MESSAGES/colord.mo
+file path=usr/share/locale/nb_NO/LC_MESSAGES/colord.mo
+file path=usr/share/locale/nl/LC_MESSAGES/colord.mo
+file path=usr/share/locale/nn_NO/LC_MESSAGES/colord.mo
+file path=usr/share/locale/or/LC_MESSAGES/colord.mo
+file path=usr/share/locale/pa/LC_MESSAGES/colord.mo
+file path=usr/share/locale/pl/LC_MESSAGES/colord.mo
+file path=usr/share/locale/pt/LC_MESSAGES/colord.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/colord.mo
+file path=usr/share/locale/pt_PT/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ro/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ru/LC_MESSAGES/colord.mo
+file path=usr/share/locale/sk/LC_MESSAGES/colord.mo
+file path=usr/share/locale/sl/LC_MESSAGES/colord.mo
+file path=usr/share/locale/sq/LC_MESSAGES/colord.mo
+file path=usr/share/locale/sr/LC_MESSAGES/colord.mo
+file path=usr/share/locale/[email protected]/LC_MESSAGES/colord.mo
+file path=usr/share/locale/sv/LC_MESSAGES/colord.mo
+file path=usr/share/locale/ta/LC_MESSAGES/colord.mo
+file path=usr/share/locale/te/LC_MESSAGES/colord.mo
+file path=usr/share/locale/th/LC_MESSAGES/colord.mo
+file path=usr/share/locale/tr/LC_MESSAGES/colord.mo
+file path=usr/share/locale/uk/LC_MESSAGES/colord.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/colord.mo
+file path=usr/share/locale/zh_HK/LC_MESSAGES/colord.mo
+file path=usr/share/locale/zh_TW/LC_MESSAGES/colord.mo
+file man/cd-create-profile.1 path=usr/share/man/man/cd-create-profile.1
+file man/cd-fix-profile.1 path=usr/share/man/man/cd-fix-profile.1
+file man/colormgr.1 path=usr/share/man/man/colormgr.1
+file path=usr/share/polkit-1/actions/org.freedesktop.color.policy
+file path=usr/share/vala/vapi/colord.vapi
+dir  path=var/lib/colord/icc group=daemon
+license COPYING license=GPLv2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/colord/depend.mk	Tue Aug 23 18:13:17 2016 -0700
@@ -0,0 +1,1 @@
+desktop/colord: lcms2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/colord/files/colord.xml	Tue Aug 23 18:13:17 2016 -0700
@@ -0,0 +1,85 @@
+<?xml version="1.0" ?>
+<!DOCTYPE service_bundle
+  SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
+<!--
+    CDDL HEADER START
+
+    The contents of this file are subject to the terms of the
+    Common Development and Distribution License (the "License").
+    You may not use this file except in compliance with the License.
+
+    You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+    or http://www.opensolaris.org/os/licensing.
+    See the License for the specific language governing permissions
+    and limitations under the License.
+
+    When distributing Covered Code, include this CDDL HEADER in each
+    file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+    If applicable, add the following below this CDDL HEADER, with the
+    fields enclosed by brackets "[]" replaced with your own identifying
+    information: Portions Copyright [yyyy] [name of copyright owner]
+
+    CDDL HEADER END
+
+    Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+
+    NOTE:  This service manifest is not editable; its contents will
+    be overwritten by package or patch operations, including
+    operating system upgrade.  Make customizations in a different
+    file.
+-->
+<service_bundle type="manifest" name="system/colord">
+	<service version="1" type="service" name="system/colord">
+
+	<create_default_instance enabled='true' />
+
+	<single_instance />
+
+	<!-- Need / & /usr filesystems mounted -->
+	<dependency
+		name='usr'
+		type='service'
+		grouping='require_all'
+		restart_on='none'>
+		<service_fmri value='svc:/system/filesystem/minimal' />
+	</dependency>
+
+	<dependency
+		name='dbus'
+		type='service'
+		grouping='require_all'
+		restart_on='restart'>
+		<service_fmri value='svc:/system/dbus' />
+	</dependency>
+
+	<!-- Need to be run before gdm is started -->
+	<dependent
+		name='colord_gdm'
+		grouping='optional_all'
+		restart_on='none'>
+		<service_fmri value='svc:/application/graphical-login/gdm' />
+	</dependent>
+
+	<method_context>
+		<method_credential user='daemon' group='daemon'
+			privileges='basic,{zone}:/var/lib/colord/*' />
+	</method_context>
+
+	<exec_method timeout_seconds="60" type="method" name="start"
+		exec="/lib/svc/method/svc-colord start"/>
+	<exec_method timeout_seconds="60" type="method" name="stop"
+		exec=":kill"/>
+	<exec_method timeout_seconds="60" type="method" name="refresh"
+		exec=":true"/>
+
+	<stability value='Unstable' />
+
+	<template>
+	    <common_name>
+		<loctext xml:lang="C">Colord system service
+		</loctext>
+	    </common_name>
+
+	</template>
+    </service>
+</service_bundle>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/colord/files/svc-colord	Tue Aug 23 18:13:17 2016 -0700
@@ -0,0 +1,57 @@
+#! /bin/ksh93
+
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+PATH=/usr/bin:/usr/sbin
+
+. /lib/svc/share/smf_include.sh
+
+USAGE="Usage: $0 <method>"
+
+if [[ $# -ne 1 ]] ; then
+	print "$USAGE" >&2
+	exit $SMF_EXIT_ERR_FATAL
+fi
+
+METHOD="$1"
+
+case "$METHOD" in
+	start)
+		/usr/lib/64/colord &
+		# We should wait until the daemon reaches the main loop before
+		# returning, but have no good way of detecting that from here.
+		;;
+	-*)
+		print "$USAGE" >&2
+		exit $SMF_EXIT_ERR_FATAL
+		;;
+	*)
+		print "Invalid method $METHOD" >&2
+		exit $SMF_EXIT_ERR_FATAL
+		;;
+esac
+
+exit $SMF_EXIT_OK
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/colord/patches/01-lcms-build.patch	Tue Aug 23 18:13:17 2016 -0700
@@ -0,0 +1,16 @@
+Upstream forgot to include LCMS_CFLAGS when building client; works on Linux
+since header file is typically installed in /usr/include instead of
+/usr/include/lcms (as it is on Solaris).
+
+Need to file upstream bug
+
+--- colord-1.1.8/client/Makefile.am	2014-09-12 01:40:27.000000000 -0700
++++ colord-1.1.8/client/Makefile.am	2015-07-07 13:43:26.845133914 -0700
[email protected]@ -2,6 +2,7 @@
+ 	$(PIE_CFLAGS)					\
+ 	$(GLIB_CFLAGS)					\
+ 	$(GTK_CFLAGS)					\
++	$(LCMS_CFLAGS)					\
+ 	-I$(top_srcdir)					\
+ 	-I$(top_srcdir)/lib				\
+ 	-I$(top_builddir)/lib				\
--- a/components/gnome/gtk3/Makefile	Tue Aug 23 11:47:30 2016 -0700
+++ b/components/gnome/gtk3/Makefile	Tue Aug 23 18:13:17 2016 -0700
@@ -92,39 +92,9 @@
 # Generate man pages
 CONFIGURE_OPTIONS += --enable-man
 CONFIGURE_OPTIONS += --with-x
-
-# Delete this when build servers are installed with an updated at-spi2-atk
-ATK_BASE = $(WS_COMPONENTS)/gnome/at-spi2-atk/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(ATK_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(ATK_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(ATK_BASE)/usr/lib 
-LD_OPTIONS.64 += -L $(ATK_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(ATK_BASE)/usr/include/at-spi2-atk/2.0
-
-REST_BASE = $(WS_COMPONENTS)/gnome/rest/build/prototype/$(MACH)
-PKG_CONFIG_PATHS.32 += $(REST_BASE)/usr/lib/pkgconfig/
-PKG_CONFIG_PATHS.64 += $(REST_BASE)/usr/lib/$(MACH64)/pkgconfig/
-PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS))
-
-LD_OPTIONS.32 += -L $(REST_BASE)/usr/lib
-LD_OPTIONS.64 += -L $(REST_BASE)/usr/lib/$(MACH64)
-LD_OPTIONS += $(LD_OPTIONS.$(BITS))
-
-CPPFLAGS += -I$(REST_BASE)/usr/include/rest-0.7
-
-# Work around pkgdepend bug which doesn't resolve dependencies from
-# the local workspace repo. 
-DEPENDED += $(WS_TOP)/components/gnome/rest/build/manifest-$(MACH)-rest.depend
-DEPENDED += $(WS_TOP)/components/gnome/at-spi2-atk/build/manifest-$(MACH)-at-spi2-atk.depend
-
-# Temporary until dependencies are all on build machines
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../at-spi2-atk/Makefile) 
-REQUIRED_PACKAGES += $(shell $(GSED) -n 's/REQUIRED_PACKAGES +=//p' ../rest/Makefile) 
-#end Delete
+# disable colord for now till we get colord installed on build servers
+# at which point we can delete this and add it in REQ PKGS
+CONFIGURE_OPTIONS += --enable-colord=no
 
 # Needed due to patch to configure.ac.
 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv);
--- a/components/gnome/gtk3/depend.mk	Tue Aug 23 11:47:30 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-gnome/gtk3: gnome/at-spi2-atk gnome/rest