Contribs: update Nettle to 2.7.1

[vlc] / contrib / src / iconv / rules.mak

diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak
index dbf10f77cfe3c71aab439408b1d85f699cb7c80c..35964635239797cb3da8d4e8f621559d09b16169 100644 (file)
--- a/contrib/src/iconv/rules.mak
+++ b/contrib/src/iconv/rules.mak
@@ -1,5 +1,5 @@
 # libiconv
-LIBICONV_VERSION=1.13.1
+LIBICONV_VERSION=1.14
 LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
 
 PKGS += iconv
@@ -16,18 +16,19 @@ $(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz:
 
 iconv: libiconv-$(LIBICONV_VERSION).tar.gz .sum-iconv
        $(UNPACK)
+       $(APPLY) $(SRC)/iconv/win32.patch
+       $(APPLY) $(SRC)/iconv/bins.patch
 ifdef HAVE_WIN64
        $(APPLY) $(SRC)/iconv/libiconv-win64.patch
 endif
-ifdef HAVE_WINCE
-       $(APPLY) $(SRC)/iconv/libiconv-wince.patch
-       $(APPLY) $(SRC)/iconv/libiconv-wince-hack.patch
-endif
 ifdef HAVE_ANDROID
        $(APPLY) $(SRC)/iconv/libiconv-android-ios.patch
 endif
 ifdef HAVE_IOS
        $(APPLY) $(SRC)/iconv/libiconv-android-ios.patch
+endif
+ifdef HAVE_WINRT
+       $(APPLY) $(SRC)/iconv/libiconv-winrt.patch
 endif
        $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux
        $(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub libcharset/build-aux