Many of them cascading from the update of glib.
TERMUX_PKG_DESCRIPTION="Apache Portable Runtime - library providing a predictable and consistent interface to underlying platform-specific implementations"
TERMUX_PKG_DEPENDS="libuuid"
TERMUX_PKG_BUILD_IN_SRC="yes"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-installbuilddir=$TERMUX_PKG_TMPDIR ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes apr_cv_process_shared_works=no apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8"
+# "ac_cv_search_crypt=" to avoid needlessly linking to libcrypt.
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-installbuilddir=$TERMUX_PKG_TMPDIR ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes apr_cv_process_shared_works=no apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8 ac_cv_search_crypt="
TERMUX_PKG_RM_AFTER_INSTALL="bin/apr-1-config lib/apr.exp"
TERMUX_PKG_HOMEPAGE=http://www.cmake.org/
TERMUX_PKG_DESCRIPTION="Family of tools designed to build, test and package software"
_MAJOR_VERSION=3.5
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2
TERMUX_PKG_SRCURL=http://www.cmake.org/files/v${_MAJOR_VERSION}/cmake-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="libarchive, libcurl, libexpat, ncurses, jsoncpp"
TERMUX_PKG_HOMEPAGE=https://matt.ucc.asn.au/dropbear/dropbear.html
TERMUX_PKG_DESCRIPTION="Small SSH server and client"
TERMUX_PKG_DEPENDS="libutil"
-TERMUX_PKG_VERSION=2015.71
+TERMUX_PKG_VERSION=2016.73
# Both main site and mirror is sporadically down, switching to fedora site:
# TERMUX_PKG_SRCURL=https://matt.ucc.asn.au/dropbear/releases/dropbear-${TERMUX_PKG_VERSION}.tar.bz2
# TERMUX_PKG_SRCURL=https://dropbear.nl/mirror/dropbear-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SRCURL=http://pkgs.fedoraproject.org/lookaside/pkgs/dropbear/dropbear-2015.71.tar.bz2/md5/2ccc0a2f3e37ca221db12c5af6a88137/dropbear-2015.71.tar.bz2
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-syslog --disable-utmp --disable-utmpx --disable-wtmp"
+# Avoid linking to libcrypt for server password authentication:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" ac_cv_lib_crypt_crypt=no"
TERMUX_PKG_EXTRA_MAKE_ARGS="MULTI=1"
TERMUX_PKG_BUILD_IN_SRC="yes"
TERMUX_PKG_HOMEPAGE=https://www.ffmpeg.org/
TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
TERMUX_PKG_VERSION=3.0.2
+TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=https://www.ffmpeg.org/releases/ffmpeg-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_FOLDERNAME=ffmpeg-$TERMUX_PKG_VERSION
# libbz2 is used by matroska decoder:
TERMUX_PKG_HOMEPAGE=http://pidgin.im/
TERMUX_PKG_DESCRIPTION="Text-based multi-protocol instant messaging client"
-TERMUX_PKG_VERSION=2.10.11
-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_VERSION=2.10.12
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/pidgin/Pidgin/${TERMUX_PKG_VERSION}/pidgin-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_DEPENDS="libgnutls, libxml2, ncurses-ui-libs, glib"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-gtkui --disable-gstreamer --disable-vv --disable-idn --disable-meanwhile --disable-avahi --disable-dbus --disable-perl --disable-tcl --without-zephyr --with-ncurses-headers=$TERMUX_PREFIX/include --without-python"
TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/gdk-pixbuf/
TERMUX_PKG_DESCRIPTION="Library for image loading and manipulation"
-TERMUX_PKG_VERSION=2.32.3
-TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.32/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_VERSION=2.34.0
+TERMUX_PKG_SRCURL=ftp://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.34/gdk-pixbuf-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo"
# Avoid runtime test which does not work when cross compiling:
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gio-sniffing"
TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/
TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C"
-_TERMUX_GLIB_MAJOR_VERSION=2.46
-TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2
-TERMUX_PKG_BUILD_REVISION=2
+_TERMUX_GLIB_MAJOR_VERSION=2.48
+TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.0
TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="libffi, pcre"
TERMUX_PKG_HOMEPAGE=http://www.gnuplot.info/
TERMUX_PKG_DESCRIPTION="Command-line driven graphing utility"
TERMUX_PKG_VERSION=4.6.7
+TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/gnuplot/gnuplot/${TERMUX_PKG_VERSION}/gnuplot-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-x --with-lua=no"
TERMUX_PKG_DEPENDS="libandroid-support, readline, pango"
TERMUX_PKG_HOMEPAGE=http://www.freedesktop.org/wiki/Software/HarfBuzz/
TERMUX_PKG_DESCRIPTION="OpenType text shaping engine"
-TERMUX_PKG_VERSION=1.2.3
+TERMUX_PKG_VERSION=1.2.7
TERMUX_PKG_SRCURL=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_DEPENDS="freetype,glib,libbz2,libpng"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-icu=no"
TERMUX_PKG_HOMEPAGE=http://www.imagemagick.org/
TERMUX_PKG_DESCRIPTION="Suite to create, edit, compose, or convert images in a variety of formats"
-TERMUX_PKG_VERSION="6.9.3-8"
+TERMUX_PKG_VERSION="7.0.1-0"
TERMUX_PKG_SRCURL=http://www.imagemagick.org/download/ImageMagick-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-largefile --without-x --with-magick-plus-plus=no --with-bzlib=no --with-xml=yes --with-lzma ac_cv_func_ftime=no ac_cv_header_complex_h=no"
TERMUX_PKG_RM_AFTER_INSTALL="bin/Magick-config bin/MagickCore-config bin/MagickWand-config bin/Wand-config share/ImageMagick-6/francais.xml share/man/man1/Magick-config.1 share/man/man1/MagickCore-config.1 share/man/man1/MagickWand-config.1 share/man/man1/Wand-config.1"
TERMUX_PKG_DESCRIPTION="Terminal based IRC client for UNIX systems"
TERMUX_PKG_DEPENDS="ncurses, openssl, glib, libandroid-glob"
TERMUX_PKG_VERSION=0.8.19
+TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/irssi/irssi/releases/download/${TERMUX_PKG_VERSION}/irssi-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_FOLDERNAME=irssi-${TERMUX_PKG_VERSION}
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_HOMEPAGE=https://github.com/open-source-parsers/jsoncpp
TERMUX_PKG_DESCRIPTION="C++ library for interacting with JSON"
-TERMUX_PKG_VERSION=1.6.5
+TERMUX_PKG_VERSION=1.7.1
TERMUX_PKG_SRCURL=https://github.com/open-source-parsers/jsoncpp/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_FOLDERNAME=jsoncpp-${TERMUX_PKG_VERSION}
termux_step_configure () {
+ # The installation does not overwrite symlinks such as libjsoncpp.so.1,
+ # so if rebuilding these are not detected as modified. Fix that:
+ rm -f $TERMUX_PREFIX/lib/libjsoncpp.so*
+
cd $TERMUX_PKG_BUILDDIR
cmake -G "Unix Makefiles" .. \
-DCMAKE_AR=`which ${TERMUX_HOST_PLATFORM}-ar` \
+++ /dev/null
---- ../kona-Win.3.36-64/src/0.c 2015-07-30 11:18:02.000000000 -0400
-+++ ./src/0.c 2015-12-06 03:24:04.000000000 -0500
-@@ -84,7 +84,7 @@
- GC; }
- else if( (3==ABS(t) && (!strcmp(m,"/dev/fd/0") || !strcmp(m,"/dev/stdin"))) //read stdin
- || 4==t && (!strcmp(*kS(a),"/dev/fd/0") || !strcmp(*kS(a),"/dev/stdin")) ){
-- b=getdelim_(&v,(size_t * __restrict__)&s,EOF,stdin);
-+ b=new_getdelim_(&v,(size_t * __restrict__)&s,EOF,stdin);
- P(freopen_stdin() == NULL, FE)
- if(b==-1){z=newK(0,0); GC;} }
- else { //read mapped file
-@@ -868,7 +868,7 @@
- FILE *f; K z,l; S s=0; I n=0;
- f=popen(cmd,"r"); P(!f,_n())
- z=newK(0,0); //oom
-- while (getline_(&s, (size_t * __restrict__)&n, f) >= 0) {
-+ while (new_getline_(&s, (size_t * __restrict__)&n, f) >= 0) {
- l=newK(-3,n-1); strncpy(kC(l),s,n-1); kap(&z,&l); }
- free(s); pclose(f);
- R z; }
-diff -u -r ../kona-Win.3.36-64/Makefile ./Makefile
---- ../kona-Win.3.36-64/Makefile 2015-07-30 11:18:02.000000000 -0400
-+++ ./Makefile 2015-12-06 14:40:50.325235408 -0500
+diff -u -r ../kona-Win.3.39-69/Makefile ./Makefile
+--- ../kona-Win.3.39-69/Makefile 2016-04-17 14:10:22.000000000 -0400
++++ ./Makefile 2016-05-03 14:21:25.497611299 -0400
@@ -1,10 +1,8 @@
-PREFIX = /usr/local
-CFLAGS=-g
DEVFLAGS = -O0 -g3 -DDEBUG -Wunused -Wreturn-type -Wimplicit-int #-Wall
-OS := $(shell uname -s | tr "[:upper:]" "[:lower:]")
-+OS = android
++OS := android
# Win-64
ifeq (mingw32_nt-6.2,$(OS))
-@@ -28,16 +26,12 @@
+@@ -30,16 +28,12 @@
endif
ifeq (android,$(OS))
-CC=arm-linux-androideabi-gcc
- OBJS= src/0.o src/c.o src/getline.o src/getline_android.o src/mt.o src/p.o \
+-OBJS= src/0.o src/bswap.o src/c.o src/getline.o src/getline_android.o src/mt.o src/p.o \
++OBJS= src/0.o src/bswap.o src/c.o src/getline.o src/mt.o src/p.o \
src/r.o src/k.o src/kc.o src/kx.o src/kg.o src/km.o src/kn.o src/ko.o \
src/ks.o src/v.o src/va.o src/vc.o src/vd.o src/vf.o src/vg.o src/vq.o
-LDFLAGS = -Wl,--gc-sections -Wl,-z,nocopyreloc -lgcc -no-canonical-prefixes \
-TERMUX_PKG_VERSION=3.36
-TERMUX_PKG_FOLDERNAME=kona-Win.$TERMUX_PKG_VERSION-64
+TERMUX_PKG_VERSION="3.39-69"
+TERMUX_PKG_FOLDERNAME=kona-Win.$TERMUX_PKG_VERSION
TERMUX_PKG_HOMEPAGE=https://github.com/kevinlawler/kona
TERMUX_PKG_DESCRIPTION="Open-source implementation of the APL-like K programming language"
-TERMUX_PKG_SRCURL="https://github.com/kevinlawler/kona/archive/Win.$TERMUX_PKG_VERSION-64.zip"
+TERMUX_PKG_SRCURL="https://github.com/kevinlawler/kona/archive/Win.${TERMUX_PKG_VERSION}.zip"
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_MAINTAINER="Jonathan Badger <jhbadger@gmail.com>"
+++ /dev/null
---- ../kona-Win.3.36-64/src/c.c 2015-07-30 11:18:02.000000000 -0400
-+++ ./src/c.c 2015-12-06 03:19:35.000000000 -0500
-@@ -463,7 +463,7 @@
- w=t; while(isspace(*w++))l++;
- if(l==n||!n){if(y)cd(y); y=0; continue;}
- O("%s ",t);
-- if(-1==getline_(&u,&m,stdin))GC;
-+ if(-1==new_getline_(&u,&m,stdin))GC;
- d=stepopt(u,m);
- if(d==1){if(y)cd(y); y=0; continue;}else if(d==2)GC;
- show(k=ex(wd(t,n)));
+++ /dev/null
---- ../kona-Win.3.36-64/src/getline.c 2015-07-30 11:18:02.000000000 -0400
-+++ ./src/getline.c 2015-12-06 03:21:45.000000000 -0500
-@@ -29,12 +29,12 @@
- R 0;
- }
-
--I getline_(S *s,size_t * __restrict__ n,FILE *f){R getdelim_(s,n,'\n',f);}
-+I new_getline_(S *s,size_t * __restrict__ n,FILE *f){R new_getdelim_(s,n,'\n',f);}
-
--I getdelim_(S *s,size_t * __restrict__ n,I d,FILE *f)
-+I new_getdelim_(S *s,size_t * __restrict__ n,I d,FILE *f)
- {
- I m; S z;
-- if(getdelim(s,n,d,f)==-1){*n=0; R -1;}
-+ if(new_getdelim(s,n,d,f)==-1){*n=0; R -1;}
- m=strlenn(*s,*n);
- z=strdupn(*s,m);
- free(*s);
-@@ -44,8 +44,8 @@
-
- #if defined(__OpenBSD__) || defined(__NetBSD__) || \
- (defined(__MACH__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
--I getline(S *s,I*n, FILE *f){ R getdelim(s,n,'\n',f);}
--I getdelim(S *s,I*n, I d, FILE *f)//target, current capacity, delimiter, file
-+I getline(S *s,I*n, FILE *f){ R new_getdelim(s,n,'\n',f);}
-+I new_getdelim(S *s,I*n, I d, FILE *f)//target, current capacity, delimiter, file
- {
- unsigned char *q;
- I w=0;
-@@ -92,8 +92,8 @@
- #endif
-
- #ifdef WIN32
--I getline(S *s,I*n, FILE *f){ R getdelim(s,n,'\n',f);}
--I getdelim(S *s,I*n, I d, FILE *f) { //target, current capacity, delimiter, file
-+I getline(S *s,I*n, FILE *f){ R new_getdelim(s,n,'\n',f);}
-+I new_getdelim(S *s,I*n, I d, FILE *f) { //target, current capacity, delimiter, file
- char *q; I w=0;
- if (!s) {errno = EINVAL; goto error;}
- if (f->_cnt <= 0) {
+++ /dev/null
---- ../kona-Win.3.36-64/src/getline.h 2015-07-30 11:18:02.000000000 -0400
-+++ ./src/getline.h 2015-12-06 03:21:00.000000000 -0500
-@@ -1,16 +1,16 @@
- K _p();
- S strdupn(S s,I k);
- I strlenn(S s,I k);
--I getdelim_(S *s,size_t * __restrict__ n,I d,FILE *f);
--I getline_(S *s,size_t * __restrict__ n,FILE *f);
-+I new_getdelim_(S *s,size_t * __restrict__ n,I d,FILE *f);
-+I new_getline_(S *s,size_t * __restrict__ n,FILE *f);
- I appender(S *s,I *n,S t,I k);
- I expander(S *s,I n);
-
- #if defined(__OpenBSD__) || defined(__NetBSD__) || \
- (defined(__MACH__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070) || \
- defined(__ANDROID__)
--I getline(S *s,size_t * __restrict__ n,FILE *f);
--I getdelim(S *s,size_t * __restrict__ n,I d,FILE *f);
-+I new_getline(S *s,size_t * __restrict__ n,FILE *f);
-+I new_getdelim(S *s,size_t * __restrict__ n,I d,FILE *f);
- #endif
-
- #if WIN32
+++ /dev/null
---- ../kona-Win.3.36-64/src/kc.c 2015-07-30 11:18:02.000000000 -0400
-+++ ./src/kc.c 2015-12-06 03:18:50.000000000 -0500
-@@ -34,12 +34,12 @@
- I wds_(K*a,FILE*f,I l) {
- S s=0,t=0; I b=0,c=0,m=0,n=0,v=0; K z=0; PDA p=0;
- I o=isatty(STDIN)&&f==stdin;
-- if(-1==(c=getline_(&s,(size_t * __restrict__)&n,f)))GC;
-+ if(-1==(c=new_getline_(&s,(size_t * __restrict__)&n,f)))GC;
- appender(&t,&m,s,n);
- while(1==(v=complete(t,m,&p,0))) {
- b=parsedepth(p);
- if(o)prompt(b+l);
-- if(-1==(c=getline_(&s,(size_t * __restrict__)&n,f)))GC;
-+ if(-1==(c=new_getline_(&s,(size_t * __restrict__)&n,f)))GC;
- appender(&t,&m,s,n); }
- SW(v){CS(2,show(kerr("unmatched"));GC) CS(3,show(kerr("nest")); GC)}
- z=newK(-3,m-1);
-@@ -200,7 +200,7 @@
- //I o = isatty(STDIN) && f==stdin; //display results to stdout?
- I o = isatty(STDIN); //display results to stdout?
-
-- if(-1==(c=getline(&s,(size_t * __restrict__)&m,f))) GC;
-+ if(-1==(c=new_getline(&s,(size_t * __restrict__)&m,f))) GC;
- if(s[0]=='\\' && s[1]=='\n') {
- if(fCheck) { fCheck=0; R 0; } //escape suspended execution with single backslash
- if(*a) GC; } //escape continue with single backslash
--- /dev/null
+diff -u -r ../kona-Win.3.39-69/src/bswap.c ./src/bswap.c
+--- ../kona-Win.3.39-69/src/bswap.c 2016-04-17 14:10:22.000000000 -0400
++++ ./src/bswap.c 2016-05-03 14:17:03.393640037 -0400
+@@ -11,8 +11,6 @@
+
+ #if defined(__linux__) && defined(__GNUC__)
+ #include <byteswap.h>
+-#define bswap32 __bswap_32
+-#define bswap64 __bswap_64
+ #endif
+
+ #ifdef _MSC_VER
--- /dev/null
+diff -u -r ../kona-Win.3.39-69/src/getline.h ./src/getline.h
+--- ../kona-Win.3.39-69/src/getline.h 2016-04-17 14:10:22.000000000 -0400
++++ ./src/getline.h 2016-05-03 14:15:16.755266190 -0400
+@@ -7,8 +7,7 @@
+ I expander(S *s,I n);
+
+ #if defined(__OpenBSD__) || defined(__NetBSD__) || \
+- (defined(__MACH__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070) || \
+- defined(__ANDROID__)
++ (defined(__MACH__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070)
+ I getline(S *s,size_t * __restrict__ n,FILE *f);
+ I getdelim(S *s,size_t * __restrict__ n,I d,FILE *f);
+ #endif
TERMUX_PKG_HOMEPAGE=http://lftp.yar.ru/
TERMUX_PKG_DESCRIPTION="FTP/HTTP client and file transfer program"
-TERMUX_PKG_VERSION=4.6.5
+TERMUX_PKG_VERSION=4.7.1
TERMUX_PKG_SRCURL=http://lftp.yar.ru/ftp/lftp-${TERMUX_PKG_VERSION}.tar.xz
# (1) Android has dn_expand, but lftp assumes that dn_skipname then exists, which it does not on android.
# (2) Use --with-openssl to use openssl instead of gnutls.
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_dn_expand=no --with-openssl"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_func_dn_expand=no --with-openssl --with-zlib=$TERMUX_STANDALONE_TOOLCHAIN/sysroot/usr --with-expat=$TERMUX_PREFIX"
TERMUX_PKG_DEPENDS="libexpat, openssl, readline, libutil, libidn"
+
+termux_step_pre_configure () {
+ # We have patched an m4 file.
+ cd $TERMUX_PKG_SRCDIR
+ aclocal
+ autoconf
+}
--- /dev/null
+diff -u -r ../lftp-4.7.1/m4/ax_check_zlib.m4 ./m4/ax_check_zlib.m4
+--- ../lftp-4.7.1/m4/ax_check_zlib.m4 2016-02-20 08:57:52.000000000 -0500
++++ ./m4/ax_check_zlib.m4 2016-05-03 13:06:09.166707065 -0400
+@@ -70,7 +70,7 @@
+ # Handle user hints
+ #
+ [AC_MSG_CHECKING(if zlib is wanted)
+-zlib_places="/usr/local /usr /opt/local /sw"
++zlib_places=""
+ AC_ARG_WITH([zlib],
+ [ --with-zlib=DIR root directory path of zlib installation @<:@defaults to
+ /usr/local or /usr if not found in /usr/local@:>@
TERMUX_PKG_HOMEPAGE=http://libav.org/
TERMUX_PKG_DESCRIPTION="Tools and libraries to manipulate a wide range of multimedia formats and protocols"
TERMUX_PKG_VERSION=11.6
-TERMUX_PKG_BUILD_REVISION=3
+TERMUX_PKG_BUILD_REVISION=4
TERMUX_PKG_SRCURL=http://libav.org/releases/libav-${TERMUX_PKG_VERSION}.tar.xz
# libbz2 is used by matroska decoder:
TERMUX_PKG_DEPENDS="openssl, libbz2, libx264, xvidcore, libvorbis, libfaac, libmp3lame"
TERMUX_PKG_HOMEPAGE=http://cairographics.org/
TERMUX_PKG_DESCRIPTION="Cairo 2D vector graphics library"
TERMUX_PKG_VERSION=1.14.6
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
TERMUX_PKG_SRCURL=http://cairographics.org/releases/cairo-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="libandroid-support, libpixman, fontconfig, freetype"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-gtk-doc-html --enable-xlib=no"
TERMUX_PKG_DESCRIPTION="CSS parsing and manipulation library"
_MAJOR_VERSION=0.6
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.11
+TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/libcroco/${_MAJOR_VERSION}/libcroco-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="glib,liblzma,libxml2"
-TERMUX_PKG_VERSION=1.6.5
+TERMUX_PKG_VERSION=1.7.0
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/libgcrypt/
TERMUX_PKG_DESCRIPTION="General purpose cryptographic library based on the code from GnuPG"
TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_DEPENDS="libgpg-error"
+# configure tries to detect pthreads by linking with -lpthread, which does not exist on Android:
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_pthread_pthread_create=yes"
LDFLAGS="$LDFLAGS -llog" # libgcrypt uses syslog, which we redirect to android logging
termux_step_pre_configure () {
if [ $TERMUX_ARCH = "arm" ]; then
# See http://marc.info/?l=gnupg-devel&m=139136972631909&w=3
CFLAGS+=" -mno-unaligned-access"
+ # Avoid text relocations:
+ TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" gcry_cv_gcc_inline_asm_neon=no"
fi
if [ $TERMUX_ARCH = "i686" ]; then
# Fix i686 android build, also in https://bugzilla.gnome.org/show_bug.cgi?id=724050
TERMUX_PKG_HOMEPAGE=http://www.gnupg.org/related_software/libgpg-error/
TERMUX_PKG_DESCRIPTION="Small library that defines common error values for all GnuPG components"
-TERMUX_PKG_VERSION=1.21
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_VERSION=1.22
TERMUX_PKG_SRCURL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_RM_AFTER_INSTALL="share/common-lisp"
TERMUX_PKG_HOMEPAGE=http://isl.gforge.inria.fr/
TERMUX_PKG_DESCRIPTION="Library for manipulating sets and relations of integer points bounded by linear constraints"
-TERMUX_PKG_VERSION=0.15
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_VERSION=0.16.1
TERMUX_PKG_SRCURL=http://isl.gforge.inria.fr/isl-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="libgmp"
TERMUX_PKG_HOMEPAGE=https://wiki.gnome.org/action/show/Projects/LibRsvg
TERMUX_PKG_DESCRIPTION="Library to render SVG files using cairo"
TERMUX_PKG_VERSION=2.40.15
+TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.40/librsvg-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="libcroco,pango,gdk-pixbuf"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-introspection"
-TERMUX_PKG_HOMEPAGE=https://github.com/joyent/libuv
+TERMUX_PKG_HOMEPAGE=http://libuv.org
TERMUX_PKG_DESCRIPTION="Support library with a focus on asynchronous I/O"
TERMUX_PKG_VERSION=1.9.0
TERMUX_PKG_SRCURL=http://dist.libuv.org/dist/v${TERMUX_PKG_VERSION}/libuv-v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_HOMEPAGE=http://www.videolan.org/developers/x264.html
TERMUX_PKG_DESCRIPTION="Library for encoding video streams into the H.264/MPEG-4 AVC format"
-TERMUX_PKG_VERSION="20141218-2245"
-# NOTE: Switched from official ftp://ftp.videolan.org/ on 2014-12-21 since it was down:
-TERMUX_PKG_SRCURL=http://mirror.yandex.ru/mirrors/ftp.videolan.org/x264/snapshots/x264-snapshot-${TERMUX_PKG_VERSION}-stable.tar.bz2
-# Avoid text relocations:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-asm"
+TERMUX_PKG_VERSION="20160503-2245"
+TERMUX_PKG_SRCURL=ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${TERMUX_PKG_VERSION}.tar.bz2
+if [ $TERMUX_ARCH = "i686" ]; then
+ # Avoid text relocations. Only needed on i686, see:
+ # https://mailman.videolan.org/pipermail/x264-devel/2016-March/011589.html
+ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-asm"
+fi
TERMUX_PKG_HOMEPAGE=http://www.nongnu.org/lzip/lzip.html
TERMUX_PKG_DESCRIPTION="Lossless data compressor similar to gzip and bzip2"
-TERMUX_PKG_VERSION=1.18~rc2
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/lzip/lzip-1.18-rc2.tar.lz
+TERMUX_PKG_VERSION=1.18~rc3
+TERMUX_PKG_SRCURL=http://download.savannah.gnu.org/releases/lzip/lzip-1.18-rc3.tar.lz
TERMUX_PKG_VERSION=4.8.16
-TERMUX_PKG_BUILD_REVISION=4
+TERMUX_PKG_BUILD_REVISION=5
TERMUX_PKG_HOMEPAGE=https://www.midnight-commander.org/
TERMUX_PKG_DESCRIPTION="Midnight Commander - a powerful file manager"
TERMUX_PKG_SRCURL="http://ftp.midnight-commander.org/mc-${TERMUX_PKG_VERSION}.tar.xz"
TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
-_MUTT_VERSION=1.6.0
-_NEOMUTT_PATCHES=20160416
+_MUTT_VERSION=1.6.1
+_NEOMUTT_PATCHES=20160502
TERMUX_PKG_VERSION=${_MUTT_VERSION}.$_NEOMUTT_PATCHES
-TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${_MUTT_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-smtp --enable-imap --enable-pop --with-mailpath=$TERMUX_PREFIX/var/mail --with-ssl --enable-compressed --without-idn --enable-hcache --with-sasl"
TERMUX_PKG_HOMEPAGE=http://dev.yorhel.nl/ncdc
TERMUX_PKG_DESCRIPTION="Modern and lightweight direct connect client with a friendly ncurses interface"
TERMUX_PKG_VERSION=1.19.1
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_BUILD_REVISION=2
TERMUX_PKG_SRCURL=http://dev.yorhel.nl/download/ncdc-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="libandroid-support, libgnutls, libsqlite, bzip2, glib, ncurses"
+TERMUX_PKG_BUILD_IN_SRC="yes"
termux_step_post_configure () {
# Cross compiling steps documented in ncdc README
# and are divided among (1) Development, (2) Advanced, (3) Stable and (4) Super Stable.
# Only Super Stable is distributed as a tar ball, but is outdated and does not compile with modern libpng.
# So use revisions from http://svn.code.sf.net/p/netpbm/code/advanced for packages.
-_SVN_REVISION=2683
+_SVN_REVISION=2751
TERMUX_PKG_VERSION=${_SVN_REVISION}
TERMUX_PKG_DEPENDS="libpng, libxml2"
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_HOMEPAGE=https://www.openssl.org/
TERMUX_PKG_DESCRIPTION="Library implementing the SSL and TLS protocols as well as general purpose cryptography functions"
TERMUX_PKG_DEPENDS="ca-certificates"
-TERMUX_PKG_VERSION=1.0.2g
+TERMUX_PKG_VERSION=1.0.2h
TERMUX_PKG_SRCURL="http://www.openssl.org/source/openssl-${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_RM_AFTER_INSTALL="bin/c_rehash etc/ssl/misc"
TERMUX_PKG_BUILD_IN_SRC=yes
TERMUX_PKG_HOMEPAGE=http://optipng.sourceforge.net/
TERMUX_PKG_DESCRIPTION="PNG optimizer that recompresses image files to a smaller size, without losing any information"
TERMUX_PKG_DEPENDS="libpng"
-TERMUX_PKG_VERSION=0.7.5
+TERMUX_PKG_VERSION=0.7.6
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/optipng/OptiPNG/optipng-${TERMUX_PKG_VERSION}/optipng-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-system-zlib --with-system-libpng --mandir=$TERMUX_PREFIX/share/man"
TERMUX_PKG_BUILD_IN_SRC=yes
# adapted from archlinux PKGBUILD
pkgname=p7zip
-pkgver=15.09
+pkgver=15.14.1
TERMUX_PKG_MAINTAINER="Francisco Demartino <demartino.francisco@gmail.com>"
TERMUX_PKG_VERSION=$pkgver
TERMUX_PKG_HOMEPAGE=http://p7zip.sourceforge.net/
termux_step_configure () {
cp makefile.android_arm makefile.machine
-
- rm GUI/kde4/p7zip_compress.desktop
-
- sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \
- CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile
}
termux_step_make () {
-diff -u -r ../p7zip_15.09/makefile.android_arm ./makefile.android_arm
---- ../p7zip_15.09/makefile.android_arm 2015-09-13 14:15:17.000000000 -0400
-+++ ./makefile.android_arm 2015-12-22 06:33:41.608388305 -0500
-@@ -1,58 +1,38 @@
+diff -u -r ../p7zip_15.14.1/makefile.android_arm ./makefile.android_arm
+--- ../p7zip_15.14.1/makefile.android_arm 2016-03-10 15:33:59.000000000 -0500
++++ ./makefile.android_arm 2016-05-03 23:15:52.868840453 -0400
+@@ -1,41 +1,29 @@
#
-# makefile for ANDROID (generic ARM)
-+# makefile for Android with Termux
++# makefile for ANDROID with Termux
+ #
+ # export NDK=<ndk_home>
+ # tested with android-ndk-r8c-linux-x86
#
--ANDROID_NDK_HOME=$(HOME)/ANDROID/android-ndk-r5c
--ANDROID_NDK_BIN=$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin
+-ANDROID_NDK_HOME=$(NDK)
+-ANDROID_NDK_BIN=$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin
-
-# -fpic -Os
-# -fstack-protector
ANDROID_FLAGS=\
- -ffunction-sections \
- -funwind-tables \
-- -D__ARM_ARCH_5__ \
-- -D__ARM_ARCH_5T__ \
-- -D__ARM_ARCH_5E__ \
-- -D__ARM_ARCH_5TE__ \
- -DANDROID \
- -DANDROID_NDK \
-+ -D_UNICODE \
-+ -DUNICODE \
- -Wno-psabi \
-- -march=armv5te \
-- -mtune=xscale \
-- -msoft-float \
-- -mthumb \
- -fomit-frame-pointer \
- -fno-strict-aliasing -finline-limit=64 \
-- -I$(ANDROID_NDK_HOME)/sources/cxx-stl/system/include \
-- -I$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/include \
-- -Wa,--noexecstack
-+ -Wa,--noexecstack
+ -MMD -MP -MF \
+ -fpic -ffunction-sections -funwind-tables -fstack-protector \
+- -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ \
+- -march=armv5te -mtune=xscale -msoft-float -mthumb -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
+- -I$(ANDROID_NDK_HOME)/sources/cxx-stl/system/include \
+- -I$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/include \
++ -fomit-frame-pointer -fno-strict-aliasing -finline-limit=64 \
+ -DANDROID -DANDROID_NDK -DNDEBUG \
- ANDROID_LINK=-v \
- -Wl,--gc-sections -Wl,-z,nocopyreloc \
-- --sysroot=$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm \
-- $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libc.so \
-- $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libstdc++.so \
-- $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libm.so \
- -Wl,--no-undefined -Wl,-z,noexecstack \
-- -L$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib \
-- -lstdc++ -Wl,-rpath-link=$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib \
-- -lsupc++
-+ -lstdc++ -lsupc++
+ ANDROID_LINK= \
+ -Wl,--gc-sections -Wl,-z,nocopyreloc \
+- --sysroot=$(NDK)/platforms/android-3/arch-arm \
+ -Wl,--no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now \
+- -L$(NDK)/platforms/android-3/arch-arm/usr/lib -lstdc++ \
+- $(NDK)/sources/cxx-stl/gnu-libstdc++/4.6/libs/armeabi/libsupc++.a \
+ -lc -lm
-OPTFLAGS=-O3 -s
+OPTFLAGS=-Os -s
-CXX=$(ANDROID_NDK_BIN)/arm-linux-androideabi-g++ -fexceptions -frtti
-CC=$(ANDROID_NDK_BIN)/arm-linux-androideabi-gcc
--CC_SHARED= -fpic
--LINK_SHARED=-fpic -shared
+CXX+= -fexceptions -frtti
-+
-+CC_SHARED=-fPIC
-+LINK_SHARED=-fPIC -shared
-
- LOCAL_LIBS=$(ANDROID_LINK)
--LOCAL_LIBS_DLL=$(LOCAL_LIBS) # -ldl
-+LOCAL_LIBS_DLL=$(LOCAL_LIBS)
-
- OBJ_CRC32=$(OBJ_CRC32_C)
- OBJ_AES=
--
+ CC_EXE= -fPIE
+ LINK_EXE=-fPIE -pie # -fPIE -pie : only for executable
+ CC_SHARED= -fpic
TERMUX_PKG_HOMEPAGE=http://www.pango.org/
TERMUX_PKG_DESCRIPTION="Library for laying out and rendering text"
-_MAJOR_VERSION=1.39
-TERMUX_PKG_VERSION=${_MAJOR_VERSION}.0
-TERMUX_PKG_BUILD_REVISION=1
+_MAJOR_VERSION=1.40
+TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/GNOME/sources/pango/${_MAJOR_VERSION}/pango-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="fontconfig,glib,harfbuzz,libcairo"
TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/parallel/
TERMUX_PKG_DESCRIPTION="GNU Parallel is a shell tool for executing jobs in parallel using one or more machines"
-TERMUX_PKG_VERSION=20160322
+TERMUX_PKG_VERSION=20160422
TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/parallel/parallel-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_DEPENDS="perl"
TERMUX_PKG_PLATFORM_INDEPENDENT=yes
TERMUX_PKG_HOMEPAGE=http://www.perl.org/
TERMUX_PKG_DESCRIPTION="Capable, feature-rich programming language"
# cpan modules will require make:
-TERMUX_PKG_DEPENDS="make"
-TERMUX_PKG_VERSION=5.22.1
-TERMUX_PKG_BUILD_REVISION=4
+TERMUX_PKG_VERSION=5.22.2
TERMUX_PKG_SRCURL=http://www.cpan.org/src/5.0/perl-${TERMUX_PKG_VERSION}.tar.gz
# Does not work with parallell builds:
TERMUX_MAKE_PROCESSES=1
termux_step_post_extract_package () {
PERLCROSS_VERSION=1.0.2
- PERLCROSS_FILE=perl-${TERMUX_PKG_VERSION}-cross-${PERLCROSS_VERSION}.tar.gz
+ PERLCROSS_PERL_VERSION=5.22.1
+ PERLCROSS_FILE=perl-${PERLCROSS_PERL_VERSION}-cross-${PERLCROSS_VERSION}.tar.gz
PERLCROSS_TAR=$TERMUX_PKG_CACHEDIR/$PERLCROSS_FILE
test ! -f $PERLCROSS_TAR && curl -o $PERLCROSS_TAR -L https://github.com/arsv/perl-cross/releases/download/$PERLCROSS_VERSION/$PERLCROSS_FILE
cd $TERMUX_PKG_SRCDIR
tar xf $PERLCROSS_TAR
- cd perl-${TERMUX_PKG_VERSION}
+ cd perl-${PERLCROSS_PERL_VERSION}
cp -Rf * ../
# Remove old installation to force fresh:
TERMUX_PKG_HOMEPAGE=http://picolisp.com
TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
TERMUX_PKG_DEPENDS="libcrypt, openssl"
-TERMUX_PKG_VERSION=16.4.24
+_PICOLISP_YEAR=16
+_PICOLISP_MONTH=5
+_PICOLISP_DAY=3
+TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
TERMUX_PKG_FOLDERNAME=picoLisp
TERMUX_PKG_BUILD_IN_SRC=true
termux_step_pre_configure() {
# Validate that we have the right version:
- grep -q '16 4 24' src64/version.l
+ grep -q "$_PICOLISP_YEAR $_PICOLISP_MONTH $_PICOLISP_DAY" src64/version.l
TERMUX_PKG_SRCDIR=$TERMUX_PKG_SRCDIR/src
if [ $TERMUX_ARCH_BITS = 64 ]; then
TERMUX_PKG_HOMEPAGE=http://www.freedesktop.org/wiki/Software/pkg-config/
TERMUX_PKG_DESCRIPTION="Helper tool used when compiling applications and libraries"
TERMUX_PKG_VERSION=0.29.1
+TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://pkgconfig.freedesktop.org/releases/pkg-config-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="glib"
TERMUX_PKG_RM_AFTER_INSTALL="bin/*-pkg-config"
TERMUX_PKG_HOMEPAGE=http://poppler.freedesktop.org/
TERMUX_PKG_DESCRIPTION="PDF rendering library"
-TERMUX_PKG_VERSION=0.41.0
+TERMUX_PKG_VERSION=0.43.0
TERMUX_PKG_SRCURL=http://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
# libcairo and littlecms is used by pdftocairo:
TERMUX_PKG_DEPENDS="fontconfig, libcairo, libpng, libjpeg-turbo, libtiff, littlecms, libgnustl, openjpeg"
OPENSSL=$TERMUX_PREFIX \
PREFIX=$TERMUX_PREFIX \
install
+ # Avoid specifying -lcrypt:
+ perl -p -i -e 's/-lcrypt //' $TERMUX_PREFIX/lib/pkgconfig/serf-1.pc
}
TERMUX_PKG_HOMEPAGE=https://www.stunnel.org/
TERMUX_PKG_DESCRIPTION="Socket wrapper which can provide TLS support to ordinary applications"
-TERMUX_PKG_VERSION=5.31
+TERMUX_PKG_VERSION=5.32
TERMUX_PKG_SRCURL=https://www.stunnel.org/downloads/stunnel-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="openssl, libutil"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-shared --with-ssl=$TERMUX_PREFIX --disable-fips"
TERMUX_PKG_HOMEPAGE=http://subversion.apache.org/
TERMUX_PKG_DESCRIPTION="Centralized version control system characterized by its simplicity"
-TERMUX_PKG_VERSION=1.9.3
-TERMUX_PKG_BUILD_REVISION=1
+TERMUX_PKG_VERSION=1.9.4
TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net/subversion/subversion-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_DEPENDS="apr, apr-util, serf, libexpat, libsqlite"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-sasl --without-libmagic"
TERMUX_PKG_HOMEPAGE=http://zbar.sourceforge.net
TERMUX_PKG_DESCRIPTION="Software suite for reading bar codes from various sources"
TERMUX_PKG_VERSION=0.10
+TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/zbar/zbar/0.10/zbar-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_DEPENDS="imagemagick"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-pthread --disable-video --without-xshm --without-xv --without-gtk --without-qt --without-python --mandir=$TERMUX_PREFIX/share/man"
+
+termux_step_pre_configure () {
+ # Run autoreconf since we have patched configure.ac
+ cd $TERMUX_PKG_SRCDIR
+ autoconf
+}
--- /dev/null
+diff -u -r ../zbar-0.10/configure.ac ./configure.ac
+--- ../zbar-0.10/configure.ac 2009-10-23 14:16:44.000000000 -0400
++++ ./configure.ac 2016-05-03 09:00:57.495043230 -0400
+@@ -281,15 +281,7 @@
+ ])])])
+ MAGICK_VERSION=`$PKG_CONFIG MagickWand --modversion`
+ AC_MSG_NOTICE([using ImageMagick version $MAGICK_VERSION])
+-
+-dnl double check ImageMagick install (bug #2582232)
+- CPPFLAGS_save="$CPPFLAGS"
+- CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
+- AC_CHECK_HEADER([wand/MagickWand.h], [],
+- [AC_MSG_FAILURE([ImageMagick package found but wand/MagickWand.h not installed?!
+-this is a problem with your ImageMagick install,
+-please resolve the inconsistency and try again...])])
+- CPPFLAGS="$CPPFLAGS_save"])
++ ])
+
+ AM_CONDITIONAL([HAVE_MAGICK], [test "x$with_imagemagick" = "xyes"])
+
--- /dev/null
+diff -u -r ../zbar-0.10/zbarimg/zbarimg.c ./zbarimg/zbarimg.c
+--- ../zbar-0.10/zbarimg/zbarimg.c 2009-10-23 14:16:44.000000000 -0400
++++ ./zbarimg/zbarimg.c 2016-05-03 08:54:42.053504890 -0400
+@@ -38,7 +38,7 @@
+ #include <assert.h>
+
+ #include <zbar.h>
+-#include <wand/MagickWand.h>
++#include <ImageMagick-7/MagickWand/MagickWand.h>
+
+ /* in 6.4.5.4 MagickGetImagePixels changed to MagickExportImagePixels.
+ * (still not sure this check is quite right...
~mdw / termux-packages / commitdiff