From 484bef42f1323b1da93ebd27dd0abba8a3d571d2 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 1 Mar 2017 18:14:25 +0100 Subject: [PATCH] ctags: Update to git HEAD --- packages/ctags/build.sh | 6 +++--- packages/ctags/configure.ac.patch | 23 +++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/packages/ctags/build.sh b/packages/ctags/build.sh index 78ca7107c..0f195e908 100644 --- a/packages/ctags/build.sh +++ b/packages/ctags/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://ctags.io/ TERMUX_PKG_DESCRIPTION="Universal ctags: Source code index builder" -TERMUX_PKG_VERSION=0.0.20170123 -_COMMIT=15504fe2d0c84b6dbcb0b8a5c594424dd383185e +TERMUX_PKG_VERSION=0.0.20170224 +_COMMIT=a39f842455fdcc47b812c35c6bf0f19735034de0 TERMUX_PKG_SRCURL=https://github.com/universal-ctags/ctags/archive/${_COMMIT}.zip -TERMUX_PKG_SHA256=02b5572840788af5113b14067bab0e5e60eedd17c8eb305da469834c80eaa152 +TERMUX_PKG_SHA256=afec9c48d631204c7ec7c61e1c6b3cf0a8b7c5ac8737bb2313618e77595f3eb8 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 ca6dc0cbe..6fab5c4c9 100644 --- a/packages/ctags/configure.ac.patch +++ b/packages/ctags/configure.ac.patch @@ -1,6 +1,6 @@ -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 +diff -u -r ../ctags-a39f842455fdcc47b812c35c6bf0f19735034de0/configure.ac ./configure.ac +--- ../ctags-a39f842455fdcc47b812c35c6bf0f19735034de0/configure.ac 2017-02-24 10:02:41.000000000 +0100 ++++ ./configure.ac 2017-03-01 18:10:59.298643710 +0100 @@ -7,7 +7,14 @@ # Process this file with autoconf to produce a configure script. @@ -17,18 +17,21 @@ diff -u -r ../ctags-15504fe2d0c84b6dbcb0b8a5c594424dd383185e/configure.ac ./conf AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_SILENT_RULES([yes]) AC_CONFIG_HEADERS([config.h]) -@@ -587,13 +594,7 @@ +@@ -591,16 +598,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]) +-AS_IF([test "x$enable_xml" != "xno"], [ +- PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7], +- [have_libxml=yes +- AC_DEFINE(HAVE_LIBXML)], +- [AS_IF([test "x$enable_xml" = "xyes"], [ +- AC_MSG_ERROR([libxml2 not found])])]) +-]) -AM_CONDITIONAL(HAVE_LIBXML, test "x$have_libxml" = xyes) +AM_CONDITIONAL(HAVE_LIBXML, [test true = false]) - AH_TEMPLATE([HAVE_JANSSON], - [Define this value if jansson is available.]) + AC_ARG_ENABLE([json], + [AS_HELP_STRING([--disable-json],