From 526ac8067778b1b2c68721761115f7a61b9149b6 Mon Sep 17 00:00:00 2001
From: Ørjan Malde <red@foxi.me>
Date: Jun 01 2022 13:41:13 +0000
Subject: groups/251.native_packages_lib.group: libiconv: bump to v1.17


Signed-off-by: Ørjan Malde <red@foxi.me>

---

diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index 6f380eb..a41fc87 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -125,8 +125,8 @@ gcry_cv_visibility_attribute=yes"};
 : ${PKG_LIBGPG_ERROR_URL:=https://www.gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-${PKG_LIBGPG_ERROR_VERSION}.tar.bz2};
 : ${PKG_LIBGPG_ERROR_FORCE_AUTORECONF:=1};
 : ${PKG_LIBGPG_ERROR_IN_TREE:=1};
-: ${PKG_LIBICONV_SHA256SUM:=e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04};
-: ${PKG_LIBICONV_VERSION:=1.16};
+: ${PKG_LIBICONV_SHA256SUM:=8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313};
+: ${PKG_LIBICONV_VERSION:=1.17};
 : ${PKG_LIBICONV_URL:=https://ftp.gnu.org/pub/gnu/libiconv/libiconv-${PKG_LIBICONV_VERSION}.tar.gz};
 : ${PKG_LIBICONV_CONFIGURE_ARGS_EXTRA:="--enable-extra-encodings"};
 : ${PKG_LIBICONV_INSTALL_FILES_V2:="@../../native/include/iconv.h=%[_prefix]/../x86_64-nt64-midipix/include/iconv.h"};
diff --git a/patches/libiconv-1.16_pre.local.patch b/patches/libiconv-1.16_pre.local.patch
deleted file mode 100644
index 8a8f860..0000000
--- a/patches/libiconv-1.16_pre.local.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libiconv-1.16.orig/src/Makefile.in libiconv-1.16/src/Makefile.in
---- libiconv-1.16.orig/src/Makefile.in	2019-01-27 23:07:13.000000000 +0100
-+++ libiconv-1.16/src/Makefile.in	2021-11-21 02:07:16.220970962 +0100
-@@ -113,7 +113,7 @@
- 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
- 	case "@host_os@" in \
- 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
--	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
-+	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/.libs/libiconv.so.2 @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
- 	esac
- 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
- 
diff --git a/patches/libiconv-1.17_pre.local.patch b/patches/libiconv-1.17_pre.local.patch
new file mode 100644
index 0000000..8a8f860
--- /dev/null
+++ b/patches/libiconv-1.17_pre.local.patch
@@ -0,0 +1,12 @@
+diff -ru libiconv-1.16.orig/src/Makefile.in libiconv-1.16/src/Makefile.in
+--- libiconv-1.16.orig/src/Makefile.in	2019-01-27 23:07:13.000000000 +0100
++++ libiconv-1.16/src/Makefile.in	2021-11-21 02:07:16.220970962 +0100
+@@ -113,7 +113,7 @@
+ 	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(mkinstalldirs) $(DESTDIR)$(bindir) ; fi
+ 	case "@host_os@" in \
+ 	  hpux*) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a -L$(DESTDIR)$(libdir) -liconv @LIBINTL@ $(OBJECTS_RES_@WOE32@) `if test -n '$(DESTDIR)'; then echo " -Wl,+b -Wl,$(libdir)"; fi` -o iconv$(EXEEXT);; \
+-	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a $(DESTDIR)$(libdir)/libiconv.la @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
++	  *) $(LIBTOOL_LINK) $(CC) $(LDFLAGS) $(CFLAGS) $(iconv_LDFLAGS) iconv.@OBJEXT@ ../srclib/libicrt.a ../lib/.libs/libiconv.so.2 @LTLIBINTL@ $(OBJECTS_RES_@WOE32@) -o iconv$(EXEEXT);; \
+ 	esac
+ 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) iconv$(EXEEXT) $(DESTDIR)$(bindir)/iconv$(EXEEXT)
+