sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nano: Update from 4.5 to 4.6

Browse Source
This commit is contained in:
Fredrik Fornwall 2019-12-01 17:34:14 +01:00
parent 45f004bccc
commit 433cd2d7ff
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/nano/build.sh
View File

@ -1,9 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://www.nano-editor.org/
TERMUX_PKG_DESCRIPTION="Small, free and friendly text editor"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_VERSION=4.5
TERMUX_PKG_VERSION=4.6
TERMUX_PKG_SRCURL=https://nano-editor.org/dist/latest/nano-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=ded5c38f5ecd9de2b624e0db8013a375c169d3fbbd49575967b868847df8f533
TERMUX_PKG_SHA256=9bac3a4153774fd921dd3eb291986d43985466b081165b5ac5262b37b79628e9
TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, ncurses"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
ac_cv_header_pwd_h=no

20
packages/nano/src-files.c.patch
View File

@ -1,12 +1,12 @@
diff -uNr nano-3.2/src/files.c nano-3.2.mod/src/files.c
--- nano-3.2/src/files.c 2018-11-05 21:04:46.000000000 +0200
+++ nano-3.2.mod/src/files.c 2019-03-01 22:09:30.233108029 +0200
@@ -1439,7 +1439,7 @@
diff -u -r ../nano-4.6/src/files.c ./src/files.c
--- ../nano-4.6/src/files.c 2019-11-29 10:12:07.000000000 +0000
+++ ./src/files.c 2019-12-01 16:31:03.622452000 +0000
@@ -1359,7 +1359,7 @@
tempdir = check_writable_directory(P_tmpdir);
/* if P_tmpdir is NULL, use /tmp. */
if (full_tempdir == NULL)
- full_tempdir = mallocstrcpy(NULL, "/tmp/");
+ full_tempdir = mallocstrcpy(NULL, "@TERMUX_PREFIX@/tmp/");
if (tempdir == NULL)
- tempdir = copy_of("/tmp/");
+ tempdir = copy_of("@TERMUX_PREFIX@/tmp/");
full_tempdir = charealloc(full_tempdir, strlen(full_tempdir) + 12);
strcat(full_tempdir, "nano.XXXXXX");
tempfile_name = charealloc(tempdir, strlen(tempdir) + 12);
strcat(tempfile_name, "nano.XXXXXX");

22
packages/nano/src-text.c.patch
View File

@ -1,12 +1,12 @@
diff -u -r ../nano-4.3/src/text.c ./src/text.c
--- ../nano-4.3/src/text.c 2019-06-11 11:55:31.000000000 +0000
+++ ./src/text.c 2019-06-23 21:36:28.191047000 +0000
@@ -956,7 +956,7 @@
/* Check which shell to use. If none is specified, use /bin/sh. */
shellenv = getenv("SHELL");
if (shellenv == NULL)
- shellenv = (char *)"/bin/sh";
+ shellenv = (char *)"@TERMUX_PREFIX@/bin/sh";
diff -u -r ../nano-4.6/src/text.c ./src/text.c
--- ../nano-4.6/src/text.c 2019-11-29 10:12:07.000000000 +0000
+++ ./src/text.c 2019-12-01 16:32:08.956643000 +0000
@@ -962,7 +962,7 @@
const char *theshell = getenv("SHELL");
/* Fork a child process to run the command in. */
if ((pid_of_command = fork()) == 0) {
if (theshell == NULL)
- theshell = (char *)"/bin/sh";
+ theshell = (char *)"@TERMUX_PREFIX@/bin/sh";
/* Child: close the unused read end of the output pipe. */
close(from_fd[0]);