ctags: Update to identify as version 5.8

By default universal ctags built from master claims version 0.0.0,
which makes it incompatible with at least vim-easytags.

Update to claim version 5.8 (the exuberant version).

diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh
index c1f6bf3..0fd4649 100644 (file)
--- a/packages/ctags/build.sh
+++ b/packages/ctags/build.sh
@@ -1,8 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://ctags.io/
 TERMUX_PKG_DESCRIPTION="Universal ctags: Source code index builder"
-TERMUX_PKG_VERSION=0.0.20160827
-_COMMIT=55d068620ed8f74c8e706cb7fbaeab78dcd0fc69
+TERMUX_PKG_VERSION=0.0.20161128
+_COMMIT=ff448e2e2a08325c95f2e162ae50fb899392d99f
 TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip
+TERMUX_PKG_SHA256=2f90f4887695dd42969c2cdad003132c1d6ce395966c58379aafc7891d1dd0a0
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp"
 TERMUX_PKG_FOLDERNAME=ctags-$_COMMIT
 TERMUX_PKG_BUILD_IN_SRC="yes"

diff --git a/packages/ctags/configure.ac.patch b/packages/ctags/configure.ac.patch
index f94d8b8..a2a793e 100644 (file)
--- a/packages/ctags/configure.ac.patch
+++ b/packages/ctags/configure.ac.patch
@@ -1,16 +1,28 @@
-diff -u -r ../ctags-c82fb5e615de043ef98926ef21fc3f8cb4a57ae7/configure.ac ./configure.ac
---- ../ctags-c82fb5e615de043ef98926ef21fc3f8cb4a57ae7/configure.ac     2016-05-02 02:37:13.000000000 -0400
-+++ ./configure.ac     2016-05-02 21:15:55.462438802 -0400
-@@ -586,11 +586,7 @@
+diff -u -r ../ctags-ff448e2e2a08325c95f2e162ae50fb899392d99f/configure.ac ./configure.ac
+--- ../ctags-ff448e2e2a08325c95f2e162ae50fb899392d99f/configure.ac     2016-11-28 06:04:11.000000000 -0500
++++ ./configure.ac     2016-11-28 17:57:01.052817678 -0500
+@@ -7,7 +7,14 @@
+ #     Process this file with autoconf to produce a configure script.
  
- AH_TEMPLATE([HAVE_LIBXML],
-       [Define this value if libxml is available.])
--PKG_CHECK_MODULES(LIBXML, libxml-2.0,
--                     [have_libxml=yes
--                     AC_DEFINE(HAVE_LIBXML)],
--                     [have_libxml=no])
+ AC_PREREQ([2.59])
+-AC_INIT([universal-ctags],[0.0.0])
++# Avoid identifying as
++#   Universal Ctags 0.0.0, Copyright (C) 2015 Universal Ctags Team
++#   Universal Ctags is derived from Exuberant Ctags.
++#   Exuberant Ctags 5.8, Copyright (C) 1996-2009 Darren Hiebert
++# since that causes at least vim-easytags to identify the ctags
++# version as 0.0.0, see
++# https://github.com/xolox/vim-easytags/blob/master/autoload/xolox/easytags.vim
++AC_INIT([universal-ctags],[5.8])
+ AM_INIT_AUTOMAKE([foreign subdir-objects])
+ AM_SILENT_RULES([yes])
+ AC_CONFIG_HEADERS([config.h])
+@@ -593,7 +600,7 @@
+                      [have_libxml=yes
+                      AC_DEFINE(HAVE_LIBXML)],
+                      [have_libxml=no])
 -AM_CONDITIONAL(HAVE_LIBXML, test "x$have_libxml" = xyes)
 +AM_CONDITIONAL(HAVE_LIBXML, test "no" = xyes)
  
- AC_CHECK_FUNCS(fmemopen,[have_fmemopen=yes],[have_fmemopen=no])
- AM_CONDITIONAL(HAVE_FMEMOPEN, test "x$have_fmemopen" = xyes)
+ AH_TEMPLATE([HAVE_JANSSON],
+       [Define this value if jansson is available.])