[vlc-commits] Contribs: update gettext to 0.18.2.1

[Jean-Baptiste Kempf]

vlc/vlc-2.0 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Mar 10 12:05:26 2013 +0100| [339a8c1949681673e3674a5a034941be4cdb97bd] | committer: Jean-Baptiste Kempf

Contribs: update gettext to 0.18.2.1
(cherry picked from commit 934352c0bceda5a10c501aa6d0c278eb211a3995)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=339a8c1949681673e3674a5a034941be4cdb97bd
---

 contrib/src/gettext/SHA512SUMS           |    2 +-
 contrib/src/gettext/alloca.patch         |   13 ------------
 contrib/src/gettext/gettext-macosx.patch |   34 ------------------------------
 contrib/src/gettext/rules.mak            |    6 +-----
 4 files changed, 2 insertions(+), 53 deletions(-)

diff --git a/contrib/src/gettext/SHA512SUMS b/contrib/src/gettext/SHA512SUMS
index e472947..a8f1b1f 100644
--- a/contrib/src/gettext/SHA512SUMS
+++ b/contrib/src/gettext/SHA512SUMS
@@ -1 +1 @@
-1735599307a2d12be609ecfe1141815a11af144c6b94301f6c7101242e0b628251a3613d1d70df099ec07423befeaf10dfb53b8176f710c7e158c4fc63ea8747  gettext-0.18.1.1.tar.gz
+9290efb692c25f0469fa2aec66e382603d2eb5e6873be30b3f6fea73c1c4ae99250a5d3292100316873dd7e3c791be834655ac3659e36100e8ecb128100a4235  gettext-0.18.2.1.tar.gz
diff --git a/contrib/src/gettext/alloca.patch b/contrib/src/gettext/alloca.patch
deleted file mode 100644
index bbb0f22..0000000
--- a/contrib/src/gettext/alloca.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-    
---- gettext/gettext-tools/libgrep/regex_internal.h.orig	2012-01-27 16:56:14.000000000 +0100
-+++ gettext/gettext-tools/libgrep/regex_internal.h	2012-01-27 16:53:34.000000000 +0100
-@@ -455,7 +455,9 @@
- #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
- #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
- 
-+#ifdef HAVE_ALLOCA_H
- #include <alloca.h>
-+#endif
- 
- #ifndef _LIBC
- # if HAVE_ALLOCA
diff --git a/contrib/src/gettext/gettext-macosx.patch b/contrib/src/gettext/gettext-macosx.patch
deleted file mode 100644
index 8186768..0000000
--- a/contrib/src/gettext/gettext-macosx.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- gettext/gettext-tools/src/msgmerge.c.orig	2007-10-21 03:25:52.000000000 +0200
-+++ gettext/gettext-tools/src/msgmerge.c	2008-03-23 19:54:36.000000000 +0100
-@@ -96,7 +96,7 @@
- 
- /* Update mode.  */
- static bool update_mode = false;
--static const char *version_control_string;
-+static const char *version_control_string = "none";
- static const char *backup_suffix_string;
- 
- /* Long options.  */
---- gettext/gettext-tools/configure	2010-06-06 13:12:20.000000000 -0700
-+++ gettext/gettext-tools/configure	2010-08-13 23:24:09.000000000 -0700
-@@ -40606,7 +40606,9 @@ else
- #include <stdlib.h>
- #include <string.h> /* for strcpy */
- /* The stpncpy prototype is missing in <string.h> on AIX 4.  */
-+#ifndef stpncpy
- extern char *stpncpy (char *dest, const char *src, size_t n);
-+#endif
- int main () {
-   const char *src = "Hello";
-   char dest[10];
---- gettext/gettext-tools/gnulib-lib/stpncpy.c.orig	2013-01-07 23:17:13.000000000 +0100
-+++ gettext/gettext-tools/gnulib-lib/stpncpy.c	2013-01-07 23:17:25.000000000 +0100
-@@ -24,6 +24,8 @@
- /* Specification.  */
- #include <string.h>
- 
-+#undef stpncpy
-+
- #ifndef weak_alias
- # define __stpncpy stpncpy
- #endif
diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 4f1c1eb..ae64ccb 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -1,5 +1,5 @@
 # gettext
-GETTEXT_VERSION=0.18.1.1
+GETTEXT_VERSION=0.18.2.1
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 
 PKGS += gettext
@@ -15,10 +15,6 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
 	$(UNPACK)
-	$(APPLY) $(SRC)/gettext/alloca.patch
-ifdef HAVE_MACOSX
-	$(APPLY) $(SRC)/gettext/gettext-macosx.patch
-endif
 	$(MOVE)
 
 DEPS_gettext = iconv $(DEPS_iconv)