Skip to content

Commit 411277e

Browse files
EWouterslinusg
authored andcommitted
Ports/libiconv: Update libiconv to version 1.17
This also removes the patch that stubbed out `getprogname()` as it is no longer needed.
1 parent 41bb219 commit 411277e

5 files changed

+14
-44
lines changed

Ports/AvailablePorts.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
100100
| [`libgcrypt`](libgcrypt/) | libgcrypt | 1.10.1 | https://gnupg.org/software/libgcrypt/index.html |
101101
| [`libgd`](libgd/) | libgd | 2.3.3 | https://libgd.github.io/ |
102102
| [`libgpg-error`](libgpg-error/) | libgpg-error | 1.45 | https://gnupg.org/software/libgpg-error/index.html |
103-
| [`libiconv`](libiconv/) | GNU libiconv | 1.16 | https://www.gnu.org/software/libiconv/ |
103+
| [`libiconv`](libiconv/) | GNU libiconv | 1.17 | https://www.gnu.org/software/libiconv/ |
104104
| [`libicu`](libicu/) | ICU | 69.1 | http://site.icu-project.org/ |
105105
| [`libjpeg`](libjpeg/) | libjpeg | 9e | https://ijg.org/ |
106106
| [`libksba`](libksba/) | libksba | 1.5.1 | https://gnupg.org/software/libksba/index.html |

Ports/libiconv/package.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#!/usr/bin/env -S bash ../.port_include.sh
2-
port=libiconv
3-
version=1.16
4-
useconfigure=true
5-
configopts=("--enable-shared" "--disable-nls")
6-
files="https://ftpmirror.gnu.org/gnu/libiconv/libiconv-${version}.tar.gz libiconv-${version}.tar.gz e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
7-
auth_type="sha256"
8-
use_fresh_config_sub=true
2+
port='libiconv'
3+
version='1.17'
4+
files="https://ftpmirror.gnu.org/gnu/libiconv/libiconv-${version}.tar.gz libiconv-${version}.tar.gz 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313"
5+
auth_type='sha256'
6+
useconfigure='true'
7+
use_fresh_config_sub='true'
98
config_sub_paths=("build-aux/config.sub" "libcharset/build-aux/config.sub")
9+
configopts=("--enable-shared" "--disable-nls")

Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch

-25
This file was deleted.

Ports/libiconv/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch Ports/libiconv/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ static library into a shared library.
1717
1 file changed, 23 insertions(+)
1818

1919
diff --git a/configure b/configure
20-
index 3488d1d..33b4956 100755
20+
index 668c3dd..a2857fc 100755
2121
--- a/configure
2222
+++ b/configure
23-
@@ -7376,6 +7376,10 @@ tpf*)
23+
@@ -8649,6 +8649,10 @@ tpf*)
2424
os2*)
2525
lt_cv_deplibs_check_method=pass_all
2626
;;
@@ -31,7 +31,7 @@ index 3488d1d..33b4956 100755
3131
esac
3232

3333
fi
34-
@@ -10688,6 +10692,10 @@ lt_prog_compiler_static=
34+
@@ -12125,6 +12129,10 @@ lt_prog_compiler_static=
3535
lt_prog_compiler_static='-Bstatic'
3636
;;
3737

@@ -42,7 +42,7 @@ index 3488d1d..33b4956 100755
4242
*)
4343
lt_prog_compiler_can_build_shared=no
4444
;;
45-
@@ -12206,6 +12214,10 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
45+
@@ -13657,6 +13665,10 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; }
4646
hardcode_shlibpath_var=no
4747
;;
4848

@@ -53,7 +53,7 @@ index 3488d1d..33b4956 100755
5353
*)
5454
ld_shlibs=no
5555
;;
56-
@@ -13274,6 +13286,17 @@ uts4*)
56+
@@ -14729,6 +14741,17 @@ uts4*)
5757
shlibpath_var=LD_LIBRARY_PATH
5858
;;
5959

Ports/libiconv/patches/ReadMe.md

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# Patches for libiconv on SerenityOS
22

3-
## `0001-Stub-out-getprogname-for-serenity.patch`
4-
5-
Stub out getprogname() for serenity
6-
7-
8-
## `0002-libtool-Enable-shared-library-support-for-SerenityOS.patch`
3+
## `0001-libtool-Enable-shared-library-support-for-SerenityOS.patch`
94

105
libtool: Enable shared library support for SerenityOS
116

0 commit comments

Comments
 (0)