From e59b00038005cbc827debd06698d166e13e2362c Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Sat, 11 Jan 2020 21:38:29 +0200
Subject: [PATCH] poppler: update to 0.84.0

---
 packages/poppler/build.sh                        |  8 +++-----
 packages/poppler/force-termux-include-dirs.patch | 13 +++++++++++++
 packages/poppler/poppler-Form.cc.patch           | 13 -------------
 3 files changed, 16 insertions(+), 18 deletions(-)
 create mode 100644 packages/poppler/force-termux-include-dirs.patch
 delete mode 100644 packages/poppler/poppler-Form.cc.patch

diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index 74ece5682..98bf042a6 100644
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -1,12 +1,10 @@
 TERMUX_PKG_HOMEPAGE=https://poppler.freedesktop.org/
 TERMUX_PKG_DESCRIPTION="PDF rendering library"
 TERMUX_PKG_LICENSE="GPL-2.0"
-TERMUX_PKG_VERSION=0.79.0
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=0.84.0
 TERMUX_PKG_SRCURL=https://poppler.freedesktop.org/poppler-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=f985a4608fe592d2546d9d37d4182e502ff6b4c42f8db4be0a021a1c369528c8
-# libcairo and littlecms is used by pdftocairo:
-TERMUX_PKG_DEPENDS="libc++, libiconv, fontconfig, glib, libcairo, libpng, libjpeg-turbo, libtiff, littlecms, openjpeg, freetype, libcurl"
+TERMUX_PKG_SHA256=c7a130da743b38a548f7a21fe5940506fb1949f4ebdd3209f0e5b302fa139731
+TERMUX_PKG_DEPENDS="fontconfig, freetype, glib, libc++, libcairo, libcurl, libiconv, libjpeg-turbo, libpng, libtiff, littlecms, openjpeg, zlib"
 TERMUX_PKG_BREAKS="poppler-dev"
 TERMUX_PKG_REPLACES="poppler-dev"
 #texlive needs the xpdf headers
diff --git a/packages/poppler/force-termux-include-dirs.patch b/packages/poppler/force-termux-include-dirs.patch
new file mode 100644
index 000000000..e71be14b9
--- /dev/null
+++ b/packages/poppler/force-termux-include-dirs.patch
@@ -0,0 +1,13 @@
+diff -uNr poppler-0.84.0/CMakeLists.txt poppler-0.84.0.mod/CMakeLists.txt
+--- poppler-0.84.0/CMakeLists.txt	2019-12-28 14:18:51.000000000 +0200
++++ poppler-0.84.0.mod/CMakeLists.txt	2020-01-11 21:36:13.130975793 +0200
+@@ -315,6 +315,9 @@
+   set(CMAKE_CXX_FLAGS "${DEFAULT_COMPILE_WARNINGS} ${CMAKE_CXX_FLAGS}")
+ endif()
+ 
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I@TERMUX_PREFIX@/include")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I@TERMUX_PREFIX@/include")
++
+ include(ConfigureChecks.cmake)
+ configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+ configure_file(poppler/poppler-config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler/poppler-config.h)
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"