From 5374e86fe3ef16c12cc87ababa210f2e67ba2aa6 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 14 Sep 2017 20:21:50 +0200
Subject: [PATCH] poppler: Revert back to 0.57.0 (see #1486)

The package version number is 0.59.0.1 to get a higher version
number, but the poppler version used is 0.57.0.

This ugliness will be temporary until we can update to a later
version.
---
 packages/poppler/build.sh              |  8 +++++---
 packages/poppler/poppler-Form.cc.patch | 13 -------------
 2 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 packages/poppler/poppler-Form.cc.patch

diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index e71418b73..e9d03214d 100644
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -1,8 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://poppler.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="PDF rendering library"
-TERMUX_PKG_VERSION=0.59.0
-TERMUX_PKG_SHA256=a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641
-TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
+# Do not update before pdflatex is fixed to work with newer poppler versions:
+TERMUX_PKG_VERSION=0.59.0.1
+local _REAL_VERSION=0.57.0
+TERMUX_PKG_SHA256=0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8
+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"
 #texlive needs the xpdf headers
diff --git a/packages/poppler/poppler-Form.cc.patch b/packages/poppler/poppler-Form.cc.patch
deleted file mode 100644
index d2ccbdd79..000000000
--- a/packages/poppler/poppler-Form.cc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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"