diff options
| -rw-r--r-- | Ports/libiconv/patches/0001-Teach-config.sub-about-serenity.patch (renamed from Ports/libiconv/patches/fix-autoconf.patch) | 29 | ||||
| -rw-r--r-- | Ports/libiconv/patches/0002-Stub-out-getprogname-for-serenity.patch | 25 | ||||
| -rw-r--r-- | Ports/libiconv/patches/ReadMe.md | 12 | ||||
| -rw-r--r-- | Ports/libiconv/patches/fix-getprogname.patch | 11 |
4 files changed, 60 insertions, 17 deletions
diff --git a/Ports/libiconv/patches/fix-autoconf.patch b/Ports/libiconv/patches/0001-Teach-config.sub-about-serenity.patch index 1c77deadde..9b476736f9 100644 --- a/Ports/libiconv/patches/fix-autoconf.patch +++ b/Ports/libiconv/patches/0001-Teach-config.sub-about-serenity.patch @@ -1,5 +1,17 @@ ---- 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 +From a92364ad8e2c7e870f800ffa5bcb0f385b61b823 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] 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. @@ -9,7 +21,7 @@ # 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 @@ +@@ -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* \ @@ -17,8 +29,10 @@ | *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 +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. @@ -28,7 +42,7 @@ # 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 @@ +@@ -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* \ @@ -36,3 +50,6 @@ | *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 new file mode 100644 index 0000000000..8664215909 --- /dev/null +++ b/Ports/libiconv/patches/0002-Stub-out-getprogname-for-serenity.patch @@ -0,0 +1,25 @@ +From 9b61ddd52828042b106d7d4c3fef582be9c933e7 Mon Sep 17 00:00:00 2001 +From: Vincent Sanders <vince@kyllikki.org> +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 new file mode 100644 index 0000000000..778d99a567 --- /dev/null +++ b/Ports/libiconv/patches/ReadMe.md @@ -0,0 +1,12 @@ +# Patches for libiconv on SerenityOS + +## `0001-Teach-config.sub-about-serenity.patch` + +Teach config.sub about serenity + + +## `0002-Stub-out-getprogname-for-serenity.patch` + +Stub out getprogname() for serenity + + diff --git a/Ports/libiconv/patches/fix-getprogname.patch b/Ports/libiconv/patches/fix-getprogname.patch deleted file mode 100644 index dde3d44e68..0000000000 --- a/Ports/libiconv/patches/fix-getprogname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 |