ctags: Update to later snapshot

diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh
index 45999b98895638fab2e9558eebb5c1215cb463a3..78ca7107c6726c956e2b2dc1c2a74db64e8364db 100644 (file)
--- a/packages/ctags/build.sh
+++ b/packages/ctags/build.sh
@@ -1,14 +1,15 @@
 TERMUX_PKG_HOMEPAGE=https://ctags.io/
 TERMUX_PKG_DESCRIPTION="Universal ctags: Source code index builder"
 TERMUX_PKG_HOMEPAGE=https://ctags.io/
 TERMUX_PKG_DESCRIPTION="Universal ctags: Source code index builder"

-TERMUX_PKG_VERSION=0.0.20161128
-_COMMIT=ff448e2e2a08325c95f2e162ae50fb899392d99f
+TERMUX_PKG_VERSION=0.0.20170123
+_COMMIT=15504fe2d0c84b6dbcb0b8a5c594424dd383185e

 TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip
 TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip

-TERMUX_PKG_SHA256=2f90f4887695dd42969c2cdad003132c1d6ce395966c58379aafc7891d1dd0a0
+TERMUX_PKG_SHA256=02b5572840788af5113b14067bab0e5e60eedd17c8eb305da469834c80eaa152

 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp"
 TERMUX_PKG_FOLDERNAME=ctags-$_COMMIT
 TERMUX_PKG_BUILD_IN_SRC="yes"
 
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-tmpdir=$TERMUX_PREFIX/tmp"
 TERMUX_PKG_FOLDERNAME=ctags-$_COMMIT
 TERMUX_PKG_BUILD_IN_SRC="yes"
 

-termux_step_post_extract_package () {
+termux_step_pre_configure() {
+       cd $TERMUX_PKG_SRCDIR

        export regcomp_works=yes
        ./autogen.sh
 }
        export regcomp_works=yes
        ./autogen.sh
 }

diff --git a/packages/ctags/configure.ac.patch b/packages/ctags/configure.ac.patch
index a2a793ee1315789d477dde8f6485a21fd75dd22e..ca6dc0cbe4aaf2fdcb8a4f4f45ffeeefa1b9a030 100644 (file)
--- a/packages/ctags/configure.ac.patch
+++ b/packages/ctags/configure.ac.patch
@@ -1,6 +1,6 @@
-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
+diff -u -r ../ctags-15504fe2d0c84b6dbcb0b8a5c594424dd383185e/configure.ac ./configure.ac
+--- ../ctags-15504fe2d0c84b6dbcb0b8a5c594424dd383185e/configure.ac     2017-01-23 15:00:41.000000000 +0100
++++ ./configure.ac     2017-01-24 20:17:41.484033433 +0100

 @@ -7,7 +7,14 @@
  #     Process this file with autoconf to produce a configure script.
  
 @@ -7,7 +7,14 @@
  #     Process this file with autoconf to produce a configure script.
  


@@ -17,12 +17,18 @@ diff -u -r ../ctags-ff448e2e2a08325c95f2e162ae50fb899392d99f/configure.ac ./conf
  AM_INIT_AUTOMAKE([foreign subdir-objects])
  AM_SILENT_RULES([yes])
  AC_CONFIG_HEADERS([config.h])
  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])
+@@ -587,13 +594,7 @@
+ 
+ AH_TEMPLATE([HAVE_LIBXML],
+       [Define this value if libxml is available.])
+-dnl About the condition of version
+-dnl see https://mail.gnome.org/archives/xml/2010-February/msg00008.html
+-PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.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 "x$have_libxml" = xyes)

-+AM_CONDITIONAL(HAVE_LIBXML, test "no" = xyes)
++AM_CONDITIONAL(HAVE_LIBXML, [test true = false])

  
  AH_TEMPLATE([HAVE_JANSSON],
        [Define this value if jansson is available.])
  
  AH_TEMPLATE([HAVE_JANSSON],
        [Define this value if jansson is available.])