Ports/libiconv: Update libiconv to version 1.17

This also removes the patch that stubbed out `getprogname()` as it is no
longer needed.

5 files changed, 14 insertions, 44 deletions

diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 7277de5046..14bde6cdda 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -100,7 +100,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`libgcrypt`](libgcrypt/)                           | libgcrypt                                                       | 1.10.1                   | https://gnupg.org/software/libgcrypt/index.html                                |
 | [`libgd`](libgd/)                                   | libgd                                                           | 2.3.3                    | https://libgd.github.io/                                                       |
 | [`libgpg-error`](libgpg-error/)                     | libgpg-error                                                    | 1.45                     | https://gnupg.org/software/libgpg-error/index.html                             |
-| [`libiconv`](libiconv/)                             | GNU libiconv                                                    | 1.16                     | https://www.gnu.org/software/libiconv/                                         |
+| [`libiconv`](libiconv/)                             | GNU libiconv                                                    | 1.17                     | https://www.gnu.org/software/libiconv/                                         |
 | [`libicu`](libicu/)                                 | ICU                                                             | 69.1                     | http://site.icu-project.org/                                                   |
 | [`libjpeg`](libjpeg/)                               | libjpeg                                                         | 9e                       | https://ijg.org/                                                               |
 | [`libksba`](libksba/)                               | libksba                                                         | 1.5.1                    | https://gnupg.org/software/libksba/index.html                                  |
diff --git a/Ports/libiconv/package.sh b/Ports/libiconv/package.sh
index e4eb13ed54..c102b1a877 100755
--- a/Ports/libiconv/package.sh
+++ b/Ports/libiconv/package.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/env -S bash ../.port_include.sh
-port=libiconv
-version=1.16
-useconfigure=true
-configopts=("--enable-shared" "--disable-nls")
-files="https://ftpmirror.gnu.org/gnu/libiconv/libiconv-${version}.tar.gz libiconv-${version}.tar.gz e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
-auth_type="sha256"
-use_fresh_config_sub=true
+port='libiconv'
+version='1.17'
+files="https://ftpmirror.gnu.org/gnu/libiconv/libiconv-${version}.tar.gz libiconv-${version}.tar.gz 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
+auth_type='sha256'
+useconfigure='true'
+use_fresh_config_sub='true'
 config_sub_paths=("build-aux/config.sub" "libcharset/build-aux/config.sub")
+configopts=("--enable-shared" "--disable-nls")
diff --git a/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch b/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch
deleted file mode 100644
index 3acfa2ee29..0000000000
--- a/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 74f7065ed6f9cf338f53657ea08e980328dd27c6 Mon Sep 17 00:00:00 2001
-From: Vincent Sanders <vince@kyllikki.org>
-Date: Sun, 6 Oct 2019 11:11:16 +0100
-Subject: [PATCH 1/2] Stub out getprogname() for serenity
-
----
- srclib/getprogname.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/srclib/getprogname.c b/srclib/getprogname.c
-index 22d71eb..7cc112d 100644
---- a/srclib/getprogname.c
-+++ b/srclib/getprogname.c
-@@ -244,6 +244,8 @@ getprogname (void)
-         }
-     }
-   return NULL;
-+# elif defined __serenity__
-+  return "?";
- # else
- #  error "getprogname module not ported to this OS"
- # endif
--- 
-2.36.1
-
diff --git a/Ports/libiconv/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/libiconv/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch
index 0ddb432ec4..de144fd65b 100644
--- a/Ports/libiconv/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch
+++ b/Ports/libiconv/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch
@@ -17,10 +17,10 @@ static library into a shared library.
  1 file changed, 23 insertions(+)
 
 diff --git a/configure b/configure
-index 3488d1d..33b4956 100755
+index 668c3dd..a2857fc 100755
 --- a/configure
 +++ b/configure
-@@ -7376,6 +7376,10 @@ tpf*)
+@@ -8649,6 +8649,10 @@ tpf*)
  os2*)
    lt_cv_deplibs_check_method=pass_all
    ;;
@@ -31,7 +31,7 @@ index 3488d1d..33b4956 100755
  esac
  
  fi
-@@ -10688,6 +10692,10 @@ lt_prog_compiler_static=
+@@ -12125,6 +12129,10 @@ lt_prog_compiler_static=
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -42,7 +42,7 @@ index 3488d1d..33b4956 100755
      *)
        lt_prog_compiler_can_build_shared=no
        ;;
-@@ -12206,6 +12214,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+@@ -13657,6 +13665,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
        hardcode_shlibpath_var=no
        ;;
  
@@ -53,7 +53,7 @@ index 3488d1d..33b4956 100755
      *)
        ld_shlibs=no
        ;;
-@@ -13274,6 +13286,17 @@ uts4*)
+@@ -14729,6 +14741,17 @@ uts4*)
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
diff --git a/Ports/libiconv/patches/ReadMe.md b/Ports/libiconv/patches/ReadMe.md
index 779a29f555..1ee364b2bc 100644
--- a/Ports/libiconv/patches/ReadMe.md
+++ b/Ports/libiconv/patches/ReadMe.md
@@ -1,11 +1,6 @@
 # Patches for libiconv on SerenityOS
 
-## `0001-Stub-out-getprogname-for-serenity.patch`
-
-Stub out getprogname() for serenity
-
-
-## `0002-libtool-Enable-shared-library-support-for-SerenityOS.patch`
+## `0001-libtool-Enable-shared-library-support-for-SerenityOS.patch`
 
 libtool: Enable shared library support for SerenityOS