diff --git a/packages/indent/Makefile.in.patch b/packages/indent/Makefile.in.patch index 006533904..cda100c63 100644 --- a/packages/indent/Makefile.in.patch +++ b/packages/indent/Makefile.in.patch @@ -1,12 +1,12 @@ -diff -u -r ../indent-2.2.11/Makefile.in ./Makefile.in ---- ../indent-2.2.11/Makefile.in 2010-01-31 16:25:35.000000000 +0000 -+++ ./Makefile.in 2018-06-07 22:50:57.895536279 +0000 -@@ -237,7 +237,7 @@ +diff -u -r ../indent-2.2.12/Makefile.in ./Makefile.in +--- ../indent-2.2.12/Makefile.in 2018-09-05 21:00:27.000000000 +0000 ++++ ./Makefile.in 2018-09-08 00:11:20.094710325 +0000 +@@ -378,7 +378,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = no-texinfo.tex --SUBDIRS = intl src doc po man +-SUBDIRS = intl src doc po man regression +SUBDIRS = intl src po man BUILT_SOURCES = - EXTRA_DIST = README \ - config/config.rpath config/mkinstalldirs \ + DISTFILES = $(DIST_COMMON:README=README.md) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + EXTRA_DIST = README.md \ diff --git a/packages/indent/build.sh b/packages/indent/build.sh index cb7f1fe5e..88f5dfff7 100644 --- a/packages/indent/build.sh +++ b/packages/indent/build.sh @@ -1,7 +1,8 @@ -TERMUX_PKG_HOMEPAGE=https://packages.debian.org/sid/indent +TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/indent/ TERMUX_PKG_DESCRIPTION="C language source code formatting program" -TERMUX_PKG_VERSION=2.2.11 -TERMUX_PKG_SHA256=aaff60ce4d255efb985f0eb78cca4d1ad766c6e051666073050656b6753a0893 -TERMUX_PKG_SRCURL=http://http.debian.net/debian/pool/main/i/indent/indent_$TERMUX_PKG_VERSION.orig.tar.gz +TERMUX_PKG_VERSION=2.2.12 +TERMUX_PKG_SHA256=b745a5dfc68f86a483d7f96dc1cda7aafd1e78ecba3c7d8ad304709e91e1defb +TERMUX_PKG_SRCURL=http://mirrors.kernel.org/gnu/indent/indent-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_DEPENDS="libandroid-support" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_setlocale=no" TERMUX_PKG_RM_AFTER_INSTALL="bin/texinfo2man" diff --git a/packages/indent/lexi.c.patch b/packages/indent/lexi.c.patch deleted file mode 100644 index f30cf0d9b..000000000 --- a/packages/indent/lexi.c.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ../cache/indent-2.2.11/src/lexi.c 2009-11-11 19:36:32.000000000 +0000 -+++ ./src/lexi.c 2018-03-12 23:14:07.881637140 +0000 -@@ -199,7 +199,7 @@ - - /* Include code generated by gperf */ - #ifdef __GNUC__ --__inline -+static __inline - #endif - templ_ty *is_reserved (const char *str, unsigned int len); - -@@ -213,7 +213,7 @@ - #undef MAX_WORD_LENGTH - - #ifdef __GNUC__ --__inline -+static __inline - #endif - templ_ty *is_reserved_cc (register const char *str, register unsigned int len); - diff --git a/packages/indent/man-Makefile.in.patch b/packages/indent/man-Makefile.in.patch deleted file mode 100644 index e59442598..000000000 --- a/packages/indent/man-Makefile.in.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../indent-2.2.11/man/Makefile.in ./man/Makefile.in ---- ../indent-2.2.11/man/Makefile.in 2010-01-31 16:25:21.000000000 +0000 -+++ ./man/Makefile.in 2018-06-07 22:52:13.810674067 +0000 -@@ -575,7 +575,7 @@ - - - @PACKAGE@.1: ${srcdir}/@PACKAGE@.1.in ${srcdir}/../doc/@PACKAGE@.texinfo texinfo2man Makefile.am -- ./texinfo2man ${srcdir}/@PACKAGE@.1.in ${srcdir}/../doc/@PACKAGE@.texinfo > $@ -+ @echo Skipping - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded.