texlive-bin: patch to make it work with poppler 0.59.0 (#1606)

packages/poppler/build.sh

@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://poppler.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="PDF rendering library"
-# Do not update before pdflatex is fixed to work with newer poppler versions:
+# When upgrading to 0.60.0, remove extra .2 and fix SRCURL...
-TERMUX_PKG_VERSION=0.59.0.1
+TERMUX_PKG_VERSION=0.59.0.2
-local _REAL_VERSION=0.57.0
+TERMUX_PKG_SHA256=a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641
-TERMUX_PKG_SHA256=0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8
+TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION:0:6}.tar.xz
-TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${_REAL_VERSION}.tar.xz
 # libcairo and littlecms is used by pdftocairo:
 TERMUX_PKG_DEPENDS="fontconfig, libcairo, libpng, libjpeg-turbo, libtiff, littlecms, openjpeg, freetype, libxml2"
 #texlive needs the xpdf headers

packages/poppler/poppler-Form.cc.patch

@@ -0,0 +1,13 @@
+Include <ctype.h> for isxdigit(3).
+
+diff -u -r ../poppler-0.59.0/poppler/Form.cc ./poppler/Form.cc
+--- ../poppler-0.59.0/poppler/Form.cc	2017-08-16 00:16:09.000000000 +0200
++++ ./poppler/Form.cc	2017-09-11 20:06:45.434163003 +0200
+@@ -29,6 +29,7 @@
+ 
+ #include <set>
+ #include <limits>
++#include <ctype.h>
+ #include <stddef.h>
+ #include <string.h>
+ #include "goo/gmem.h"

packages/texlive-bin/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 _MAJOR_VERSION=20170524
 _MINOR_VERSION=
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}${_MINOR_VERSION}
 TERMUX_PKG_SRCURL=ftp://tug.org/historic/systems/texlive/${TERMUX_PKG_VERSION:0:4}/texlive-${TERMUX_PKG_VERSION}-source.tar.xz
 TERMUX_PKG_SHA256="0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa"
@@ -72,7 +72,7 @@ ac_cv_c_bigendian=no \
 --without-x \
 --with-banner-add=/Termux"
 
-# These files are provided by texlive-base:
+# These files are provided by texlive:
 TERMUX_PKG_RM_AFTER_INSTALL="
 opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/texconfig/tcfmgr.map
 opt/texlive/${TERMUX_PKG_VERSION:0:4}/texmf-dist/texconfig/tcfmgr
@@ -128,10 +128,12 @@ termux_step_pre_configure() {
 }
 
 termux_step_post_make_install () {
+	# Add bin dir to path for new shells (doesn't work for zsh and others)
 	mkdir -p $TERMUX_PREFIX/etc/profile.d/
-	echo "export PATH=\$PATH:$TL_BINDIR" > $TERMUX_PREFIX/etc/profile.d/texlive.sh
+	echo "#!$TERMUX_PREFIX/bin/sh" > $TERMUX_PREFIX/etc/profile.d/texlive.sh
-	echo "export TMPDIR=$TERMUX_PREFIX/tmp/" >> $TERMUX_PREFIX/etc/profile.d/texlive.sh
+	echo "export PATH=\$PATH:$TL_BINDIR" >> $TERMUX_PREFIX/etc/profile.d/texlive.sh
 	chmod 0744 $TERMUX_PREFIX/etc/profile.d/texlive.sh
+	# Replace tlmgr link with a small wrapper that prevents common break on "tlmgr update --self"
 	mv $TL_BINDIR/tlmgr $TL_BINDIR/tlmgr.ln
 	echo "#!$TERMUX_PREFIX/bin/sh" > $TL_BINDIR/tlmgr
 	echo "termux-fix-shebang $TL_ROOT/texmf-dist/scripts/texlive/tlmgr.pl" >> $TL_BINDIR/tlmgr
@@ -142,9 +144,10 @@ termux_step_post_make_install () {
 
 termux_step_create_debscripts () {
 	# Clean texlive's folder if needed (run on fresh install)
-	echo "if [ ! -f $TERMUX_PREFIX/opt/texlive/2016/install-tl -a ! -f $TERMUX_PREFIX/opt/texlive/2017/install-tl ]; then exit 0; else echo 'Removing residual files from old version of TeX Live for Termux'; fi" > preinst
+	echo "#!$TERMUX_PREFIX/bin/sh" > preinst
+	echo "if [ ! -f $TERMUX_PREFIX/opt/texlive/2016/install-tl -a ! -f $TERMUX_PREFIX/opt/texlive/2017/install-tl ]; then exit 0; else echo 'Removing residual files from old version of TeX Live for Termux'; fi" >> preinst
 	echo "rm -rf $TERMUX_PREFIX/etc/profile.d/texlive.sh" >> preinst
-	echo "rm -rf $TERMUX_PREFIX/opt/texlive/2016"
+	echo "rm -rf $TERMUX_PREFIX/opt/texlive/2016" >> preinst
 	# Let's not delete the previous texmf-dist so that people who have installed a full distribution won't need to download everything again
 	echo "rm -rf $TERMUX_PREFIX/opt/texlive/2017/!(texmf-dist)" >> preinst
 	echo "exit 0" >> preinst