Date: Tue, 6 Nov 2018 15:42:38 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r484301 - in branches/2018Q4/devel/glib20: . files Message-ID: <201811061542.wA6Fgc5d012334@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Nov 6 15:42:38 2018 New Revision: 484301 URL: https://svnweb.freebsd.org/changeset/ports/484301 Log: MFH: r483878 devel/glib20: revert to old g_convert() behavior PR: 232073 Reported by: many (via inkscape) Suggested by: tijl Tested by: glib/tests/convert Approved by: ports-secteam blanket Added: branches/2018Q4/devel/glib20/files/patch-revert-8abf3a0 - copied unchanged from r483878, head/devel/glib20/files/patch-revert-8abf3a0 Modified: branches/2018Q4/devel/glib20/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/glib20/Makefile ============================================================================== --- branches/2018Q4/devel/glib20/Makefile Tue Nov 6 15:38:49 2018 (r484300) +++ branches/2018Q4/devel/glib20/Makefile Tue Nov 6 15:42:38 2018 (r484301) @@ -3,7 +3,7 @@ PORTNAME= glib PORTVERSION= 2.56.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= GNOME Copied: branches/2018Q4/devel/glib20/files/patch-revert-8abf3a0 (from r483878, head/devel/glib20/files/patch-revert-8abf3a0) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/glib20/files/patch-revert-8abf3a0 Tue Nov 6 15:42:38 2018 (r484301, copy of r483878, head/devel/glib20/files/patch-revert-8abf3a0) @@ -0,0 +1,61 @@ +Revert https://gitlab.gnome.org/GNOME/glib/commit/8abf3a04e699 for +breaking at least graphics/inkscape as wchar_t is locale-dependent. + +--- glib/gconvert.c.orig 2018-03-12 16:23:37 UTC ++++ glib/gconvert.c +@@ -264,13 +264,6 @@ g_iconv_open (const gchar *to_codeset, + * GLib provides g_convert() and g_locale_to_utf8() which are likely + * more convenient than the raw iconv wrappers. + * +- * Note that the behaviour of iconv() for characters which are valid in the +- * input character set, but which have no representation in the output character +- * set, is implementation defined. This function may return success (with a +- * positive number of non-reversible conversions as replacement characters were +- * used), or it may return -1 and set an error such as %EILSEQ, in such a +- * situation. +- * + * Returns: count of non-reversible conversions, or -1 on error + **/ + gsize +@@ -379,14 +372,6 @@ close_converter (GIConv cd) + * character until it knows that the next character is not a mark that + * could combine with the base character.) + * +- * Characters which are valid in the input character set, but which have no +- * representation in the output character set will result in a +- * %G_CONVERT_ERROR_ILLEGAL_SEQUENCE error. This is in contrast to the iconv() +- * specification, which leaves this behaviour implementation defined. Note that +- * this is the same error code as is returned for an invalid byte sequence in +- * the input character set. To get defined behaviour for conversion of +- * unrepresentable characters, use g_convert_with_fallback(). +- * + * Returns: (array length=bytes_written) (element-type guint8) (transfer full): + * If the conversion was successful, a newly allocated buffer + * containing the converted string, which must be freed with +@@ -466,13 +451,6 @@ g_convert_with_iconv (const gchar *str, + break; + } + } +- else if (err > 0) +- { +- /* @err gives the number of replacement characters used. */ +- g_set_error_literal (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, +- _("Unrepresentable character in conversion input")); +- have_error = TRUE; +- } + else + { + if (!reset) +--- glib/gconvert.h.orig 2018-02-06 15:44:20 UTC ++++ glib/gconvert.h +@@ -37,9 +37,7 @@ G_BEGIN_DECLS + * GConvertError: + * @G_CONVERT_ERROR_NO_CONVERSION: Conversion between the requested character + * sets is not supported. +- * @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion input; +- * or the character sequence could not be represented in the target +- * character set. ++ * @G_CONVERT_ERROR_ILLEGAL_SEQUENCE: Invalid byte sequence in conversion input. + * @G_CONVERT_ERROR_FAILED: Conversion failed for some reason. + * @G_CONVERT_ERROR_PARTIAL_INPUT: Partial character sequence at end of input. + * @G_CONVERT_ERROR_BAD_URI: URI is invalid.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811061542.wA6Fgc5d012334>