[gtk-osx] Patch around gettext bug 33999

[John Ralls <jralls src gnome org>]

commit 1d55f012b01e1feb68f80b1f3d85cb855d1c3b4d
Author: John Ralls <jralls ceridwen us>
Date:   Tue Oct 4 11:40:35 2011 -0700

    Patch around gettext bug 33999

 modulesets-stable/bootstrap.modules    |    4 ++
 patches/gettext-bug33999-stpncpy.patch |   70 ++++++++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 0 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 92e68a2..545661b 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -11,6 +11,9 @@
       href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="xmlsoft.org"
 	      href="ftp://xmlsoft.org/libxml2/"/>
+  <repository type="tarball" name="tukaani.org"
+	      href="http://tukaani.org/"/>
+
 
   <autotools id='libiconv' autogen-sh='configure'>
     <branch module="libiconv/libiconv-1.13.1.tar.gz" version="1.1.3.1"
@@ -22,6 +25,7 @@
     <branch repo="ftp.gnu.org"
 	    module="gettext/gettext-0.18.1.1.tar.gz" version="0.18.1.1"
             size="15139737" md5sum="3dd55b952826d2b32f51308f2f91aa89">
+      <patch href="http://git.gnome.org/browse/gtk-osx/plain/patches/gettext-bug3399-stpncpy.patch"; strip="1"/>
     </branch>
     <dependencies>
       <dep package="libiconv"/>
diff --git a/patches/gettext-bug33999-stpncpy.patch b/patches/gettext-bug33999-stpncpy.patch
new file mode 100644
index 0000000..b2f1a32
--- /dev/null
+++ b/patches/gettext-bug33999-stpncpy.patch
@@ -0,0 +1,70 @@
+From c5728261c324a75f8d23dd7d10cb42dde9420227 Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno clisp org>
+Date: Mon, 16 Aug 2010 02:09:11 +0200
+Subject: [PATCH] stpncpy: Allow stpncpy to be defined as a macro.
+
+---
+ ChangeLog       |    8 ++++++++
+ lib/string.in.h |    1 +
+ m4/stpncpy.m4   |    5 ++++-
+ 3 files changed, 13 insertions(+), 1 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index d86bbc3..86de94d 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,11 @@
++2010-08-15  Bruno Haible  <bruno clisp org>
++
++	stpncpy: Allow stpncpy to be defined as a macro.
++	* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Don't attempt to redeclare stpncpy
++	if it's already correctly declared.
++	* lib/string.in.h (stpncpy): Undefine before redefining.
++	Reported by Jeremy Huddleston <jeremyhu macports org>.
++
+ 2010-08-14  Bruno Haible  <bruno clisp org>
+ 
+ 	Rename module 'memxfrm' to 'amemxfrm'.
+diff --git a/lib/string.in.h b/lib/string.in.h
+index fb73770..bb6aa58 100644
+--- a/lib/string.in.h
++++ b/lib/string.in.h
+@@ -233,6 +233,7 @@ _GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - "
+ #if @GNULIB_STPNCPY@
+ # if @REPLACE_STPNCPY@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
++#   undef stpncpy
+ #   define stpncpy rpl_stpncpy
+ #  endif
+ _GL_FUNCDECL_RPL (stpncpy, char *,
+diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4
+index d2344ac..158cc08 100644
+--- a/m4/stpncpy.m4
++++ b/m4/stpncpy.m4
+@@ -1,4 +1,4 @@
+-# stpncpy.m4 serial 11
++# stpncpy.m4 serial 12
+ dnl Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software Foundation,
+ dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+@@ -25,6 +25,7 @@ AC_DEFUN([gl_FUNC_STPNCPY],
+   dnl   in AIX:     dest + max(0,n-1)
+   dnl Only the glibc return value is useful in practice.
+ 
++  AC_CHECK_DECLS_ONCE([stpncpy])
+   AC_CHECK_FUNCS_ONCE([stpncpy])
+   if test $ac_cv_func_stpncpy = yes; then
+     AC_CACHE_CHECK([for working stpncpy], [gl_cv_func_stpncpy], [
+@@ -32,7 +33,9 @@ AC_DEFUN([gl_FUNC_STPNCPY],
+ #include <stdlib.h>
+ #include <string.h> /* for strcpy */
+ /* The stpncpy prototype is missing in <string.h> on AIX 4.  */
++#if !HAVE_DECL_STPNCPY
+ extern char *stpncpy (char *dest, const char *src, size_t n);
++#endif
+ int main () {
+   const char *src = "Hello";
+   char dest[10];
+-- 
+1.7.2.5
+