system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 18:46:18 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Ports: Bump nano to version 5.8

Browse source
This commit is contained in:
Daniel Bertalan 2021-06-21 11:57:56 +02:00 committed by Andreas Kling
parent e5afe7a8a3
commit f68932cac1
5 changed files with 16 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -86,7 +86,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`mbedtls`](mbedtls/) | Mbed TLS | 2.16.2 | https://tls.mbed.org/ |
| [`milkytracker`](milkytracker/) | milkytracker | 1.03.00 | https://github.com/milkytracker/MilkyTracker |
| [`mrsh`](mrsh/) | mrsh | d9763a3 | https://mrsh.sh/ |
| [`nano`](nano/) | GNU nano | 4.5 | https://www.nano-editor.org/ |
| [`nano`](nano/) | GNU nano | 5.8 | https://www.nano-editor.org/ |
| [`nasm`](nasm/) | Netwide Assembler (NASM) | 2.15.05 | https://www.nasm.us/ |
| [`ncurses`](ncurses/) | ncurses | 6.2 | https://invisible-island.net/ncurses/announce.html |
| [`neofetch`](neofetch/) | neofetch | 7.1.0 | https://github.com/dylanaraps/neofetch |

6
Ports/nano/package.sh
View file

@ -1,9 +1,9 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=nano
version=4.5
version=5.8
useconfigure="true"
files="https://www.nano-editor.org/dist/v4/nano-${version}.tar.xz nano-${version}.tar.xz
https://www.nano-editor.org/dist/v4/nano-${version}.tar.xz.asc nano-${version}.tar.xz.asc"
files="https://www.nano-editor.org/dist/v5/nano-${version}.tar.xz nano-${version}.tar.xz
https://www.nano-editor.org/dist/v5/nano-${version}.tar.xz.asc nano-${version}.tar.xz.asc"
configopts="--target=${SERENITY_ARCH}-pc-serenity --disable-browser --disable-utf8"
depends="ncurses"
auth_type="sig"

24
Ports/nano/patches/fix-autoconf.patch
View file

@ -1,12 +1,12 @@
diff -ru nano-4.5-original/nano-4.5/config.sub nano-4.5/config.sub
--- nano-4.5-original/nano-4.5/config.sub 2018-11-10 00:30:37.000000000 -0600
+++ nano-4.5/config.sub 2019-11-13 01:52:22.442486361 -0600
@@ -1369,6 +1369,7 @@
| -sym* | -kopensolaris* | -plan9* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* | -cloudabi* | -sortix* \
+ | -serenity* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -knetbsd* | -mirbsd* | -netbsd* \
diff --git a/config.sub.orig b/config.sub
index 63c1f1c8b..f14d29e3d 100755
--- a/config.sub.orig
+++ b/config.sub
@@ -1696,6 +1696,7 @@ case $os in
# The portable systems comes first.
# Each alternative MUST end in a * to match a version number.
gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ | serenity* \
| *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
| hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
| sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \

12
Ports/nano/patches/fix-files.patch
View file

@ -1,12 +0,0 @@
diff -ru nano-4.5-original/nano-4.5/src/files.c nano-4.5/src/files.c
--- nano-4.5-original/nano-4.5/src/files.c 2019-10-04 04:38:05.000000000 -0500
+++ nano-4.5/src/files.c 2019-11-13 02:17:33.268207958 -0600
@@ -31,6 +31,7 @@
#include <unistd.h>
#define LOCKBUFSIZE 8192
+#define P_tmpdir "/tmp"
/* Verify that the containing directory of the given filename exists. */
bool has_valid_path(const char *filename)

13
Ports/nano/patches/fix-fnmatch.patch
View file

@ -1,13 +0,0 @@
diff -Naur nano-4.5/lib/fnmatch_loop.c nano-4.5.serenity/lib/fnmatch_loop.c
--- nano-4.5/lib/fnmatch_loop.c 2021-04-12 03:21:50.410647764 +0200
+++ nano-4.5.serenity/lib/fnmatch_loop.c 2021-04-12 03:20:03.688773104 +0200
@@ -16,6 +16,9 @@
/* Match STRING against the file name pattern PATTERN, returning zero if
it matches, nonzero if not. */
+#ifdef __serenity__
+#define FNM_EXTMATCH 0
+#endif
static int EXT (INT opt, const CHAR *pattern, const CHAR *string,
const CHAR *string_end, bool no_leading_period, int flags)
internal_function;