From 001a63f1efa45ae331bedac7036d83a423cd213e Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Thu, 16 May 2019 13:51:43 +0300
Subject: [PATCH] inkscape: Rebuild for poppler 0.76

---
 mingw-w64-inkscape/PKGBUILD                   |  9 ++--
 .../inkscape-0.92.4-poppler-0_76.patch        | 43 +++++++++++++++++++
 2 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-inkscape/inkscape-0.92.4-poppler-0_76.patch

diff --git a/mingw-w64-inkscape/PKGBUILD b/mingw-w64-inkscape/PKGBUILD
index 0801ed0778..d98a6bc2f9 100644
--- a/mingw-w64-inkscape/PKGBUILD
+++ b/mingw-w64-inkscape/PKGBUILD
@@ -12,7 +12,7 @@ _realname=inkscape
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.92.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Vector graphics editor using the SVG file format (mingw-w64)"
 arch=('any')
 url="https://inkscape.sourceforge.io/"
@@ -60,7 +60,8 @@ source=(https://media.inkscape.org/dl/resources/file/${_realname}-${pkgver}.tar.
         inkscape-0.48.4-python-extensions-location.patch
         inkscape-0.91-simulaneous-intltool-gettext.patch
         inkscape-0.92.3-abs-overloaded.patch
-        inkscape-0.92.2-fix-imagemagick-detect.patch)
+        inkscape-0.92.2-fix-imagemagick-detect.patch
+        inkscape-0.92.4-poppler-0_76.patch)
 sha256sums=('57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e'
             'e578fbef476704a42522ec5298f0202d2e600c2e03a98dba2c62d4ee1e53b6b5'
             'ee948c90126407285b262cbea3d5a182e8fc166fddce09ea33d689fde3101a49'
@@ -68,7 +69,8 @@ sha256sums=('57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e'
             '55b0922f98c98ac5df8ba0869c46ff9eeeee9aaceef9afbaad9c4763dd3923ba'
             'ea625d1d7260d32866e4e61946fa02793b1762f66dc223364dbcc5e628bb5bfe'
             '833980a8bd2c67be66a8d7c211c7996984728372a2c55ec71e1f93e2fb2343c5'
-            'aa118059aee51702af6131d95de05c4cee4e5ddfaaba5a43783c3c537c943458')
+            'aa118059aee51702af6131d95de05c4cee4e5ddfaaba5a43783c3c537c943458'
+            '4becae86497871076d4b790123eb0624687e3d8509845b0d5c750a5145e8fa1f')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
@@ -80,6 +82,7 @@ prepare() {
   
   patch -p1 -i ${srcdir}/inkscape-0.92.3-abs-overloaded.patch
   #patch -p1 -i ${srcdir}/inkscape-0.92.2-fix-imagemagick-detect.patch
+  patch -p1 -i ${srcdir}/inkscape-0.92.4-poppler-0_76.patch
 
   ./autogen.sh 
   
diff --git a/mingw-w64-inkscape/inkscape-0.92.4-poppler-0_76.patch b/mingw-w64-inkscape/inkscape-0.92.4-poppler-0_76.patch
new file mode 100644
index 0000000000..98ef26dcbe
--- /dev/null
+++ b/mingw-w64-inkscape/inkscape-0.92.4-poppler-0_76.patch
@@ -0,0 +1,43 @@
+From e831b034746f8dc3c3c1b88372751f6dcb974831 Mon Sep 17 00:00:00 2001
+From: Marc Jeanmougin <marc@jeanmougin.fr>
+Date: Wed, 24 Apr 2019 14:11:26 +0200
+Subject: [PATCH] Tentative fix for poppler 0.76
+
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp           | 2 +-
+ src/extension/internal/pdfinput/poppler-transition-api.h | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 8484984bdf..4f798e35bf 100644
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -421,7 +421,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
+ 	error(errInternal, -1, "Weird page contents");
+     	return;
+   }
+-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
++  parser = new _POPPLER_NEW_PARSER(xref, obj);
+   go(topLevel);
+   delete parser;
+   parser = nullptr;
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index 61a15083a0..5e8bc4ae90 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -14,6 +14,13 @@
+ 
+ #include <glib/poppler-features.h>
+ 
++#if POPPLER_CHECK_VERSION(0, 76, 0)
++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, obj, gFalse)
++#else
++#define _POPPLER_NEW_PARSER(xref, obj) Parser(xref, new Lexer(xref, obj), gFalse)
++#endif
++
++
+ #if POPPLER_CHECK_VERSION(0, 72, 0)
+ #define getCString c_str
+ #endif
+-- 
+2.21.0