Date: Wed, 25 Feb 2009 16:50:15 -0500 From: Joe Marcus Clarke <marcus@marcuscom.com> To: Stanislav Sedov <stas@freebsd.org> Cc: gnome@freebsd.org Subject: Re: [FreeBSD port]: devel/glib20 Message-ID: <1235598615.3297.60.camel@shumai.marcuscom.com> In-Reply-To: <20090224021026.ba40bdc2.stas@FreeBSD.org> References: <20090224021026.ba40bdc2.stas@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-x66GZYpEVs4vQ+V8i5kT Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Tue, 2009-02-24 at 02:10 +0300, Stanislav Sedov wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 >=20 > Hi! >=20 > glib20 has a known filename encoding problem with non-utf8 > locales, because it doesn't perform names conversion from > internal UTF8 to current locale by default (it used to do > that some time ago). The patch included changes glib20 > behaviour to always do the conversion (this will work > for all non-UTF8 locales and will have no effect fot UTF8 > ones). This is effectively the same redhat & co does in > their deistributions. >=20 > Comments? I have no objection, but I don't typically run into problems with non-UTF-8 locales. I think it would be safer if you made this into an OPTION, and added this as an extra patch if the OPTION is enabled. Joe >=20 > Index: Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: /home/pcvs/ports/devel/glib20/Makefile,v > retrieving revision 1.155 > diff -u -r1.155 Makefile > - --- Makefile 10 Jan 2009 05:21:19 -0000 1.155 > +++ Makefile 23 Feb 2009 23:04:49 -0000 > @@ -9,7 +9,7 @@ > =20 > PORTNAME=3D glib > PORTVERSION=3D 2.18.4 > - -PORTREVISION?=3D 0 > +PORTREVISION?=3D 1 > CATEGORIES=3D devel > MASTER_SITES=3D ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSIO= N:C/^([0-9]+\.[0-9]+).*/\1/},} \ > ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ > Index: files/patch-glib_gconvert.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > RCS file: files/patch-glib_gconvert.c > diff -N files/patch-glib_gconvert.c > - --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ files/patch-glib_gconvert.c 23 Feb 2009 23:04:49 -0000 > @@ -0,0 +1,24 @@ > +--- glib/gconvert.c.orig 2009-02-24 01:56:33.000000000 +0300 > ++++ glib/gconvert.c 2009-02-24 01:57:01.000000000 +0300 > +@@ -1213,20 +1213,12 @@ > + } > + } > + } > +- else if (getenv ("G_BROKEN_FILENAMES") !=3D NULL) > ++ else > + { > + cache->filename_charsets =3D g_new0 (gchar *, 2); > + cache->is_utf8 =3D g_get_charset (&new_charset); > + cache->filename_charsets[0] =3D g_strdup (new_charset); > + } > +- else=20 > +- { > +- cache->filename_charsets =3D g_new0 (gchar *, 3); > +- cache->is_utf8 =3D TRUE; > +- cache->filename_charsets[0] =3D g_strdup ("UTF-8"); > +- if (!g_get_charset (&new_charset)) > +- cache->filename_charsets[1] =3D g_strdup (new_charset); > +- } > + } > +=20 > + if (filename_charsets) >=20 >=20 > - --=20 > Stanislav Sedov > ST4096-RIPE > -----BEGIN PGP SIGNATURE----- >=20 > iEYEARECAAYFAkmjLOcACgkQK/VZk+smlYFtLACeI+0xr42uvMv4KEe4ar0BbtLe > fN0An1+Y8rqaI82uRotvIG9TwUcxzBpU > =3DSDFc > -----END PGP SIGNATURE----- >=20 > !DSPAM:49a32ce2967006598121310! >=20 >=20 > _______________________________________________ > freebsd-gnome@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-gnome > To unsubscribe, send any mail to "freebsd-gnome-unsubscribe@freebsd.org" >=20 --=20 PGP Key : http://www.marcuscom.com/pgp.asc --=-x66GZYpEVs4vQ+V8i5kT Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEABECAAYFAkmlvRYACgkQb2iPiv4Uz4ezLQCcDEdLWO83LCIqE/iUws1TsQRs O+4An3wRQWsBGtpqRqTHoYisRSi3IvNU =4nc+ -----END PGP SIGNATURE----- --=-x66GZYpEVs4vQ+V8i5kT--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1235598615.3297.60.camel>