From d0d63cbfc617a718e25c3aa1c2e53a61dd30dbf3 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Sun, 13 Jan 2008 09:30:57 +0000
Subject: Keep locale_alias symbol and don't hide it when visibility support
 exists and libiconv is compiled. This restores symmetry between libiconv.so,
 libiconv.a and libintl and fixes the build of gettext-tools on Linux. Bump
 revision.

---
 converters/libiconv/Makefile         |  3 ++-
 converters/libiconv/distinfo         |  3 ++-
 converters/libiconv/patches/patch-ad | 15 +++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 converters/libiconv/patches/patch-ad

(limited to 'converters/libiconv')

diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index bb8e42a8c7e..0464cb44e25 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2007/11/29 17:05:34 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2008/01/13 09:30:57 joerg Exp $
 
 DISTNAME=	libiconv-1.12
+PKGREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_GNU:=libiconv/}
 
diff --git a/converters/libiconv/distinfo b/converters/libiconv/distinfo
index 4944686aef1..d518f00d0a6 100644
--- a/converters/libiconv/distinfo
+++ b/converters/libiconv/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2008/01/08 22:08:36 sketch Exp $
+$NetBSD: distinfo,v 1.29 2008/01/13 09:30:57 joerg Exp $
 
 SHA1 (libiconv-1.12-cp932.patch.gz) = 7c433e19a61a15bd9585e01c0a6fbe2eb9129625
 RMD160 (libiconv-1.12-cp932.patch.gz) = 33eb9758470f5e7ca0608fc478ea1342bf6bd0dc
@@ -9,5 +9,6 @@ Size (libiconv-1.12.tar.gz) = 4513309 bytes
 SHA1 (patch-aa) = 2ae2484e92362fc3ac6ecd06f8c8bf6c634fcda9
 SHA1 (patch-ab) = d459b849adf870c345007d11a0a9dc790649adbc
 SHA1 (patch-ac) = a27e8ab5a776a2bc8b2c790eabff5c15985d9584
+SHA1 (patch-ad) = 8ca08bced3f63276c998091948d781114901bf61
 SHA1 (patch-ae) = e18c4d9dd76b27e40c8dcd273f856fe5933f72bc
 SHA1 (patch-af) = de976e1f97fa5f8b973be1a225ae3e0ee2352851
diff --git a/converters/libiconv/patches/patch-ad b/converters/libiconv/patches/patch-ad
new file mode 100644
index 00000000000..3fbe445ffd7
--- /dev/null
+++ b/converters/libiconv/patches/patch-ad
@@ -0,0 +1,15 @@
+$NetBSD: patch-ad,v 1.8 2008/01/13 09:30:57 joerg Exp $
+
+Always export locale_alias as e.g. libintl expects it.
+
+--- libcharset/include/localcharset.h.build.in.orig	2008-01-12 18:20:07.000000000 +0100
++++ libcharset/include/localcharset.h.build.in
+@@ -20,7 +20,7 @@
+ #ifndef _LOCALCHARSET_H
+ #define _LOCALCHARSET_H
+ 
+-#if @HAVE_VISIBILITY@ && BUILDING_LIBCHARSET
++#if @HAVE_VISIBILITY@
+ #define LIBCHARSET_DLL_EXPORTED __attribute__((__visibility__("default")))
+ #else
+ #define LIBCHARSET_DLL_EXPORTED
-- 
cgit v1.2.3