From 526ac8067778b1b2c68721761115f7a61b9149b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98rjan=20Malde?= <red@foxi.me>
Date: Wed, 1 Jun 2022 15:41:13 +0200
Subject: groups/251.native_packages_lib.group: libiconv: bump to v1.17
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ørjan Malde <red@foxi.me>
---
 patches/libiconv-1.16_pre.local.patch | 12 ------------
 patches/libiconv-1.17_pre.local.patch | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 patches/libiconv-1.16_pre.local.patch
 create mode 100644 patches/libiconv-1.17_pre.local.patch

(limited to 'patches')

diff --git a/patches/libiconv-1.16_pre.local.patch b/patches/libiconv-1.16_pre.local.patch
deleted file mode 100644
index 8a8f860f..00000000
--- 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 00000000..8a8f860f
--- /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)
+ 
-- 
cgit v1.2.3