From d3d972820e89af4b514b2d4093940dccb5300acd Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sun, 6 Oct 2019 11:11:16 +0100 Subject: [PATCH] Ports: add libiconv port --- Ports/libiconv/package.sh | 6 ++++ Ports/libiconv/patches/fix-autoconf.patch | 38 ++++++++++++++++++++ Ports/libiconv/patches/fix-getprogname.patch | 11 ++++++ 3 files changed, 55 insertions(+) create mode 100755 Ports/libiconv/package.sh create mode 100644 Ports/libiconv/patches/fix-autoconf.patch create mode 100644 Ports/libiconv/patches/fix-getprogname.patch diff --git a/Ports/libiconv/package.sh b/Ports/libiconv/package.sh new file mode 100755 index 00000000000..d4a5c58b27e --- /dev/null +++ b/Ports/libiconv/package.sh @@ -0,0 +1,6 @@ +#!/bin/bash ../.port_include.sh +port=libiconv +version=1.16 +useconfigure=true +files="https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.16.tar.gz libiconv-1.16.tar.gz" +patchlevel=1 diff --git a/Ports/libiconv/patches/fix-autoconf.patch b/Ports/libiconv/patches/fix-autoconf.patch new file mode 100644 index 00000000000..1c77deaddec --- /dev/null +++ b/Ports/libiconv/patches/fix-autoconf.patch @@ -0,0 +1,38 @@ +--- libiconv-1.16/build-aux/config.sub.orig 2019-10-05 22:37:52.881885592 +0100 ++++ libiconv-1.16/build-aux/config.sub 2019-10-05 22:41:00.116990779 +0100 +@@ -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 @@ + # 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* \ +--- libiconv-1.16-orig/libcharset/build-aux/config.sub 2019-04-26 19:29:05.000000000 +0100 ++++ libiconv-1.16/libcharset/build-aux/config.sub 2019-10-05 23:16:08.710006227 +0100 +@@ -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 @@ + # 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/Ports/libiconv/patches/fix-getprogname.patch b/Ports/libiconv/patches/fix-getprogname.patch new file mode 100644 index 00000000000..dde3d44e682 --- /dev/null +++ b/Ports/libiconv/patches/fix-getprogname.patch @@ -0,0 +1,11 @@ +--- libiconv-1.16-orig/srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100 ++++ libiconv-1.16/srclib/getprogname.c 2019-10-10 23:36:34.193619582 +0100 +@@ -244,6 +244,8 @@ + } + } + return NULL; ++# elif defined __serenity__ ++ return "?"; + # else + # error "getprogname module not ported to this OS" + # endif