inkscape: fix for poppler-0.65.0

inkscape/.md5sum

@@ -1,2 +0,0 @@
-4ef7171cc1de9e1608d8c49b77fed99e  inkscape-0.92.3.tar.bz2
-a40e58c35338bd6435467657a071cecd  noconst.patch

inkscape/.signature

@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3/QgDfhcsrrJ9WLSxfgHOsT12rIdi/EA7lhR7YK9DwufYGb8mblWAiHIRtAmIoy1CKJrcjTulCmkFXsS7XJQ5g0=
-SHA256 (Pkgfile) = 35738ec598d3df3b2293ccb527a938df988befcaf16e7da606721d47184f20df
+RWSagIOpLGJF36LjhyUzIFrzanFIZ6vRyGURVIVh3RbFyggerAsHZqQaFmUC7UPxcL1KmthKBONO32mb5/M8cd9CucK3HZIA1A0=
+SHA256 (Pkgfile) = a6ba2387006193649292c19bfe960e0e83b884d9d6c5047220f33084ce49c651
 SHA256 (.footprint) = a231855b77d8603f16e2a8754074e97f6c430bf80ac8ccaa02b35814f2f4db2b
 SHA256 (inkscape-0.92.3.tar.bz2) = 063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2
 SHA256 (noconst.patch) = 2759288bc1dbf120a3b3be7b2e36c1cd60408c043f6563ddf7092755feee99d0
+SHA256 (poppler-0.65.0.patch) = d6957a4f618eb26d2ba6f2aae4e825970e8243af549c4d3ba1ef49a16e220984

inkscape/Pkgfile

@@ -8,12 +8,14 @@ name=inkscape
 version=0.92.3
 release=1
 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.bz2
-	noconst.patch)
+	noconst.patch
+	poppler-0.65.0.patch)
 
 build() {
 	cd $name-$version
 
 	patch -p1 -i $SRC/noconst.patch
+	patch -p1 -i $SRC/poppler-0.65.0.patch
 	sed -i 's| abs(| std::fabs(|g' src/ui/tools/flood-tool.cpp
 
 	CXXFLAGS+=' -std=c++11'

inkscape/poppler-0.65.0.patch

@@ -0,0 +1,29 @@
+From 10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3 Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler@pld-linux.org>
+Date: Fri, 25 May 2018 00:30:17 +0200
+Subject: [PATCH] Fix compilation with poppler 0.65.0
+
+replace unused includes with one that is actually used
+
+Signed-off-by: Jan Palus <atler@pld-linux.org>
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 721524e10a..a3aa3213a1 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -37,8 +37,7 @@ extern "C" {
+ #include "util/units.h"
+ 
+ #include "goo/gmem.h"
+-#include "goo/GooTimer.h"
+-#include "goo/GooHash.h"
++#include "goo/GooString.h"
+ #include "GlobalParams.h"
+ #include "CharTypes.h"
+ #include "Object.h"
+-- 
+2.18.0
+