Merge pull request #3475 from tomty89/texlive-bin

texlive-bin: avoid changing {lua,pdf,xe}tex patches all the time
termux · Mar 15, 2019 · cf04e00 · cf04e00
2 parents 12ad457 + bd39c7d
commit cf04e00
Show file tree

Hide file tree

Showing 8 changed files with 1,566 additions and 1,079 deletions.
diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
@@ -157,6 +157,19 @@ termux_step_pre_configure() {
 	export OTANGLE=$TERMUX_PKG_HOSTBUILD_DIR/texk/web2c/.libs/otangle
 	# otangle is linked against libkpathsea but can't find it, so we use LD_LIBRARY_PATH
 	export LD_LIBRARY_PATH=$TERMUX_PKG_HOSTBUILD_DIR/texk/kpathsea/.libs
+
+	find "$TERMUX_PKG_SRCDIR"/texk/web2c/luatexdir -type f -exec sed -i \
+	     -e 's|gTrue|true|g' \
+	     -e 's|gFalse|false|g' \
+	     -e 's|GBool|bool|g' \
+	     -e 's|getCString|c_str|g' \
+	     -e 's|Guint|unsigned int|g' \
+	     -e 's|Guchar|unsigned char|g' \
+	     {} +
+
+	# These files are from upstream master:
+	cp "$TERMUX_PKG_BUILDER_DIR"/pdftoepdf-poppler0.72.0.cc "$TERMUX_PKG_SRCDIR"/texk/web2c/pdftexdir/pdftoepdf.cc # commit 67290f7
+	cp "$TERMUX_PKG_BUILDER_DIR"/pdftosrc-poppler0.72.0.cc "$TERMUX_PKG_SRCDIR"/texk/web2c/pdftexdir/pdftosrc.cc # commit 68f53cf
 }
 
 termux_step_create_debscripts() {

diff --git a/packages/texlive-bin/luatex-poppler-0.72.patch b/packages/texlive-bin/luatex-poppler-0.72.patch