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

[Jan de Groot]

    Date: Monday, April 28, 2014 @ 16:18:58
  Author: jgc
Revision: 211861

upgpkg: inkscape 0.48.4-15

Fix build with poppler 0.26.0 by passing  some extra NULL stuff

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

--------------------+
 PKGBUILD           |   15 +++++---
 poppler-0.26.patch |   89 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 11:44:39 UTC (rev 211860)
+++ PKGBUILD	2014-04-28 14:18:58 UTC (rev 211861)
@@ -5,7 +5,7 @@
 
 pkgname=inkscape
 pkgver=0.48.4
-pkgrel=14
+pkgrel=15
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
@@ -22,21 +22,24 @@
         'spuriouscomma.patch'
         'ime-placement.patch'
         'freetype.patch'
-        'gc74.patch')
+        'gc74.patch'
+        'poppler-0.26.patch')
 sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
           '7d1d5a6d1d2b0926721a994d5889c52890fc57c1'
           'b12b948ca5ee7e02703a13aa8b8bccdf67947f12'
           'aba4d98bebae088c3401fd9259ea3cf70b96fbbf'
-          '3e1b5b6852d668388a857bc7a73fb7731fb262b8')
+          '3e1b5b6852d668388a857bc7a73fb7731fb262b8'
+          'b60843f43e6d3b6cfcf4e253abb3f7ea7bc69c2a')
 
 install=install
 
 prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd ${pkgname}-${pkgver}
 	patch -p1 -i ../gc74.patch # FS#39106
 	patch -p0 -i ../freetype.patch # FS#37956
 	patch -p1 -i ../ime-placement.patch # FS#39898
 	patch -p0 -i ../spuriouscomma.patch
+        patch -p0 -i ../poppler-0.26.patch
 	sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
 	sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
 	sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
@@ -47,7 +50,7 @@
 }
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd ${pkgname}-${pkgver}
 	./configure \
 		--prefix=/usr \
 		--with-python \
@@ -59,6 +62,6 @@
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
+	cd ${pkgname}-${pkgver}
 	make DESTDIR="${pkgdir}" install
 }

Added: poppler-0.26.patch
===================================================================
--- poppler-0.26.patch	                        (rev 0)
+++ poppler-0.26.patch	2014-04-28 14:18:58 UTC (rev 211861)
@@ -0,0 +1,89 @@
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2014-04-28 13:42:17.843140695 +0000
++++ src/extension/internal/pdfinput/pdf-parser.cpp	2014-04-28 14:05:10.646106685 +0000
+@@ -861,7 +861,7 @@
+ 	  isolated = knockout = gFalse;
+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
++	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
+ #else
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5);
+ #endif
+@@ -1085,9 +1085,9 @@
+   res->lookupColorSpace(args[0].getName(), &obj);
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+   if (obj.isNull()) {
+-    colorSpace = GfxColorSpace::parse(&args[0], NULL);
++    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+   } else {
+-    colorSpace = GfxColorSpace::parse(&obj, NULL);
++    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
+   }
+ #else
+   if (obj.isNull()) {
+@@ -1120,9 +1120,9 @@
+   res->lookupColorSpace(args[0].getName(), &obj);
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+   if (obj.isNull()) {
+-    colorSpace = GfxColorSpace::parse(&args[0], NULL);
++    colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+   } else {
+-    colorSpace = GfxColorSpace::parse(&obj, NULL);
++    colorSpace = GfxColorSpace::parse(&obj, NULL, NULL);
+   }
+ #else
+   if (obj.isNull()) {
+@@ -1213,7 +1213,7 @@
+     }
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+     if (args[numArgs-1].isName() &&
+-	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
++	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
+       state->setFillPattern(pattern);
+       builder->updateStyle(state);
+     }
+@@ -1273,7 +1273,7 @@
+     }
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+     if (args[numArgs-1].isName() &&
+-	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
++	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL, NULL))) {
+       state->setStrokePattern(pattern);
+       builder->updateStyle(state);
+     }
+@@ -1711,7 +1711,7 @@
+   GBool savedState = gFalse;
+ 
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-  if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
++  if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
+     return;
+   }
+ #else
+@@ -2727,7 +2727,7 @@
+     }
+     if (!obj1.isNull()) {
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-      colorSpace = GfxColorSpace::parse(&obj1, NULL);
++      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #else
+       colorSpace = GfxColorSpace::parse(&obj1);
+ #endif
+@@ -2816,7 +2816,7 @@
+ 	}
+       }
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-      maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
++      maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #else
+       maskColorSpace = GfxColorSpace::parse(&obj1);
+ #endif
+@@ -3007,7 +3007,7 @@
+       transpGroup = gTrue;
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+ #if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+-	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
++	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
+ #else
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3);
+ #endif