From owner-freebsd-gnome@FreeBSD.ORG Mon Feb 23 23:10:28 2009 Return-Path: Delivered-To: gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D268C106564A for ; Mon, 23 Feb 2009 23:10:28 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from mx0.deglitch.com (backbone.deglitch.com [IPv6:2001:16d8:fffb:4::abba]) by mx1.freebsd.org (Postfix) with ESMTP id 86AAA8FC21 for ; Mon, 23 Feb 2009 23:10:28 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from DSPAM-Daemon (localhost [127.0.0.1]) by mx0.deglitch.com (Postfix) with SMTP id 63A0C8FC2B for ; Tue, 24 Feb 2009 02:10:26 +0300 (MSK) Received: from orion.SpringDaemons.com (drsun1.static.corbina.ru [85.21.245.235]) by mx0.deglitch.com (Postfix) with ESMTPA id 048488FC1D for ; Tue, 24 Feb 2009 02:10:26 +0300 (MSK) Received: from orion (localhost [127.0.0.1]) by orion.SpringDaemons.com (Postfix) with SMTP id 8ED7C39B1B for ; Tue, 24 Feb 2009 02:10:31 +0300 (MSK) Date: Tue, 24 Feb 2009 02:10:26 +0300 From: Stanislav Sedov To: gnome@FreeBSD.org Message-Id: <20090224021026.ba40bdc2.stas@FreeBSD.org> Organization: The FreeBSD Project X-XMPP: ssedov@jabber.ru X-Voice: +7 916 849 20 23 X-PGP-Fingerprint: F21E D6CC 5626 9609 6CE2 A385 2BF5 5993 EB26 9581 X-Mailer: carrier-pigeon Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-DSPAM-Result: Innocent X-DSPAM-Processed: Tue Feb 24 02:10:26 2009 X-DSPAM-Confidence: 1.0000 X-DSPAM-Improbability: 1 in 98689409 chance of being spam X-DSPAM-Probability: 0.0023 X-DSPAM-Signature: 49a32ce2967006598121310 Cc: Subject: [FreeBSD port]: devel/glib20 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Feb 2009 23:10:29 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi! 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. Comments? Index: Makefile =================================================================== 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 @@ PORTNAME= glib PORTVERSION= 2.18.4 - -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION: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 =================================================================== 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") != NULL) ++ else + { + cache->filename_charsets = g_new0 (gchar *, 2); + cache->is_utf8 = g_get_charset (&new_charset); + cache->filename_charsets[0] = g_strdup (new_charset); + } +- else +- { +- cache->filename_charsets = g_new0 (gchar *, 3); +- cache->is_utf8 = TRUE; +- cache->filename_charsets[0] = g_strdup ("UTF-8"); +- if (!g_get_charset (&new_charset)) +- cache->filename_charsets[1] = g_strdup (new_charset); +- } + } + + if (filename_charsets) - -- Stanislav Sedov ST4096-RIPE -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAkmjLOcACgkQK/VZk+smlYFtLACeI+0xr42uvMv4KEe4ar0BbtLe fN0An1+Y8rqaI82uRotvIG9TwUcxzBpU =SDFc -----END PGP SIGNATURE----- !DSPAM:49a32ce2967006598121310!