Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=01ab02acdb0de9614bda9af03b97bf3a030b049c
commit 01ab02acdb0de9614bda9af03b97bf3a030b049c Author: Baste <[email protected]> Date: Thu Apr 18 09:08:06 2013 +0200 colord-0.1.33-1-x86_64 * Re Add enable-print-profiles diff --git a/source/xlib/colord/FrugalBuild b/source/xlib/colord/FrugalBuild index 687b7ea..74591df 100644 --- a/source/xlib/colord/FrugalBuild +++ b/source/xlib/colord/FrugalBuild @@ -18,7 +18,7 @@ source=("$url/releases/$pkgname-$pkgver.tar.xz" "sensor.rules.patch") up2date="Flasttar http://www.freedesktop.org/software/colord/releases/"; sha1sums=('41888fc853e033302c59539777b09317a7e1ab3d' \ 'f1a60fb79faf635aab129fae5aaf347517c00d72') -# Disable this options for test build -#Fconfopts+=" --enable-print-profiles" Fconfopts+=" --with-daemon-user=colord --enable-vala" +# Disable this options for test build +Fconfopts+=" --enable-print-profiles" # optimization OK diff --git a/source/xlib/colord/master-git.patch b/source/xlib/colord/master-git.patch deleted file mode 100644 index 3c5c6ee..0000000 --- a/source/xlib/colord/master-git.patch +++ /dev/null @@ -1,180 +0,0 @@ ---- lib/colord/cd-icc.c -+++ lib/colord/cd-icc_fw.c -@@ -28,6 +28,7 @@ - - #include <glib.h> - #include <lcms2.h> -+#include <locale.h> - #include <string.h> - #include <stdlib.h> - -@@ -813,10 +814,14 @@ - 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 @@ - g_assert (converted != -1); - buf[converted] = '\0'; - out: -+ setlocale (LC_CTYPE, orig_locale); - return buf; - } - - /** -- * _cmsDictAddEntryAscii: -- **/ --static cmsBool --_cmsDictAddEntryAscii (cmsHANDLE dict, -- const gchar *key, -- const gchar *value) --{ -- cmsBool ret = FALSE; -+ * cd_util_write_dict_entry: -+ **/ -+static gboolean -+cd_util_write_dict_entry (cmsHANDLE dict, -+ const gchar *key, -+ const gchar *value, -+ GError **error) -+{ -+ gboolean ret = FALSE; - wchar_t *mb_key = NULL; - wchar_t *mb_value = NULL; - - mb_key = utf8_to_wchar_t (key); -- if (mb_key == NULL) -- goto out; -+ 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) -- goto out; -+ 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 @@ - - /* 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 @@ - CdMluObject *obj; - cmsMLU *mlu = NULL; - const gchar *locale; -+ const gchar *value; - gboolean ret = TRUE; - GList *keys; - GList *l; -@@ -957,10 +987,13 @@ - 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 @@ - 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 @@ - 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); -@@ -1149,6 +1185,18 @@ - CD_ICC_ERROR, - CD_ICC_ERROR_FAILED_TO_SAVE, - "failed to dump ICC file"); -+ 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; - } - -@@ -1648,7 +1696,7 @@ - * 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 - **/ -@@ -2614,3 +2662,4 @@ - icc = g_object_new (CD_TYPE_ICC, NULL); - return CD_ICC (icc); - } -+ - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
