contribs: update gettext to 0.18

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
(cherry picked from commit 286d3083)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

extras/contrib/src/Makefile

@@ -376,9 +376,6 @@ gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz
 	$(EXTRACT_GZ)
-ifdef HAVE_WIN32
-	patch -p0 < Patches/gettext-win32.patch
-endif
 ifdef HAVE_DARWIN_OS
 	patch -p0 < Patches/gettext-macosx.patch
 endif
@@ -392,18 +389,18 @@ endif
 ifneq ($(HOST),$(BUILD))
   ifndef HAVE_CYGWIN
     # We'll use the installed gettext and only need to cross-compile libintl, also build autopoint and gettextsize tools need for VLC bootstrap
-	( cd $< && make -C gettext-runtime/intl && patch -p1 < ../Patches/libintl.patch && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
+	( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install )
   else
     # We are compiling for MinGW on Cygwin -- build the full current gettext
-	( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
+	( cd $< && make && make install )
   endif
 else
 # Build and install the whole gettext
-	( cd $< && make && patch -p1 < ../Patches/libintl.patch && make install )
+	( cd $< && make && make install )
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-	(cd $(PREFIX)/include; sed -i.orig '311 c #if 0' libintl.h)
+	(cd $(PREFIX)/include; sed -i.orig '314 c #if 0' libintl.h)
 endif
 	$(INSTALL_NAME)
 	touch $@

extras/contrib/src/Patches/gettext-win32.patch

---- gettext-0.17/gettext-runtime/intl/Makefile.in	2007-11-04 21:21:12.000000000 +0000
-+++ gettext/gettext-runtime/intl/Makefile.in	2008-03-07 18:14:53.000000000 +0000
-@@ -280,15 +280,7 @@
- # so that they work with the sed-3.02 that is shipped with MSYS. We can use
- # GNU bash's $'\n' syntax to obtain such a newline.
- libintl.res: $(srcdir)/libintl.rc
--	nl=$$'\n'; \
--	sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
--	sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
--	sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
--	$(WINDRES) \
--	  "-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \
--	  "-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \
--	  "-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \
--	  "-DPACKAGE_VERSION_SUBMINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_subminor"` \
-+	$(WINDRES) --use-temp-file `$(top_srcdir)/../windows/windres-options --escape $(VERSION)`\
- 	  -i $(srcdir)/libintl.rc -o libintl.res --output-format=coff
- 
- ref-add.sed: $(srcdir)/ref-add.sin
---- gettext-0.17/gettext-runtime/intl/libintl.rc        2007-05-27 21:46:52.000000000 +0000
-+++ gettext/gettext-runtime/intl/libintl.rc     2009-05-18 18:09:12.000000000 +0000
-@@ -22,13 +22,13 @@
-             VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License. You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA\0"
-             VALUE "CompanyName", "Free Software Foundation\0"
-             VALUE "FileDescription", "LGPLed libintl for Windows NT/2000/XP/Vista and Windows 95/98/ME\0"
--            VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
-+            VALUE "FileVersion", "\0"
-             VALUE "InternalName", "intl.dll\0"
-             VALUE "LegalCopyright", "Copyright (C) 1995-2007\0"
-             VALUE "LegalTrademarks", "\0"
-             VALUE "OriginalFilename", "intl.dll\0"
-             VALUE "ProductName", "libintl: accessing NLS message catalogs\0"
--            VALUE "ProductVersion", PACKAGE_VERSION_STRING "\0"
-+            VALUE "ProductVersion", "\0"
-         END
-     END
-     BLOCK "VarFileInfo"

extras/contrib/src/Patches/libintl.patch

---- gettext/gettext-runtime/intl/libgnuintl.h.in	2006-12-03 17:42:40.265625000 -0500
-+++ gettext/gettext-runtime/intl/libgnuintl.h.in	2006-12-04 19:27:03.125000000 -0500
-@@ -88,7 +88,7 @@
-    If he doesn't, we choose the method.  A third possible method is
-    _INTL_REDIRECT_ASM, supported only by GCC.  */
- #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
--# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-+# if __GNUC__ >= 2 && !((defined __APPLE_CC__) && (__APPLE_CC__ > 1)) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
- #  define _INTL_REDIRECT_ASM
- # else
- #  ifdef __cplusplus
-@@ -110,7 +110,7 @@
- /* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
-    its n-th argument literally.  This enables GCC to warn for example about
-    printf (gettext ("foo %y")).  */
--#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus)
-+#if __GNUC__ >= 3 && !((defined __APPLE_CC__) && (__APPLE_CC__ > 1) && defined __cplusplus)
- # define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
- #else
- # define _INTL_MAY_RETURN_STRING_ARG(n)
-

extras/contrib/src/packages.mak

@@ -50,7 +50,7 @@ PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-$(PKGCFG_VERSION
 LIBICONV_VERSION=1.13.1
 LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
 LIBICONVMAC_URL=$(CONTRIB_VIDEOLAN)/libiconv-snowleopard.tar.bz2
-GETTEXT_VERSION=0.17
+GETTEXT_VERSION=0.18
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 FONTCONFIG_VERSION=2.7.3
 FONTCONFIG_URL=$(CONTRIB_VIDEOLAN)/fontconfig-$(FONTCONFIG_VERSION).tar.gz