Commit 5b48dc9f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update iconv

parent 2b5e7f64
b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 libiconv-1.14.tar.gz 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a libiconv-1.15.tar.gz
--- 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@
# libiconv # libiconv
LIBICONV_VERSION := 1.14 LIBICONV_VERSION := 1.15
LIBICONV_URL := $(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz LIBICONV_URL := $(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
PKGS += iconv PKGS += iconv
...@@ -18,7 +18,6 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv ...@@ -18,7 +18,6 @@ iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
$(UNPACK) $(UNPACK)
$(APPLY) $(SRC)/iconv/win32.patch $(APPLY) $(SRC)/iconv/win32.patch
$(APPLY) $(SRC)/iconv/bins.patch $(APPLY) $(SRC)/iconv/bins.patch
$(APPLY) $(SRC)/iconv/libiconv-c11.patch
ifdef HAVE_WIN64 ifdef HAVE_WIN64
$(APPLY) $(SRC)/iconv/libiconv-win64.patch $(APPLY) $(SRC)/iconv/libiconv-win64.patch
endif endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment