[arch-commits] Commit in inkscape/trunk (PKGBUILD poppler-0.65.0.patch)

[Evangelos Foutras]

    Date: Monday, August 6, 2018 @ 22:41:37
  Author: foutrelis
Revision: 331063

Fix build with poppler >= 0.65.0

Added:
  inkscape/trunk/poppler-0.65.0.patch
Modified:
  inkscape/trunk/PKGBUILD

----------------------+
 PKGBUILD             |    3 +++
 poppler-0.65.0.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-06 22:38:14 UTC (rev 331062)
+++ PKGBUILD	2018-08-06 22:41:37 UTC (rev 331063)
@@ -22,8 +22,10 @@
             'python2-numpy: some extensions'
             'python2-lxml: some extensions and filters')
 source=("https://media.inkscape.org/dl/resources/file/${pkgname}-${pkgver}.tar.bz2"
+        'poppler-0.65.0.patch'
         'noconst.patch')
 sha256sums=('063296c05a65d7a92a0f627485b66221487acfc64a24f712eb5237c4bd7816b2'
+            'd6957a4f618eb26d2ba6f2aae4e825970e8243af549c4d3ba1ef49a16e220984'
             '2759288bc1dbf120a3b3be7b2e36c1cd60408c043f6563ddf7092755feee99d0')
 
 # NB: Some CDN nodes appear to be distributing an outdated version of this file.
@@ -31,6 +33,7 @@
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./autogen.sh
+	patch -p1 -i ../poppler-0.65.0.patch
 	patch -p1 -i ../noconst.patch
 
 	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py

Added: poppler-0.65.0.patch
===================================================================
--- poppler-0.65.0.patch	                        (rev 0)
+++ poppler-0.65.0.patch	2018-08-06 22:41:37 UTC (rev 331063)
@@ -0,0 +1,29 @@
+From 10e8ae0ff522d3a9caeed9a7f137cdfd795ba0a3 Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler at 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 at 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
+