From b2b6c79b66071e8d03c534090a82b3cc0f4aaa8f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 13 Apr 2019 09:24:43 +0200
Subject: [PATCH] ctags: Update from 0.0.20180830 to 0.0.20190412
---
packages/ctags/build.sh | 15 +++++++++++----
packages/ctags/configure.ac.patch | 17 +++++++++++++----
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh
index f2f1cca55..3ce8f42d2 100644
--- a/packages/ctags/build.sh
+++ b/packages/ctags/build.sh
@@ -1,14 +1,21 @@
TERMUX_PKG_HOMEPAGE=https://ctags.io/
TERMUX_PKG_DESCRIPTION="Universal ctags: Source code index builder"
TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=0.0.20180830
-local _COMMIT=f9bbb35e7b4b053f04a1b6f0c2bbcea55641b2b6
-TERMUX_PKG_SHA256=3585f1b9df43d7ecf31c06877fb7bfed4429a47fe95a8ab65da5738e76a442aa
+TERMUX_PKG_VERSION=0.0.20190412
+local _COMMIT=61cc66cfc796e707cfb13c5fed493af280378c75
+TERMUX_PKG_SHA256=479abda4686fafd11cae40f646c2b692cc0209783d233b2534b339b838af9acc
TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp"
TERMUX_PKG_BUILD_IN_SRC="yes"
+TERMUX_PKG_HOSTBUILD="yes"
-termux_step_pre_configure() {
+termux_step_post_extract_package() {
export regcomp_works=yes
./autogen.sh
}
+
+termux_step_pre_configure() {
+ ./autogen.sh
+ cp $TERMUX_PKG_HOSTBUILD_DIR/packcc $TERMUX_PKG_BUILDDIR/
+ touch -d "next hour" $TERMUX_PKG_BUILDDIR/packcc
+}
diff --git a/packages/ctags/configure.ac.patch b/packages/ctags/configure.ac.patch
index b650be402..458a43bcd 100644
--- a/packages/ctags/configure.ac.patch
+++ b/packages/ctags/configure.ac.patch
@@ -1,6 +1,6 @@
-diff -u -r ../ctags-8a60622839c98ef6fac1c57a5563812393c56c1d/configure.ac ./configure.ac
---- ../ctags-8a60622839c98ef6fac1c57a5563812393c56c1d/configure.ac 2017-09-01 11:04:30.000000000 +0200
-+++ ./configure.ac 2017-09-01 23:38:48.761978655 +0200
+diff -u -r ../ctags-61cc66cfc796e707cfb13c5fed493af280378c75/configure.ac ./configure.ac
+--- ../ctags-61cc66cfc796e707cfb13c5fed493af280378c75/configure.ac 2019-04-12 19:56:22.000000000 +0000
++++ ./configure.ac 2019-04-13 07:08:50.478780864 +0000
@@ -7,7 +7,14 @@
# Process this file with autoconf to produce a configure script.
@@ -17,7 +17,16 @@ diff -u -r ../ctags-8a60622839c98ef6fac1c57a5563812393c56c1d/configure.ac ./conf
AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
AM_SILENT_RULES([yes])
AC_CONFIG_HEADERS([config.h])
-@@ -574,16 +581,7 @@
+@@ -409,7 +416,7 @@
+ sprintf(buffer, "%zu", i);
+ return !(buffer[0] == '9' && buffer[1] == '9' && buffer[2] == '9');
+ }
+-]])],[have_zu_formatter=yes],[have_zu_formatter=no])
++]])],[have_zu_formatter=yes],[have_zu_formatter=no], [have_zu_formatter=yes])
+ AC_MSG_RESULT($have_zu_formatter)
+
+ if test x$have_zu_formatter != xyes; then
+@@ -594,16 +601,7 @@
AH_TEMPLATE([HAVE_LIBXML],
[Define this value if libxml is available.])