[Midnightbsd-cvs] mports [24734] trunk/devel/glib20/files/patch-revert-8abf3a0: glib20 2.56.3

[laffer1 at midnightbsd.org]

Revision: 24734
          http://svnweb.midnightbsd.org/mports/?rev=24734
Author:   laffer1
Date:     2018-12-08 01:40:50 -0500 (Sat, 08 Dec 2018)
Log Message:
-----------
glib20 2.56.3

Added Paths:
-----------
    trunk/devel/glib20/files/patch-revert-8abf3a0

Added: trunk/devel/glib20/files/patch-revert-8abf3a0
===================================================================
--- trunk/devel/glib20/files/patch-revert-8abf3a0	                        (rev 0)
+++ trunk/devel/glib20/files/patch-revert-8abf3a0	2018-12-08 06:40:50 UTC (rev 24734)
@@ -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.


Property changes on: trunk/devel/glib20/files/patch-revert-8abf3a0
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property