From 350e9c0084ed930605f195094dd99bdcc26924e2fa6e6700ac7921480934b7f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Mon, 9 Jul 2018 13:00:48 +0000
Subject: [PATCH] Accepting request 621712 from home:iznogood:branches:graphics

- Add Fix-compilation-poppler-0_65.patch: Fix compilation with
  poppler 0.65.0 and newer. Replace unused includes with one that
  is actually used (lp#1772883).

OBS-URL: https://build.opensuse.org/request/show/621712
OBS-URL: https://build.opensuse.org/package/show/graphics/inkscape?expand=0&rev=40
---
 Fix-compilation-poppler-0_65.patch | 28 ++++++++++++++++++++++++++++
 inkscape.changes                   |  7 +++++++
 inkscape.spec                      |  3 +++
 3 files changed, 38 insertions(+)
 create mode 100644 Fix-compilation-poppler-0_65.patch

diff --git a/Fix-compilation-poppler-0_65.patch b/Fix-compilation-poppler-0_65.patch
new file mode 100644
index 0000000..3d0b937
--- /dev/null
+++ b/Fix-compilation-poppler-0_65.patch
@@ -0,0 +1,28 @@
+From 332a80f4847715546be9a00756f693b4aa1316e2 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 6c498f9..caaeca1 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.17.0
diff --git a/inkscape.changes b/inkscape.changes
index 8aa8ffc..abf08b9 100644
--- a/inkscape.changes
+++ b/inkscape.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul  9 12:38:09 UTC 2018 - bjorn.lie@gmail.com
+
+- Add Fix-compilation-poppler-0_65.patch: Fix compilation with
+  poppler 0.65.0 and newer. Replace unused includes with one that
+  is actually used (lp#1772883).
+
 -------------------------------------------------------------------
 Sat Jun  2 21:34:36 UTC 2018 - bjorn.lie@gmail.com
 
diff --git a/inkscape.spec b/inkscape.spec
index 1bfcc1e..d237ac4 100644
--- a/inkscape.spec
+++ b/inkscape.spec
@@ -33,6 +33,8 @@ Patch0:         inkscape-packages.patch
 Patch1:         build_internal_libraries_as_static.patch
 # PATCH-FIX-OPENSUSE fix_install_targets.patch -- use correct libdir etc.
 Patch2:         fix_install_targets.patch
+# PATCH-FIX-UPSTREAM Fix-compilation-poppler-0_65.patch -- Fix compilation with poppler 0.65.0
+Patch3:         Fix-compilation-poppler-0_65.patch
 
 BuildRequires:  gtkspell-devel
 %if 0%{?suse_version} > 1325
@@ -159,6 +161,7 @@ Inkscape is a vector graphics editor.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %ifarch %{arm}