vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Apr 9 19:05:02 2017 +0200| [5a13ec94820012655103b672c28473abbf13918a] | committer: Jean-Baptiste Kempf
Contribs: update iconv > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5a13ec94820012655103b672c28473abbf13918a --- contrib/src/iconv/SHA512SUMS | 2 +- contrib/src/iconv/libiconv-c11.patch | 19 ------------------- contrib/src/iconv/rules.mak | 3 +-- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/contrib/src/iconv/SHA512SUMS b/contrib/src/iconv/SHA512SUMS index 78e4babf14..e2dcff1bd7 100644 --- a/contrib/src/iconv/SHA512SUMS +++ b/contrib/src/iconv/SHA512SUMS @@ -1 +1 @@ -b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 libiconv-1.14.tar.gz +1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a libiconv-1.15.tar.gz diff --git a/contrib/src/iconv/libiconv-c11.patch b/contrib/src/iconv/libiconv-c11.patch deleted file mode 100644 index adcc8d1252..0000000000 --- a/contrib/src/iconv/libiconv-c11.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- iconv/srclib/stdio.in.h.orig 2015-09-24 17:57:58.668232325 +0200 -+++ iconv/srclib/stdio.in.h 2015-09-24 17:56:16.941881263 +0200 -@@ -679,6 +679,8 @@ - # endif - #endif - -+#if !defined __USE_ISOC11 \ -+ || (defined __cplusplus && __cplusplus <= 201103L) - #if @GNULIB_GETS@ - # if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ - # if !(defined __cplusplus && defined GNULIB_NAMESPACE) -@@ -697,6 +699,7 @@ - always declared, since it is required by C89. */ - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif -+#endif - - - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak index dfb5ee600c..c998fd81fc 100644 --- a/contrib/src/iconv/rules.mak +++ b/contrib/src/iconv/rules.mak @@ -1,5 +1,5 @@ # libiconv -LIBICONV_VERSION := 1.14 +LIBICONV_VERSION := 1.15 LIBICONV_URL := $(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz PKGS += iconv @@ -18,7 +18,6 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv $(UNPACK) $(APPLY) $(SRC)/iconv/win32.patch $(APPLY) $(SRC)/iconv/bins.patch - $(APPLY) $(SRC)/iconv/libiconv-c11.patch ifdef HAVE_WIN64 $(APPLY) $(SRC)/iconv/libiconv-win64.patch endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
