From 0a40da7c6c590b0aeaa011bbf9c0105567b6ba56 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Fri, 20 Mar 2020 09:40:41 +0100
Subject: [PATCH] texlive-bin: use newer source tar

* Modify pdftoepdf-poppler0.86.0.cc to not use c++14 features
* Switch to liblua52 instead of liblua. I cannot find patches/sources
  for luatex that support liblua 5.3
---
 packages/texlive-bin/build.sh                 |  9 ++--
 .../texlive-bin/pdftoepdf-poppler0.86.0.cc    |  2 +-
 .../texlive-bin/texlive-poppler-0.84.patch    | 44 -------------------
 3 files changed, 6 insertions(+), 49 deletions(-)
 delete mode 100644 packages/texlive-bin/texlive-poppler-0.84.patch

diff --git a/packages/texlive-bin/build.sh b/packages/texlive-bin/build.sh
index ae22fa321..df0f93e8d 100644
--- a/packages/texlive-bin/build.sh
+++ b/packages/texlive-bin/build.sh
@@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=20190410
-TERMUX_PKG_REVISION=12
-TERMUX_PKG_SRCURL=https://github.com/TeX-Live/texlive-source/archive/build-svn50882.tar.gz
-TERMUX_PKG_SHA256=a7462f8e29163faa52ad2ac658727b60f95241449832f1a4dac8d8a406d18233
-TERMUX_PKG_DEPENDS="libc++, libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua, poppler, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib"
+TERMUX_PKG_REVISION=13
+_SVN_VERSION=54408
+TERMUX_PKG_SRCURL=https://github.com/TeX-Live/texlive-source/archive/svn${_SVN_VERSION}.tar.gz
+TERMUX_PKG_SHA256=aa394d66ce32858645ebe9a70c5b3aad4b8f8a79054c35918aaef7f91908d8b7
+TERMUX_PKG_DEPENDS="libc++, libiconv, freetype, libpng, libgd, libgmp, libmpfr, libicu, liblua52, poppler, libgraphite, harfbuzz, harfbuzz-icu, teckit, libpixman, libcairo, zlib"
 # libpcre, glib, fonconfig are dependencies to libcairo. pkg-config gives an error if they are missing
 # libuuid, libxml2 are needed by fontconfig
 TERMUX_PKG_BUILD_DEPENDS="icu-devtools, pcre, glib, fontconfig, libuuid, libxml2"
diff --git a/packages/texlive-bin/pdftoepdf-poppler0.86.0.cc b/packages/texlive-bin/pdftoepdf-poppler0.86.0.cc
index b9cdf38e6..fef0be2e8 100644
--- a/packages/texlive-bin/pdftoepdf-poppler0.86.0.cc
+++ b/packages/texlive-bin/pdftoepdf-poppler0.86.0.cc
@@ -723,7 +723,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
 #endif
     // initialize
     if (!isInit) {
-        globalParams = std::make_unique<GlobalParams>();
+        globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
         globalParams->setErrQuiet(false);
         isInit = true;
     }
diff --git a/packages/texlive-bin/texlive-poppler-0.84.patch b/packages/texlive-bin/texlive-poppler-0.84.patch
deleted file mode 100644
index c8d8bef86..000000000
--- a/packages/texlive-bin/texlive-poppler-0.84.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001
-From: Mikle Kolyada <zlogene@gentoo.org>
-Date: Tue, 31 Dec 2019 11:29:30 +0300
-Subject: [PATCH] poppler-0.84 compat
-
-Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html
-
-Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
----
- texk/web2c/pdftexdir/utils.c    | 1 -
- texk/web2c/xetexdir/XeTeX_ext.c | 3 +++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
-index c93a8781..6f866e76 100644
---- a/texk/web2c/pdftexdir/utils.c
-+++ b/texk/web2c/pdftexdir/utils.c
-@@ -33,7 +33,6 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
- #include "ptexlib.h"
- #include <png.h>
- #ifdef POPPLER_VERSION
--#include <poppler-config.h>
- #define xpdfVersion POPPLER_VERSION
- #define xpdfString "poppler"
- #else
-diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
-index 4968ee41..0aee4ee3 100644
---- a/texk/web2c/xetexdir/XeTeX_ext.c
-+++ b/texk/web2c/xetexdir/XeTeX_ext.c
-@@ -38,7 +38,10 @@ authorization from the copyright holders.
- 
- #include <w2c/config.h>
- 
-+#ifndef POPPLER_VERSION
- #include <poppler-config.h>
-+#endif
-+
- #include <png.h>
- #include <zlib.h>
- #include <graphite2/Font.h>
--- 
-2.24.1
-
-