libiconv: updated to 1.16

niXman · May 4, 2019 · 86d4420 · 86d4420
1 parent b2e8f20
commit 86d4420
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/patches/libiconv/0002-fix-cr-for-awk-in-configure.all.patch b/patches/libiconv/0002-fix-cr-for-awk-in-configure.all.patch
@@ -1,6 +1,6 @@
---- libiconv-1.14/configure.orig	2013-08-04 19:13:45.059307100 +0000
-+++ libiconv-1.14/configure	2013-08-04 19:14:09.009348300 +0000
-@@ -22903,7 +22903,7 @@
+--- a/configure
++++ b/configure
+@@ -25958,7 +25958,7 @@ if test "x$ac_cr" = x; then
  fi
  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
@@ -9,20 +9,9 @@
  else
    ac_cs_awk_cr=$ac_cr
  fi
---- libiconv-1.14/libcharset/configure.orig	2011-08-07 17:49:19.000000000 +0000
-+++ libiconv-1.14/libcharset/configure	2013-08-04 19:14:51.014182300 +0000
-@@ -12364,7 +12364,7 @@
- fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
--  ac_cs_awk_cr='\\r'
-+  ac_cs_awk_cr='\r'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
---- libiconv-1.14/preload/configure.orig	2010-09-23 23:33:42.000000000 +0000
-+++ libiconv-1.14/preload/configure	2013-08-04 19:15:09.286002500 +0000
-@@ -12247,7 +12247,7 @@
+--- a/libcharset/configure
++++ b/libcharset/configure
+@@ -13406,7 +13406,7 @@ if test "x$ac_cr" = x; then
  fi
  ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
  if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then

diff --git a/scripts/libiconv.sh b/scripts/libiconv.sh
@@ -35,7 +35,7 @@
 
 # **************************************************************************
 
-PKG_VERSION=1.15
+PKG_VERSION=1.16
 PKG_NAME=$PKG_ARCHITECTURE-libiconv-$LINK_TYPE_SUFFIX
 PKG_DIR_NAME=libiconv-${PKG_VERSION}
 PKG_TYPE=.tar.gz