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

---
 srcpkgs/ipe/patches/poppler-073.patch | 27 +++++++++++++++++++++++++++
 srcpkgs/ipe/template                  |  8 ++++----
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/ipe/patches/poppler-073.patch

diff --git a/srcpkgs/ipe/patches/poppler-073.patch b/srcpkgs/ipe/patches/poppler-073.patch
new file mode 100644
index 00000000000..f38b47c2708
--- /dev/null
+++ b/srcpkgs/ipe/patches/poppler-073.patch
@@ -0,0 +1,27 @@
+diff --git a/ipe-tools/pdftoipe/parseargs.h b/ipe-tools/pdftoipe/parseargs.h
+index 8530bd1..bf87418 100644
+--- ipe-tools/pdftoipe/parseargs.h
++++ ipe-tools/pdftoipe/parseargs.h
+@@ -27,8 +27,6 @@
+ extern "C" {
+ #endif
+ 
+-#include "goo/gtypes.h"
+-
+ /*
+  * Argument kinds.
+  */
+diff --git a/ipe-tools/pdftoipe/xmloutputdev.cpp b/ipe-tools/pdftoipe/xmloutputdev.cpp
+index 3c38f2e..7186437 100644
+--- ipe-tools/pdftoipe/xmloutputdev.cpp
++++ ipe-tools/pdftoipe/xmloutputdev.cpp
+@@ -330,7 +330,7 @@ void XmlOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+   finishText();
+ 
+   ImageStream *imgStr;
+-  Guchar *p;
++  unsigned char *p;
+   GfxRGB rgb;
+   int x, y;
+   int c;
+
diff --git a/srcpkgs/ipe/template b/srcpkgs/ipe/template
index bcbecf5f863..26877708010 100644
--- a/srcpkgs/ipe/template
+++ b/srcpkgs/ipe/template
@@ -1,7 +1,7 @@
 # Template file for 'ipe'
 pkgname=ipe
 version=7.2.7
-revision=14
+revision=15
 _tools_commit=e5b23399a83d69fd5bb5d4645ef7325b4b57435b
 hostmakedepends="pkg-config qt5-qmake qt5-tools qt5-host-tools wget"
 makedepends="qt5-devel lua52-devel libjpeg-turbo-devel cairo-devel poppler-devel"
@@ -28,9 +28,9 @@ post_extract() {
 }
 
 do_build() {
-	make ${makejobs} -C src IPEPREFIX=/usr LUA_PACKAGE=lua5.2 CXX="$CXX"
-	make ${makejobs} -C ipe-tools/figtoipe CXX="$CXX"
-	make ${makejobs} -C ipe-tools/pdftoipe CXX="$CXX"
+	make ${makejobs} -C src IPEPREFIX=/usr LUA_PACKAGE=lua5.2 CXX="$CXX" CXXFLAGS="$CXXFLAGS"
+	make ${makejobs} -C ipe-tools/figtoipe CXX="$CXX" CXXFLAGS="$CXXFLAGS"
+	make ${makejobs} -C ipe-tools/pdftoipe CXX="$CXX" CXXFLAGS="$CXXFLAGS"
 }
 
 do_install() {