[vlc-commits] contrib: gettext: update to latest release 0.18.3

[Rafaël Carré]

vlc/vlc-2.1 | branch: master | Rafaël Carré <funman at videolan.org> | Mon Jul 15 10:03:48 2013 +0200| [7a8a0e0fc225d2bafcfec528726f36a1437d9d35] | committer: Jean-Baptiste Kempf

contrib: gettext: update to latest release 0.18.3

drop patch not needed anymore

(cherry picked from commit 25f3ab158f4c83ceb6b38c4280ac4bf753524766)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=7a8a0e0fc225d2bafcfec528726f36a1437d9d35
---

 contrib/src/gettext/SHA512SUMS  |    2 +-
 contrib/src/gettext/rules.mak   |    3 +--
 contrib/src/gettext/win32.patch |   11 -----------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/contrib/src/gettext/SHA512SUMS b/contrib/src/gettext/SHA512SUMS
index a8f1b1f..a22699c 100644
--- a/contrib/src/gettext/SHA512SUMS
+++ b/contrib/src/gettext/SHA512SUMS
@@ -1 +1 @@
-9290efb692c25f0469fa2aec66e382603d2eb5e6873be30b3f6fea73c1c4ae99250a5d3292100316873dd7e3c791be834655ac3659e36100e8ecb128100a4235  gettext-0.18.2.1.tar.gz
+812074a74c946c34b97efa351a3d2b1ff5b6321714e88912d188ba70c868c9d9b7263a8507514c05c1667bc5613e88d9a44569575db73dd046780824b0975bfd  gettext-0.18.3.tar.gz
diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index b594dfa..3482d8c 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -1,5 +1,5 @@
 # gettext
-GETTEXT_VERSION=0.18.2.1
+GETTEXT_VERSION=0.18.3
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 
 PKGS += gettext
@@ -15,7 +15,6 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
 
 gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
 	$(UNPACK)
-	$(APPLY) $(SRC)/gettext/win32.patch
 	$(MOVE)
 
 DEPS_gettext = iconv $(DEPS_iconv)
diff --git a/contrib/src/gettext/win32.patch b/contrib/src/gettext/win32.patch
deleted file mode 100644
index 417e73f..0000000
--- a/contrib/src/gettext/win32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gettext/gettext-runtime/gnulib-lib/msvc-inval.c.orig	2013-07-02 17:44:02.000000000 +0200
-+++ gettext/gettext-runtime/gnulib-lib/msvc-inval.c	2013-07-02 17:42:58.000000000 +0200
-@@ -28,7 +28,7 @@
- 
- # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
- 
--static void cdecl
-+static void __cdecl
- gl_msvc_invalid_parameter_handler (const wchar_t *expression,
-                                    const wchar_t *function,
-                                    const wchar_t *file,