From owner-freebsd-gnome@FreeBSD.ORG Fri Oct 5 17:32:12 2012 Return-Path: Delivered-To: gnome@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CA7E7106564A; Fri, 5 Oct 2012 17:32:12 +0000 (UTC) (envelope-from glarkin@FreeBSD.org) Received: from mail1.sourcehosting.net (mail1.sourcehosting.net [74.205.51.45]) by mx1.freebsd.org (Postfix) with ESMTP id 462D18FC08; Fri, 5 Oct 2012 17:32:11 +0000 (UTC) Received: from 24-181-237-39.dhcp.oxfr.ma.charter.com ([24.181.237.39] helo=Gregory-Larkins-iMac.local) by mail1.sourcehosting.net with esmtp (Exim 4.73 (FreeBSD)) (envelope-from ) id 1TKBku-000B5G-Dx; Fri, 05 Oct 2012 13:32:10 -0400 Received: from Gregory-Larkins-iMac.local (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by Gregory-Larkins-iMac.local (Postfix) with ESMTPS id C117816D81D3; Fri, 5 Oct 2012 13:32:07 -0400 (EDT) Message-ID: <506F1997.7090400@FreeBSD.org> Date: Fri, 05 Oct 2012 13:32:07 -0400 From: Greg Larkin Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:15.0) Gecko/20120907 Thunderbird/15.0.1 MIME-Version: 1.0 To: Alex Dupre References: <506F01C4.6040704@FreeBSD.org> <506F0B56.6060208@FreeBSD.org> <506F163F.4090403@FreeBSD.org> In-Reply-To: <506F163F.4090403@FreeBSD.org> X-Enigmail-Version: 1.4.4 X-SA-Exim-Connect-IP: 24.181.237.39 X-SA-Exim-Mail-From: glarkin@FreeBSD.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail1.sourcehosting.net X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=AWL, BAYES_00, RCVD_IN_RP_RNBL, RCVD_IN_SORBS_DUL,RDNS_DYNAMIC,TVD_RCVD_IP autolearn=no version=3.3.1 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit X-SA-Exim-Version: 4.2 X-SA-Exim-Scanned: Yes (on mail1.sourcehosting.net) Cc: gnome@FreeBSD.org, Joe Marcus Clarke , autotools@FreeBSD.org Subject: Re: charset.alias X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: glarkin@FreeBSD.org List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Oct 2012 17:32:12 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 10/5/12 1:17 PM, Alex Dupre wrote: > Greg Larkin ha scritto: >> I worked out a slightly different patch to devel/patch this >> morning and just committed it. It already uses a construct for >> inlining the charset data for certain platforms when it shouldn't >> install the charset.alias file due to package conflicts. >> >> Let me know if you see any issues with that. > > I see at least one remaining issue, i.e. you included the wrong > charset.alias (not the correct one generated by libiconv). Anyway > I think that we should always use the shared charset.alias file > instead of hardcoding the mapping in every port. > Hi Alex, I included the charset.alias data generated by the devel/patch build itself (config.charset script, IIRC), and I followed the spirit of the existing code in the application in deciding to embed it within an #if/#endif block. Since I am no expert on charsets, libiconv or gettext, please feel free to replace my fix with your patch, if that's a better long-term solution. Thank you, Greg - -- Greg Larkin http://www.FreeBSD.org/ - The Power To Serve http://www.sourcehosting.net/ - Ready. Set. Code. http://twitter.com/cpucycle/ - Follow you, follow me -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (Darwin) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iEYEARECAAYFAlBvGZcACgkQ0sRouByUApD+twCePABtm+d2g7G9JUG1fRPNm2CL y7EAoJvZInI35P+FbDp/RxVmIJ6lTntE =k9jB -----END PGP SIGNATURE-----