Re: pkg/32945: sysutils/xfce4-fm fails to compile on Darwin because of linking against -lintl and -liconv

[joerg%britannica.bec.de@localhost]

The following reply was made to PR pkg/32945; it has been noted by GNATS.

From: joerg%britannica.bec.de@localhost
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/32945: sysutils/xfce4-fm fails to compile on Darwin because of 
linking against -lintl and -liconv
Date: Tue, 28 Feb 2006 16:38:21 +0100

 --ZPt4rx8FFjLCG7dd
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 On Tue, Feb 28, 2006 at 01:10:00AM +0000, alex%foxybanana.com@localhost wrote:
 > ld: warning multiple definitions of symbol _locale_charset
 > /usr/pkgsrc/sysutils/xfce4-fm/work/.x11-buildlink/lib/libintl.dylib(localcharset.o)
 >  definition of _locale_charset
 > /usr/lib/libiconv.dylib(localcharset.o) definition of _locale_charset
 
 Can you try the attached patch for gettext-lib and see if that (a) fixes
 this issue and (b) doesn't add new problems.
 
 Joerg
 
 --ZPt4rx8FFjLCG7dd
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="gettext-lib.diff"
 
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/devel/gettext-lib/distinfo,v
 retrieving revision 1.10
 diff -u -r1.10 distinfo
 --- distinfo   5 Feb 2006 22:45:54 -0000       1.10
 +++ distinfo   28 Feb 2006 15:38:13 -0000
 @@ -3,5 +3,6 @@
  SHA1 (gettext-0.14.5.tar.gz) = 68737eee1a6427044eef901dc88e4144d371fb6b
  RMD160 (gettext-0.14.5.tar.gz) = d31c8e49671f00623ce1e6f73716a5abcd1c7ec2
  Size (gettext-0.14.5.tar.gz) = 7105715 bytes
 +SHA1 (patch-aa) = 3ec55e1599bc6f0c19cf2cb12ae62ffff4115ca2
  SHA1 (patch-ab) = 2195304902fe17cd97c243a6bc395de1484a50c4
  SHA1 (patch-ac) = f7695a44cdb85a4f6d9b97872425acb4b74519c9
 Index: patches/patch-aa
 ===================================================================
 RCS file: patches/patch-aa
 diff -N patches/patch-aa
 --- /dev/null  1 Jan 1970 00:00:00 -0000
 +++ patches/patch-aa   28 Feb 2006 15:38:13 -0000
 @@ -0,0 +1,19 @@
 +$NetBSD$
 +
 +--- intl/localcharset.c.orig  2006-02-28 15:22:04.000000000 +0000
 ++++ intl/localcharset.c
 +@@ -269,6 +269,8 @@ get_charset_aliases ()
 +   return cp;
 + }
 + 
 ++#ifndef __APPLE__ /* Provided by libiconv on OS X and Darwin */
 ++
 + /* Determine the current locale's character encoding, and canonicalize it
 +    into one of the canonical names listed in config.charset.
 +    The result must not be freed; it is statically allocated.
 +@@ -407,3 +409,5 @@ locale_charset ()
 + 
 +   return codeset;
 + }
 ++
 ++#endif
 
 --ZPt4rx8FFjLCG7dd--