diff --git a/packages/groff/build.sh b/packages/groff/build.sh index 3f4b323924..769f07fc39 100644 --- a/packages/groff/build.sh +++ b/packages/groff/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/groff/ TERMUX_PKG_DESCRIPTION="typesetting system that reads plain text mixed with formatting commands and produces formatted output" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.22.4 -TERMUX_PKG_REVISION=4 +TERMUX_PKG_VERSION=1.23.0 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/groff/groff-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=e78e7b4cb7dec310849004fa88847c44701e8d133b5d4c13057d876c1bad0293 +TERMUX_PKG_SHA256=6b9757f592b7518b4902eb6af7e54570bdccba37a871fddb2d30ae3863511c13 TERMUX_PKG_DEPENDS="libc++, perl, man" TERMUX_PKG_GROUPS="base-devel" TERMUX_PKG_BUILD_IN_SRC=true diff --git a/packages/groff/lib-stdio-impl.h.patch b/packages/groff/lib-stdio-impl.h.patch deleted file mode 100644 index 08c88bdb7a..0000000000 --- a/packages/groff/lib-stdio-impl.h.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/lib/stdio-impl.h -+++ b/lib/stdio-impl.h -@@ -61,6 +61,13 @@ - # define _r pub._r - # define _w pub._w - # elif defined __ANDROID__ /* Android */ -+# ifdef __LP64__ -+# define _gl_flags_file_t int -+# define _gl_struct_file_off_t int64_t -+# else -+# define _gl_flags_file_t short -+# define _gl_struct_file_off_t __kernel_off_t -+# endif - /* Up to this commit from 2015-10-12 - - the innards of FILE were public, and fp_ub could be defined like for OpenBSD, -@@ -70,8 +77,8 @@ - # define fp_ ((struct { unsigned char *_p; \ - int _r; \ - int _w; \ -- int _flags; \ -- int _file; \ -+ _gl_flags_file_t _flags; \ -+ _gl_flags_file_t _file; \ - struct { unsigned char *_base; size_t _size; } _bf; \ - int _lbfsize; \ - void *_cookie; \ -@@ -86,7 +93,7 @@ - unsigned char _nbuf[1]; \ - struct { unsigned char *_base; size_t _size; } _lb; \ - int _blksize; \ -- fpos_t _offset; \ -+ _gl_struct_file_off_t _offset; \ - /* More fields, not relevant here. */ \ - } *) fp) - # else diff --git a/packages/groff/vasnprintf_android.patch b/packages/groff/vasnprintf_android.patch deleted file mode 100644 index feb902bf8b..0000000000 --- a/packages/groff/vasnprintf_android.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -uNr groff-1.22.4/lib/vasnprintf.c groff-1.22.4.mod/lib/vasnprintf.c ---- groff-1.22.4/lib/vasnprintf.c 2018-12-23 17:34:16.000000000 +0300 -+++ groff-1.22.4.mod/lib/vasnprintf.c 2021-09-30 20:22:47.817441906 +0300 -@@ -4874,7 +4874,8 @@ - # if ! (((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) \ - && !defined __UCLIBC__) \ - || (defined __APPLE__ && defined __MACH__) \ -- || (defined _WIN32 && ! defined __CYGWIN__)) -+ || (defined _WIN32 && ! defined __CYGWIN__) \ -+ || defined(__ANDROID__)) - fbp[1] = '%'; - fbp[2] = 'n'; - fbp[3] = '\0';