# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # colord # colord/files/ # colord/Makefile # colord/distinfo # colord/pkg-descr # colord/pkg-plist # colord/files/patch-Makefile.in # colord/files/patch-client_cd-create-profile_c # colord/files/patch-configure # colord/files/patch-lib_colord_cd-icc_c # colord/files/patch-src_Makefile_in # colord-gtk/ # colord-gtk/Makefile # colord-gtk/distinfo # colord-gtk/pkg-descr # colord-gtk/pkg-plist # echo c - colord mkdir -p colord > /dev/null 2>&1 echo c - colord/files/ mkdir -p colord/files/ > /dev/null 2>&1 echo x - colord/Makefile sed 's/^X//' >colord/Makefile << '678afa09dd56ec03e0ab442aad66ab59' X# Created by: Koop Mast X# $FreeBSD$ X# $MCom: ports/graphics/colord/Makefile,v 1.10 2012/12/17 23:50:40 kwm Exp $ X XPORTNAME= colord XPORTVERSION= 0.1.32 XCATEGORIES= graphics XMASTER_SITES= http://www.freedesktop.org/software/colord/releases/ X XMAINTAINER= kwm@FreeBSD.org XCOMMENT= Manage color profiles to accurately color input/output devices X XBUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection XLIB_DEPENDS= polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ X dbus-1:${PORTSDIR}/devel/dbus \ X lcms2:${PORTSDIR}/graphics/lcms2 X XUSERS= colord XGROUPS= colord X XUSE_XZ= yes XUSES= pathfix XUSE_GNOME= gnomehier glib20 intlhack XUSE_PKGCONFIG= build XUSE_GMAKE= yes XUSE_GETTEXT= yes XUSE_SQLITE= 3 XGNU_CONFIGURE= yes XUSE_LDCONFIG= yes XMAKE_JOBS_UNSAFE=yes XCONFIGURE_ARGS= --disable-gudev \ X --enable-gtk-doc-html=no \ X --disable-gusb \ X --disable-sane \ X --with-daemon-user=colord \ X --disable-systemd-login X# takes ages we don't want to wait. XCONFIGURE_ARGS+=--disable-print-profiles XCPPFLAGS+= -I${LOCALBASE}/include XLDFLAGS+= -L${LOCALBASE}/lib XCONFIGURE_ENV= USB_CFLAGS="-I/usr/include" \ X USB_LIBS="-L/usr/lib -lusb" X XGLIB_SCHEMAS= org.freedesktop.ColorHelper.gschema.xml X XOPTIONS_DEFINE= MANPAGES X X.include X X.if ${PORT_OPTIONS:MMANPAGES} XBUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ X ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 XMAN1= cd-create-profile.1 cd-fix-profile.1 colormgr.1 X.endif X Xpost-patch: X @${REINPLACE_CMD} -e 's|-Wclobbered||g' \ X -e 's|-Wempty-body||g' \ X -e 's|-Wignored-qualifiers||g' \ X -e 's|-Wtype-limits||g' \ X -e 's|-Wmissing-parameter-type||g' \ X -e 's|LIBS="-lusb-1.0|LIBS="-lusb|g' \ X ${WRKSRC}/configure X @${REINPLACE_CMD} -e 's|lib/color|db/color|g' \ X -e 's|/usr/share/color|${PREFIX}/share/color|g' \ X ${WRKSRC}/src/cd-main.c \ X ${WRKSRC}/src/cd-profile-store.c \ X ${WRKSRC}/src/cd-profile.c X.if ! ${PORT_OPTIONS:MMANPAGES} X @${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \ X s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure X.endif X X.include 678afa09dd56ec03e0ab442aad66ab59 echo x - colord/distinfo sed 's/^X//' >colord/distinfo << 'e229236c7629bcae306072c4bcdc3083' XSHA256 (colord-0.1.32.tar.xz) = c7034a8f21948d4458c63f4cf5fd70ee6caab508ce08f33a9752b0f0099cabea XSIZE (colord-0.1.32.tar.xz) = 992544 e229236c7629bcae306072c4bcdc3083 echo x - colord/pkg-descr sed 's/^X//' >colord/pkg-descr << '601a3c39a58bdf7473e73ef6c7dd7225' Xcolord is a system service that makes it easy to manage, install and generate Xcolor profiles to accurately color manage input and output devices. X XWWW: http://www.freedesktop.org/software/colord 601a3c39a58bdf7473e73ef6c7dd7225 echo x - colord/pkg-plist sed 's/^X//' >colord/pkg-plist << '75d7aec6086ef81ed93104e11ef6798b' Xbin/cd-create-profile Xbin/cd-fix-profile Xbin/cd-iccdump Xbin/colormgr Xetc/bash_completion.d/colormgr-completion.bash Xetc/colord.conf Xetc/dbus-1/system.d/org.freedesktop.ColorManager.conf Xinclude/colord-1/colord-private.h Xinclude/colord-1/colord-session/cd-session.h Xinclude/colord-1/colord.h Xinclude/colord-1/colord/cd-buffer.h Xinclude/colord-1/colord/cd-client-sync.h Xinclude/colord-1/colord/cd-client.h Xinclude/colord-1/colord/cd-color.h Xinclude/colord-1/colord/cd-deprecated.h Xinclude/colord-1/colord/cd-device-sync.h Xinclude/colord-1/colord/cd-device.h Xinclude/colord-1/colord/cd-dom.h Xinclude/colord-1/colord/cd-enum.h Xinclude/colord-1/colord/cd-icc.h Xinclude/colord-1/colord/cd-interp-akima.h Xinclude/colord-1/colord/cd-interp-linear.h Xinclude/colord-1/colord/cd-interp.h Xinclude/colord-1/colord/cd-it8-utils.h Xinclude/colord-1/colord/cd-it8.h Xinclude/colord-1/colord/cd-math.h Xinclude/colord-1/colord/cd-profile-sync.h Xinclude/colord-1/colord/cd-profile.h Xinclude/colord-1/colord/cd-sensor-sync.h Xinclude/colord-1/colord/cd-sensor.h Xinclude/colord-1/colord/cd-version.h Xlib/colord-sensors/libcolord_sensor_argyll.a Xlib/colord-sensors/libcolord_sensor_argyll.la Xlib/colord-sensors/libcolord_sensor_argyll.so Xlib/colord-sensors/libcolord_sensor_dummy.a Xlib/colord-sensors/libcolord_sensor_dummy.la Xlib/colord-sensors/libcolord_sensor_dummy.so Xlib/girepository-1.0/Colord-1.0.typelib Xlib/libcolord.a Xlib/libcolord.la Xlib/libcolord.so Xlib/libcolord.so.1 Xlib/libcolordprivate.a Xlib/libcolordprivate.la Xlib/libcolordprivate.so Xlib/libcolordprivate.so.1 Xlibdata/pkgconfig/colord.pc Xlibexec/colord Xlibexec/colord-session Xshare/color/icc/colord/AdobeRGB1998.icc Xshare/color/icc/colord/AppleRGB.icc Xshare/color/icc/colord/BestRGB.icc Xshare/color/icc/colord/BetaRGB.icc Xshare/color/icc/colord/Bluish.icc Xshare/color/icc/colord/BruceRGB.icc Xshare/color/icc/colord/CIE-RGB.icc Xshare/color/icc/colord/ColorMatchRGB.icc Xshare/color/icc/colord/Crayons.icc Xshare/color/icc/colord/DonRGB4.icc Xshare/color/icc/colord/ECI-RGBv2.icc Xshare/color/icc/colord/EktaSpacePS5.icc Xshare/color/icc/colord/Gamma5000K.icc Xshare/color/icc/colord/Gamma5500K.icc Xshare/color/icc/colord/Gamma6500K.icc Xshare/color/icc/colord/NTSC-RGB.icc Xshare/color/icc/colord/PAL-RGB.icc Xshare/color/icc/colord/ProPhotoRGB.icc Xshare/color/icc/colord/SMPTE-C-RGB.icc Xshare/color/icc/colord/SwappedRedAndGreen.icc Xshare/color/icc/colord/WideGamutRGB.icc Xshare/color/icc/colord/sRGB.icc Xshare/color/icc/colord/x11-colors.icc Xshare/colord/icons/color-munki-photo-ambient.svg Xshare/colord/icons/color-munki-photo-attach.svg Xshare/colord/icons/color-munki-photo-calibrate.svg Xshare/colord/icons/color-munki-photo-projector.svg Xshare/colord/icons/color-munki-photo-screen.svg Xshare/colord/icons/color-munki-smile-attach.svg Xshare/colord/icons/colorhug-attach.svg Xshare/colord/icons/dtp94-attach.svg Xshare/colord/icons/hcfr-attach.svg Xshare/colord/icons/huey-attach.svg Xshare/colord/icons/i1-display3-attach.svg Xshare/colord/icons/i1-monitor-attach.svg Xshare/colord/icons/i1-pro-attach.svg Xshare/colord/icons/spyder2-attach.svg Xshare/colord/icons/spyder3-attach.svg Xshare/colord/icons/spyder4-attach.svg Xshare/colord/ti1/display-long.ti1 Xshare/colord/ti1/display-normal.ti1 Xshare/colord/ti1/display-short.ti1 Xshare/colord/ti1/printer-long.ti1 Xshare/colord/ti1/printer-normal.ti1 Xshare/colord/ti1/printer-short.ti1 Xshare/dbus-1/interfaces/org.freedesktop.ColorHelper.xml Xshare/dbus-1/interfaces/org.freedesktop.ColorManager.Device.xml Xshare/dbus-1/interfaces/org.freedesktop.ColorManager.Profile.xml Xshare/dbus-1/interfaces/org.freedesktop.ColorManager.Sensor.xml Xshare/dbus-1/interfaces/org.freedesktop.ColorManager.xml Xshare/dbus-1/services/org.freedesktop.ColorHelper.service Xshare/dbus-1/system-services/org.freedesktop.ColorManager.service Xshare/gir-1.0/Colord-1.0.gir Xshare/locale/as/LC_MESSAGES/colord.mo Xshare/locale/bg/LC_MESSAGES/colord.mo Xshare/locale/bg_BG/LC_MESSAGES/colord.mo Xshare/locale/bn_IN/LC_MESSAGES/colord.mo Xshare/locale/ca/LC_MESSAGES/colord.mo Xshare/locale/cs/LC_MESSAGES/colord.mo Xshare/locale/da/LC_MESSAGES/colord.mo Xshare/locale/de/LC_MESSAGES/colord.mo Xshare/locale/el/LC_MESSAGES/colord.mo Xshare/locale/en_GB/LC_MESSAGES/colord.mo Xshare/locale/eo/LC_MESSAGES/colord.mo Xshare/locale/es/LC_MESSAGES/colord.mo Xshare/locale/eu/LC_MESSAGES/colord.mo Xshare/locale/fa/LC_MESSAGES/colord.mo Xshare/locale/fi/LC_MESSAGES/colord.mo Xshare/locale/fr/LC_MESSAGES/colord.mo Xshare/locale/ga/LC_MESSAGES/colord.mo Xshare/locale/gl/LC_MESSAGES/colord.mo Xshare/locale/gu/LC_MESSAGES/colord.mo Xshare/locale/he/LC_MESSAGES/colord.mo Xshare/locale/hi/LC_MESSAGES/colord.mo Xshare/locale/hr/LC_MESSAGES/colord.mo Xshare/locale/hu/LC_MESSAGES/colord.mo Xshare/locale/ia/LC_MESSAGES/colord.mo Xshare/locale/id/LC_MESSAGES/colord.mo Xshare/locale/it/LC_MESSAGES/colord.mo Xshare/locale/it_IT/LC_MESSAGES/colord.mo Xshare/locale/ja/LC_MESSAGES/colord.mo Xshare/locale/ka/LC_MESSAGES/colord.mo Xshare/locale/kk/LC_MESSAGES/colord.mo Xshare/locale/kn/LC_MESSAGES/colord.mo Xshare/locale/ko/LC_MESSAGES/colord.mo Xshare/locale/lt/LC_MESSAGES/colord.mo Xshare/locale/lv/LC_MESSAGES/colord.mo Xshare/locale/ml/LC_MESSAGES/colord.mo Xshare/locale/mr/LC_MESSAGES/colord.mo Xshare/locale/ms/LC_MESSAGES/colord.mo Xshare/locale/nb/LC_MESSAGES/colord.mo Xshare/locale/nl/LC_MESSAGES/colord.mo Xshare/locale/or/LC_MESSAGES/colord.mo Xshare/locale/pa/LC_MESSAGES/colord.mo Xshare/locale/pl/LC_MESSAGES/colord.mo Xshare/locale/pt/LC_MESSAGES/colord.mo Xshare/locale/pt_BR/LC_MESSAGES/colord.mo Xshare/locale/ro/LC_MESSAGES/colord.mo Xshare/locale/ru/LC_MESSAGES/colord.mo Xshare/locale/sk/LC_MESSAGES/colord.mo Xshare/locale/sl/LC_MESSAGES/colord.mo Xshare/locale/sq/LC_MESSAGES/colord.mo Xshare/locale/sr/LC_MESSAGES/colord.mo Xshare/locale/sr@latin/LC_MESSAGES/colord.mo Xshare/locale/sv/LC_MESSAGES/colord.mo Xshare/locale/ta/LC_MESSAGES/colord.mo Xshare/locale/te/LC_MESSAGES/colord.mo Xshare/locale/th/LC_MESSAGES/colord.mo Xshare/locale/tr/LC_MESSAGES/colord.mo Xshare/locale/uk/LC_MESSAGES/colord.mo Xshare/locale/zh_CN/LC_MESSAGES/colord.mo Xshare/locale/zh_HK/LC_MESSAGES/colord.mo Xshare/locale/zh_TW/LC_MESSAGES/colord.mo Xshare/polkit-1/actions/org.freedesktop.color.policy X@dirrmtry share/locale/zh_HK/LC_MESSAGES X@dirrmtry share/locale/zh_HK X@dirrmtry share/locale/te/LC_MESSAGES X@dirrmtry share/locale/te X@dirrmtry share/locale/sr@latin/LC_MESSAGES X@dirrmtry share/locale/sr@latin X@dirrmtry share/locale/mr/LC_MESSAGES X@dirrmtry share/locale/mr X@dirrmtry share/locale/kk/LC_MESSAGES X@dirrmtry share/locale/kk X@dirrmtry share/locale/it_IT/LC_MESSAGES X@dirrmtry share/locale/it_IT X@dirrmtry share/locale/ia/LC_MESSAGES X@dirrmtry share/locale/ia X@dirrmtry share/locale/bn_IN/LC_MESSAGES X@dirrmtry share/locale/bn_IN X@dirrmtry share/locale/bg_BG/LC_MESSAGES X@dirrmtry share/locale/bg_BG X@dirrmtry share/locale/as/LC_MESSAGES X@dirrmtry share/locale/as X@dirrm share/colord/ti1 X@dirrm share/colord/icons X@dirrm share/colord X@dirrm share/color/icc/colord X@dirrm share/color/icc X@dirrm share/color X@dirrm lib/colord-sensors X@dirrm include/colord-1/colord-session X@dirrm include/colord-1/colord X@dirrm include/colord-1 X@dirrmtry etc/bash_completion.d 75d7aec6086ef81ed93104e11ef6798b echo x - colord/files/patch-Makefile.in sed 's/^X//' >colord/files/patch-Makefile.in << '88a59546c335c2038d17e460b5577edf' X--- Makefile.in.orig 2013-03-29 15:05:15.000000000 +0000 X+++ Makefile.in 2013-03-29 15:06:06.000000000 +0000 X@@ -387,7 +387,7 @@ X # this needs client/cd-create-profile X X # this needs data/profiles/*.icc X-SUBDIRS = etc policy man lib rules po client contrib doc examples data \ X+SUBDIRS = etc policy man lib po client contrib doc examples data \ X src X DISTCHECK_CONFIGURE_FLAGS = \ X --enable-introspection \ 88a59546c335c2038d17e460b5577edf echo x - colord/files/patch-client_cd-create-profile_c sed 's/^X//' >colord/files/patch-client_cd-create-profile_c << '3b6f3361ca4a94ef3cf4e49846458fdc' X$OpenBSD: patch-client_cd-create-profile_c,v 1.1 2013/03/31 19:41:23 ajacoutot Exp $ X XFIXED upstream (not committed just yet) Xcd-create-profile.c:326: warning: declaration of 'tgamma' shadows a global declaration X/usr/include/math.h:201: warning: shadowed declaration is here Xcd-create-profile.c:460: warning: declaration of 'gamma' shadows a global declaration X/usr/include/math.h:238: warning: shadowed declaration is here X X--- client/cd-create-profile.c.orig Sun Mar 31 12:28:09 2013 X+++ client/cd-create-profile.c Sun Mar 31 12:29:36 2013 X@@ -323,7 +323,7 @@ cd_util_create_standard_space (CdUtilPrivate *priv, X const GNode *tmp; X gboolean ret; X gchar *endptr = NULL; X- gdouble tgamma; X+ gdouble cd_tgamma; X X /* parse gamma */ X tmp = cd_dom_get_node (dom, root, "gamma"); X@@ -346,7 +346,7 @@ cd_util_create_standard_space (CdUtilPrivate *priv, X transfer[1] = transfer[0]; X transfer[2] = transfer[0]; X } else { X- tgamma = g_ascii_strtod (data, &endptr); X+ cd_tgamma = g_ascii_strtod (data, &endptr); X if (endptr != NULL && endptr[0] != '\0') { X ret = FALSE; X g_set_error (error, 1, 0, X@@ -354,7 +354,7 @@ cd_util_create_standard_space (CdUtilPrivate *priv, X data); X goto out; X } X- transfer[0] = cmsBuildGamma (NULL, tgamma); X+ transfer[0] = cmsBuildGamma (NULL, cd_tgamma); X transfer[1] = transfer[0]; X transfer[2] = transfer[0]; X } X@@ -457,7 +457,7 @@ cd_util_create_temperature (CdUtilPrivate *priv, X const guint size = 256; X gboolean ret; X gchar *endptr = NULL; X- gdouble gamma; X+ gdouble cd_gamma; X guint16 data[3][256]; X guint i; X guint temp; X@@ -487,7 +487,7 @@ cd_util_create_temperature (CdUtilPrivate *priv, X g_set_error_literal (error, 1, 0, "XML error, expected gamma"); X goto out; X } X- gamma = g_ascii_strtod (cd_dom_get_node_data (tmp), &endptr); X+ cd_gamma = g_ascii_strtod (cd_dom_get_node_data (tmp), &endptr); X if (endptr != NULL && endptr[0] != '\0') { X ret = FALSE; X g_set_error (error, 1, 0, X@@ -499,11 +499,11 @@ cd_util_create_temperature (CdUtilPrivate *priv, X /* generate the VCGT table */ X cd_color_get_blackbody_rgb (temp, &white_point); X for (i = 0; i < size; i++) { X- data[0][i] = pow ((gdouble) i / size, 1.0 / gamma) * X+ data[0][i] = pow ((gdouble) i / size, 1.0 / cd_gamma) * X 0xffff * white_point.R; X- data[1][i] = pow ((gdouble) i / size, 1.0 / gamma) * X+ data[1][i] = pow ((gdouble) i / size, 1.0 / cd_gamma) * X 0xffff * white_point.G; X- data[2][i] = pow ((gdouble) i / size, 1.0 / gamma) * X+ data[2][i] = pow ((gdouble) i / size, 1.0 / cd_gamma) * X 0xffff * white_point.B; X } X 3b6f3361ca4a94ef3cf4e49846458fdc echo x - colord/files/patch-configure sed 's/^X//' >colord/files/patch-configure << 'cf94e6789351814e5fa61840f37b5c92' X--- configure.orig 2013-04-11 10:05:05.000000000 +0000 X+++ configure 2013-04-11 10:06:38.000000000 +0000 X@@ -17763,7 +17763,7 @@ X fi X X # per-machine directory X-CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/lib/colord/icc" X+CD_SYSTEM_PROFILES_DIR="\$(localstatedir)/db/colord/icc" X X X 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" cf94e6789351814e5fa61840f37b5c92 echo x - colord/files/patch-lib_colord_cd-icc_c sed 's/^X//' >colord/files/patch-lib_colord_cd-icc_c << '7c64cc72fba81baf407d6cc502ed2fca' X$OpenBSD: patch-lib_colord_cd-icc_c,v 1.1 2013/03/31 19:41:23 ajacoutot Exp $ X XFrom e13946311e57981d060225a3ec67a76e825d0248 Mon Sep 17 00:00:00 2001 XFrom: Richard Hughes XDate: Thu, 28 Mar 2013 14:42:39 +0000 XSubject: [PATCH] trivial: Add a gobject-introspection element-type X XFrom 9f7ef87460b4b40103c59ea8a3839dc8706a7d53 Mon Sep 17 00:00:00 2001 XFrom: Richard Hughes XDate: Thu, 28 Mar 2013 14:43:45 +0000 XSubject: [PATCH] trivial: Sanity check the written profile size to be less than 16Mb X XFrom 653d0569dd960f607b58ec6b9ee91bf867fdb039 Mon Sep 17 00:00:00 2001 XFrom: Richard Hughes XDate: Thu, 28 Mar 2013 14:44:38 +0000 XSubject: [PATCH] trivial: Be more paranoid when writing ICC wchar_t values X XFrom 085b32b6ca9802bbfce509fcb5bf8bf231afaa48 Mon Sep 17 00:00:00 2001 XFrom: Richard Hughes XDate: Thu, 28 Mar 2013 15:24:00 +0000 XSubject: [PATCH] Ensure mbstowcs() has an LC_CTYPE of 'en_US.UTF-8' X X--- lib/colord/cd-icc.c.orig Sun Mar 31 21:33:15 2013 X+++ lib/colord/cd-icc.c Sun Mar 31 21:33:47 2013 X@@ -28,6 +28,7 @@ X X #include X #include X+#include X #include X #include X X@@ -813,10 +814,14 @@ out: X static wchar_t * X utf8_to_wchar_t (const char *src) X { X+ const gchar *orig_locale; X gssize len; X gssize converted; X wchar_t *buf = NULL; X X+ /* switch the locale to a known UTF-8 LC_CTYPE */ X+ orig_locale = setlocale (LC_CTYPE, NULL); X+ setlocale (LC_CTYPE, "en_US.UTF-8"); X len = mbstowcs (NULL, src, 0); X if (len < 0) { X g_warning ("Invalid UTF-8 in string %s", src); X@@ -828,28 +833,49 @@ utf8_to_wchar_t (const char *src) X g_assert (converted != -1); X buf[converted] = '\0'; X out: X+ setlocale (LC_CTYPE, orig_locale); X return buf; X } X X /** X- * _cmsDictAddEntryAscii: X+ * cd_util_write_dict_entry: X **/ X-static cmsBool X-_cmsDictAddEntryAscii (cmsHANDLE dict, X- const gchar *key, X- const gchar *value) X+static gboolean X+cd_util_write_dict_entry (cmsHANDLE dict, X+ const gchar *key, X+ const gchar *value, X+ GError **error) X { X- cmsBool ret = FALSE; X+ gboolean ret = FALSE; X wchar_t *mb_key = NULL; X wchar_t *mb_value = NULL; X X mb_key = utf8_to_wchar_t (key); X- if (mb_key == NULL) X+ if (mb_key == NULL) { X+ g_set_error (error, X+ CD_ICC_ERROR, X+ CD_ICC_ERROR_FAILED_TO_SAVE, X+ "Failed to write invalid ASCII key: '%s'", X+ key); X goto out; X+ } X mb_value = utf8_to_wchar_t (value); X- if (mb_value == NULL) X+ if (mb_value == NULL) { X+ g_set_error (error, X+ CD_ICC_ERROR, X+ CD_ICC_ERROR_FAILED_TO_SAVE, X+ "Failed to write invalid ASCII value: '%s'", X+ value); X goto out; X+ } X ret = cmsDictAddEntry (dict, mb_key, mb_value, NULL, NULL); X+ if (!ret) { X+ g_set_error_literal (error, X+ CD_ICC_ERROR, X+ CD_ICC_ERROR_FAILED_TO_SAVE, X+ "Failed to write dict entry"); X+ goto out; X+ } X out: X g_free (mb_key); X g_free (mb_value); X@@ -889,8 +915,11 @@ cd_util_mlu_object_parse (const gchar *locale, const g X X /* untranslated version */ X if (locale == NULL || locale[0] == '\0') { X+ wtext = utf8_to_wchar_t (utf8_text); X+ if (wtext == NULL) X+ goto out; X obj = g_new0 (CdMluObject, 1); X- obj->wtext = utf8_to_wchar_t (utf8_text); X+ obj->wtext = wtext; X goto out; X } X X@@ -946,6 +975,7 @@ cd_util_write_tag_localized (CdIcc *icc, X CdMluObject *obj; X cmsMLU *mlu = NULL; X const gchar *locale; X+ const gchar *value; X gboolean ret = TRUE; X GList *keys; X GList *l; X@@ -957,10 +987,13 @@ cd_util_write_tag_localized (CdIcc *icc, X array = g_ptr_array_new_with_free_func (cd_util_mlu_object_free); X for (l = keys; l != NULL; l = l->next) { X locale = l->data; X- obj = cd_util_mlu_object_parse (locale, X- g_hash_table_lookup (hash, locale)); X- if (obj == NULL) X+ value = g_hash_table_lookup (hash, locale); X+ obj = cd_util_mlu_object_parse (locale, value); X+ if (obj == NULL) { X+ g_warning ("failed to parse localized text: %s[%s]", X+ value, locale); X continue; X+ } X g_ptr_array_add (array, obj); X } X X@@ -1053,7 +1086,7 @@ cd_icc_save_file (CdIcc *icc, X GError *error_local = NULL; X GList *l; X GList *md_keys = NULL; X- gsize length; X+ gsize length = 0; X guint i; X X g_return_val_if_fail (CD_IS_ICC (icc), FALSE); X@@ -1089,7 +1122,10 @@ cd_icc_save_file (CdIcc *icc, X for (l = md_keys; l != NULL; l = l->next) { X key = l->data; X value = g_hash_table_lookup (priv->metadata, key); X- _cmsDictAddEntryAscii (dict, key, value); X+ ret = cd_util_write_dict_entry (dict, key, X+ value, error); X+ if (!ret) X+ goto out; X } X } X ret = cmsWriteTag (priv->lcms_profile, cmsSigMetaTag, dict); X@@ -1152,6 +1188,18 @@ cd_icc_save_file (CdIcc *icc, X goto out; X } X X+ /* sanity check to 16Mb */ X+ if (length == 0 || length > 16 * 1024 * 1024) { X+ ret = FALSE; X+ g_set_error (error, X+ CD_ICC_ERROR, X+ CD_ICC_ERROR_FAILED_TO_SAVE, X+ "failed to save ICC file, requested %" G_GSIZE_FORMAT X+ "bytes and limit is 16Mb", X+ length); X+ goto out; X+ } X+ X /* allocate and get profile data */ X data = g_new0 (gchar, length); X ret = cmsSaveProfileToMem (priv->lcms_profile, X@@ -1648,7 +1696,7 @@ out: X * This function will only return results if the profile was loaded with the X * %CD_ICC_LOAD_FLAGS_NAMED_COLORS flag. X * X- * Return value: (transfer container): An array of #CdColorSwatch X+ * Return value: (transfer container) (element-type CdColorSwatch): An array of color swatches X * X * Since: 0.1.32 X **/ 7c64cc72fba81baf407d6cc502ed2fca echo x - colord/files/patch-src_Makefile_in sed 's/^X//' >colord/files/patch-src_Makefile_in << '103b8d818e7d3616ea861947ed8dd4d0' X$OpenBSD: patch-src_Makefile_in,v 1.6 2013/03/31 19:41:23 ajacoutot Exp $ X--- src/Makefile.in.orig Thu Mar 28 11:16:10 2013 X+++ src/Makefile.in Sat Mar 30 16:25:48 2013 X@@ -1774,11 +1774,6 @@ cd-resources.h: colord.gresource.xml X $(srcdir)/colord.gresource.xml X X install-data-hook: X- if test -w $(DESTDIR)$(prefix)/; then \ X- mkdir -p $(DESTDIR)$(CD_SYSTEM_PROFILES_DIR); \ X- chown $(daemon_user) $(DESTDIR)$(localstatedir)/lib/colord; \ X- chmod 0755 $(DESTDIR)$(localstatedir)/lib/colord; \ X- fi X X -include $(top_srcdir)/git.mk X 103b8d818e7d3616ea861947ed8dd4d0 echo c - colord-gtk/ mkdir -p colord-gtk/ > /dev/null 2>&1 echo x - colord-gtk/Makefile sed 's/^X//' >colord-gtk/Makefile << 'c0c85f1613f29cf5c43153c35e87eff3' X# Created by: Koop Mast X# $FreeBSD$ X# $MCom$ X XPORTNAME= colord-gtk XPORTVERSION= 0.1.25 XCATEGORIES= graphics XMASTER_SITES= http://www.freedesktop.org/software/colord/releases/ X XMAINTAINER= kwm@FreeBSD.org XCOMMENT= Manage color profiles to accurately color input/output devices X XBUILD_DEPENDS= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection XLIB_DEPENDS= colord:${PORTSDIR}/graphics/colord \ X polkit-gobject-1:${PORTSDIR}/sysutils/polkit \ X dbus-1:${PORTSDIR}/devel/dbus \ X lcms2:${PORTSDIR}/graphics/lcms2 X X#USERS= colord X#GROUPS= colord X XUSE_XZ= yes XUSES= pathfix XUSE_GNOME= gnomehier gtk30 intlhack XUSE_PKGCONFIG= build XUSE_GMAKE= yes XUSE_GETTEXT= yes XUSE_SQLITE= 3 XGNU_CONFIGURE= yes XUSE_LDCONFIG= yes X#MAKE_JOBS_UNSAFE=yes XCONFIGURE_ARGS= --enable-gtk-doc-html=no XCPPFLAGS+= -I${LOCALBASE}/include XLDFLAGS+= -L${LOCALBASE}/lib X X#OPTIONS_DEFINE= MANPAGES X X.include X X.if ${PORT_OPTIONS:MMANPAGES} XBUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \ X ${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 XMAN1= cd-create-profile.1 cd-fix-profile.1 colormgr.1 X.endif X Xpost-patch: X @${REINPLACE_CMD} -e 's|-Wclobbered||g' \ X -e 's|-Wempty-body||g' \ X -e 's|-Wignored-qualifiers||g' \ X -e 's|-Wtype-limits||g' \ X -e 's|-Wmissing-parameter-type||g' \ X ${WRKSRC}/configure X# -e 's|LIBS="-lusb-1.0|LIBS="-lusb|g' \ X#.if ! ${PORT_OPTIONS:MMANPAGES} X# @${REINPLACE_CMD} -e "s|2MAN_TRUE=$$|2MAN_TRUE='#'|g ; \ X# s|2MAN_FALSE='#'|2MAN_FALSE=|g" ${WRKSRC}/configure X#.endif X X.include c0c85f1613f29cf5c43153c35e87eff3 echo x - colord-gtk/distinfo sed 's/^X//' >colord-gtk/distinfo << '6ea5d6c4b5d8fb657744281d15d543df' XSHA256 (colord-gtk-0.1.25.tar.xz) = bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a XSIZE (colord-gtk-0.1.25.tar.xz) = 271192 6ea5d6c4b5d8fb657744281d15d543df echo x - colord-gtk/pkg-descr sed 's/^X//' >colord-gtk/pkg-descr << '86976c56dcc62cedbc335b9bce5e6958' XGtk3 widget for the colord system service. X XWWW: http://www.freedesktop.org/software/colord 86976c56dcc62cedbc335b9bce5e6958 echo x - colord-gtk/pkg-plist sed 's/^X//' >colord-gtk/pkg-plist << 'd240d6836a14d28793076e8f7da3f624' Xinclude/colord-1/colord-gtk.h Xinclude/colord-1/colord-gtk/cd-sample-widget.h Xinclude/colord-1/colord-gtk/cd-sample-window.h Xinclude/colord-1/colord-gtk/cd-version.h Xinclude/colord-1/colord-gtk/cd-window-sync.h Xinclude/colord-1/colord-gtk/cd-window.h Xlib/girepository-1.0/ColordGtk-1.0.typelib Xlib/libcolord-gtk.a Xlib/libcolord-gtk.la Xlib/libcolord-gtk.so Xlib/libcolord-gtk.so.1 Xlibdata/pkgconfig/colord-gtk.pc Xshare/gir-1.0/ColordGtk-1.0.gir Xshare/locale/en_GB/LC_MESSAGES/colord-gtk.mo X@dirrmtry include/colord-1/colord-gtk d240d6836a14d28793076e8f7da3f624 exit