From e82f747181f8e795df687d4b92b1085da4a59de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= Date: Sun, 17 Mar 2024 18:04:47 -0400 Subject: [PATCH] contrib: update iconv to 1.17 Change-Id: I86f091d583830b91175df393e5701b73dc69d007 --- contrib/src/iconv/SHA512SUMS | 2 +- contrib/src/iconv/rules.mak | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/contrib/src/iconv/SHA512SUMS b/contrib/src/iconv/SHA512SUMS index 78e4babf1..c672b0dc1 100644 --- a/contrib/src/iconv/SHA512SUMS +++ b/contrib/src/iconv/SHA512SUMS @@ -1 +1 @@ -b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 libiconv-1.14.tar.gz +18a09de2d026da4f2d8b858517b0f26d853b21179cf4fa9a41070b2d140030ad9525637dc4f34fc7f27abca8acdc84c6751dfb1d426e78bf92af4040603ced86 libiconv-1.17.tar.gz diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak index 59ea446d8..e70ab2f7e 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.17 LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz PKGS += iconv @@ -18,20 +18,6 @@ $(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_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 $(MOVE)