From ffe541e4ef7b6519cd35d186c2243a84f851ef5d Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 25 May 2022 13:59:31 +0200 Subject: Ports: Replace the `libiconv` `config.sub` patch with our download --- Ports/libiconv/package.sh | 2 + .../0001-Stub-out-getprogname-for-serenity.patch | 25 ++++++++++ .../0001-Teach-config.sub-about-serenity.patch | 55 ---------------------- .../0002-Stub-out-getprogname-for-serenity.patch | 25 ---------- Ports/libiconv/patches/ReadMe.md | 7 +-- 5 files changed, 28 insertions(+), 86 deletions(-) create mode 100644 Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch delete mode 100644 Ports/libiconv/patches/0001-Teach-config.sub-about-serenity.patch delete mode 100644 Ports/libiconv/patches/0002-Stub-out-getprogname-for-serenity.patch (limited to 'Ports/libiconv') diff --git a/Ports/libiconv/package.sh b/Ports/libiconv/package.sh index 587677af66..7bbde3a9b2 100755 --- a/Ports/libiconv/package.sh +++ b/Ports/libiconv/package.sh @@ -5,6 +5,8 @@ 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 +config_sub_paths=("build-aux/config.sub" "libcharset/build-aux/config.sub") install() { run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install diff --git a/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch b/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch new file mode 100644 index 0000000000..303e51e34c --- /dev/null +++ b/Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch @@ -0,0 +1,25 @@ +From 9b61ddd52828042b106d7d4c3fef582be9c933e7 Mon Sep 17 00:00:00 2001 +From: Vincent Sanders +Date: Sun, 6 Oct 2019 11:11:16 +0100 +Subject: [PATCH 1/1] 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/0001-Teach-config.sub-about-serenity.patch b/Ports/libiconv/patches/0001-Teach-config.sub-about-serenity.patch deleted file mode 100644 index 9b476736f9..0000000000 --- a/Ports/libiconv/patches/0001-Teach-config.sub-about-serenity.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a92364ad8e2c7e870f800ffa5bcb0f385b61b823 Mon Sep 17 00:00:00 2001 -From: Vincent Sanders -Date: Sun, 6 Oct 2019 11:11:16 +0100 -Subject: [PATCH 1/2] Teach config.sub about serenity - ---- - build-aux/config.sub | 3 ++- - libcharset/build-aux/config.sub | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/build-aux/config.sub b/build-aux/config.sub -index a44fd8a..6b21345 100755 ---- a/build-aux/config.sub -+++ b/build-aux/config.sub -@@ -2,7 +2,7 @@ - # Configuration validation subroutine script. - # Copyright 1992-2019 Free Software Foundation, Inc. - --timestamp='2019-01-05' -+timestamp='2019-10-05' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -1341,6 +1341,7 @@ case $os in - # Each alternative MUST end in a * to match a version number. - # sysv* is not here because it comes later, after sysvr4. - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ -+ | serenity* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ - | sym* | kopensolaris* | plan9* \ -diff --git a/libcharset/build-aux/config.sub b/libcharset/build-aux/config.sub -index a44fd8a..6b21345 100755 ---- a/libcharset/build-aux/config.sub -+++ b/libcharset/build-aux/config.sub -@@ -2,7 +2,7 @@ - # Configuration validation subroutine script. - # Copyright 1992-2019 Free Software Foundation, Inc. - --timestamp='2019-01-05' -+timestamp='2019-10-05' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -1341,6 +1341,7 @@ case $os in - # Each alternative MUST end in a * to match a version number. - # sysv* is not here because it comes later, after sysvr4. - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ -+ | serenity* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ - | sym* | kopensolaris* | plan9* \ --- -2.36.1 - diff --git a/Ports/libiconv/patches/0002-Stub-out-getprogname-for-serenity.patch b/Ports/libiconv/patches/0002-Stub-out-getprogname-for-serenity.patch deleted file mode 100644 index 8664215909..0000000000 --- a/Ports/libiconv/patches/0002-Stub-out-getprogname-for-serenity.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9b61ddd52828042b106d7d4c3fef582be9c933e7 Mon Sep 17 00:00:00 2001 -From: Vincent Sanders -Date: Sun, 6 Oct 2019 11:11:16 +0100 -Subject: [PATCH 2/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/ReadMe.md b/Ports/libiconv/patches/ReadMe.md index 778d99a567..8adfac6a09 100644 --- a/Ports/libiconv/patches/ReadMe.md +++ b/Ports/libiconv/patches/ReadMe.md @@ -1,11 +1,6 @@ # Patches for libiconv on SerenityOS -## `0001-Teach-config.sub-about-serenity.patch` - -Teach config.sub about serenity - - -## `0002-Stub-out-getprogname-for-serenity.patch` +## `0001-Stub-out-getprogname-for-serenity.patch` Stub out getprogname() for serenity -- cgit v1.2.3