Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1688113864205940"
MIME-Version: 1.0
Date: Fri, 30 Jun 2023 08:31:04 +0000
From: "Tobias Nygren" <tnn@netbsd.org>
Subject: CVS commit: pkgsrc/devel/gettext-lib
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: tnn@netbsd.org
Message-Id: <20230630083104.CDF9EFA89@cvs.NetBSD.org>

This is a multi-part message in MIME format.

--_----------=_1688113864205940
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	tnn
Date:		Fri Jun 30 08:31:04 UTC 2023

Modified Files:
	pkgsrc/devel/gettext-lib: Makefile distinfo
Added Files:
	pkgsrc/devel/gettext-lib/patches:
	    patch-gettext-runtime_intl_intl-compat.c

Log Message:
gettext-lib: make sure bindtextdomain(3) is visible on macOS. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/devel/gettext-lib/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/devel/gettext-lib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_intl_intl-compat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1688113864205940
Content-Disposition: inline
Content-Length: 2687
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/gettext-lib/Makefile
diff -u pkgsrc/devel/gettext-lib/Makefile:1.59 pkgsrc/devel/gettext-lib/Makefile:1.60
--- pkgsrc/devel/gettext-lib/Makefile:1.59	Sun Nov  3 10:39:12 2019
+++ pkgsrc/devel/gettext-lib/Makefile	Fri Jun 30 08:31:04 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2019/11/03 10:39:12 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2023/06/30 08:31:04 tnn Exp $
 
 .include "../../devel/gettext/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-lib-/}
+PKGREVISION=	1
 COMMENT=	Internationalized Message Handling Library (libintl)
 
 USE_LANGUAGES=		c

Index: pkgsrc/devel/gettext-lib/distinfo
diff -u pkgsrc/devel/gettext-lib/distinfo:1.41 pkgsrc/devel/gettext-lib/distinfo:1.42
--- pkgsrc/devel/gettext-lib/distinfo:1.41	Thu Jun 29 08:24:19 2023
+++ pkgsrc/devel/gettext-lib/distinfo	Fri Jun 30 08:31:04 2023
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.41 2023/06/29 08:24:19 adam Exp $
+$NetBSD: distinfo,v 1.42 2023/06/30 08:31:04 tnn Exp $
 
 BLAKE2s (gettext-0.22.tar.gz) = 6b3b0b9824a6c8d58b28717b2d9089ed4895bbf4a1f7b0979117d8449a28b4ba
 SHA512 (gettext-0.22.tar.gz) = e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04
 Size (gettext-0.22.tar.gz) = 26105696 bytes
 SHA1 (patch-gettext-runtime_intl_configure) = 6b873572ad946e069f2a999c5795c9618688d7a1
+SHA1 (patch-gettext-runtime_intl_intl-compat.c) = 34e7d01f425c307cec029ae67304cf788a4b8f51

Added files:

Index: pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_intl_intl-compat.c
diff -u /dev/null pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_intl_intl-compat.c:1.1
--- /dev/null	Fri Jun 30 08:31:04 2023
+++ pkgsrc/devel/gettext-lib/patches/patch-gettext-runtime_intl_intl-compat.c	Fri Jun 30 08:31:04 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-gettext-runtime_intl_intl-compat.c,v 1.1 2023/06/30 08:31:04 tnn Exp $
+
+Make sure bindtextdomain(3) is visible on macOS, as it cannot be exported otherwise:
+
+ld: warning: cannot export hidden symbol _bindtextdomain from .libs/intl-compat.o
+
+--- gettext-runtime/intl/intl-compat.c.orig	2023-06-30 08:04:29.086186639 +0000
++++ gettext-runtime/intl/intl-compat.c
+@@ -47,7 +47,7 @@
+ /* When building a DLL, we must export some functions.  Note that because
+    the functions are only defined for binary backward compatibility, we
+    don't need to use __declspec(dllimport) in any case.  */
+-#if HAVE_VISIBILITY && BUILDING_DLL
++#if HAVE_VISIBILITY && BUILDING_DLL || defined(__APPLE__)
+ # define DLL_EXPORTED __attribute__((__visibility__("default")))
+ #elif defined _MSC_VER && BUILDING_DLL
+ # define DLL_EXPORTED __declspec(dllexport)


--_----------=_1688113864205940--