From 7353f22b166ad508614cd3d0c5a4912c1b59dd91 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Tue, 8 Jan 2019 06:11:25 -0200
Subject: [PATCH] libgdal: rebuild against libpoppler.so.84

---
 srcpkgs/libgdal/patches/poppler-073.patch | 64 +++++++++++++++++++++++
 srcpkgs/libgdal/template                  |  2 +-
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/libgdal/patches/poppler-073.patch

diff --git a/srcpkgs/libgdal/patches/poppler-073.patch b/srcpkgs/libgdal/patches/poppler-073.patch
new file mode 100644
index 00000000000..a390ea3518b
--- /dev/null
+++ b/srcpkgs/libgdal/patches/poppler-073.patch
@@ -0,0 +1,64 @@
+diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
+index b00560d..f9b4955 100644
+--- frmts/pdf/pdfio.cpp
++++ frmts/pdf/pdfio.cpp
+@@ -389,7 +389,7 @@ GBool VSIPDFFileStream::hasGetChars()
+ /*                            getChars()                                */
+ /************************************************************************/
+ 
+-int VSIPDFFileStream::getChars(int nChars, Guchar *buffer)
++int VSIPDFFileStream::getChars(int nChars, unsigned char *buffer)
+ {
+     int nRead = 0;
+     while (nRead < nChars)
+diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
+index 795fc2b..f73bb99 100644
+--- frmts/pdf/pdfio.h
++++ frmts/pdf/pdfio.h
+@@ -30,6 +30,7 @@
+ #ifndef PDFIO_H_INCLUDED
+ #define PDFIO_H_INCLUDED
+ 
++#include <goo/gfile.h>
+ #include "cpl_vsi_virtual.h"
+ 
+ /************************************************************************/
+@@ -46,9 +47,9 @@
+ #define moveStart_delta_type Goffset
+ #else
+ #define getPos_ret_type int
+-#define getStart_ret_type Guint
+-#define makeSubStream_offset_type Guint
+-#define setPos_offset_type Guint
++#define getStart_ret_type unsigned int
++#define makeSubStream_offset_type unsigned int
++#define setPos_offset_type unsigned int
+ #define moveStart_delta_type int
+ #endif
+ 
+@@ -109,10 +110,10 @@ class VSIPDFFileStream final: public BaseStream
+          * but will still compile correctly.
+          */
+         virtual GBool hasGetChars() override;
+-        virtual int getChars(int nChars, Guchar *buffer) override;
++        virtual int getChars(int nChars, unsigned char *buffer) override;
+ #else
+         virtual GBool hasGetChars() ;
+-        virtual int getChars(int nChars, Guchar *buffer) ;
++        virtual int getChars(int nChars, unsigned char *buffer) ;
+ #endif
+ 
+         VSIPDFFileStream  *poParent;
+diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
+index 9150b0f..5e0f669 100644
+--- frmts/pdf/pdfsdk_headers.h
++++ frmts/pdf/pdfsdk_headers.h
+@@ -50,7 +50,6 @@
+ #pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */
+ #endif
+ 
+-#include <goo/gtypes.h>
+ #include <goo/GooList.h>
+ 
+ /* begin of poppler xpdf includes */
+
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 95683ba5e48..5775dfec3e3 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=2.4.0
-revision=1
+revision=2
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-poppler"