[arch-commits] Commit in inkscape/trunk (PKGBUILD fix-build-with-poppler-0.29.0.patch)

Evangelos Foutras foutrelis at archlinux.org
Sat Dec 20 07:09:52 UTC 2014


    Date: Saturday, December 20, 2014 @ 08:09:52
  Author: foutrelis
Revision: 227815

upgpkg: inkscape 0.48.5-4

poppler 0.29.0 rebuild.

Added:
  inkscape/trunk/fix-build-with-poppler-0.29.0.patch
Modified:
  inkscape/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |    9 ++-
 fix-build-with-poppler-0.29.0.patch |   98 ++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-12-20 06:41:00 UTC (rev 227814)
+++ PKGBUILD	2014-12-20 07:09:52 UTC (rev 227815)
@@ -5,7 +5,7 @@
 
 pkgname=inkscape
 pkgver=0.48.5
-pkgrel=3
+pkgrel=4
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
@@ -19,8 +19,10 @@
             'python2-lxml: some extensions and filters'
             'uniconvertor: reading/writing to some proprietary formats')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        'fix-build-with-poppler-0.29.0.patch'
         'ime-placement.patch')
 sha1sums=('83ddb0c96069638f712a869039989bfd7d79c6a8'
+          '82ad02357a2405c11f29f2e516b1a7f55953e807'
           'b12b948ca5ee7e02703a13aa8b8bccdf67947f12')
 
 install=install
@@ -27,6 +29,11 @@
 
 prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	# https://bugs.launchpad.net/inkscape/+bug/1399811
+	patch -p0 -i ../fix-build-with-poppler-0.29.0.patch
+	autoreconf -vi
+
 	patch -p1 -i ../ime-placement.patch # FS#39898
 	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

Added: fix-build-with-poppler-0.29.0.patch
===================================================================
--- fix-build-with-poppler-0.29.0.patch	                        (rev 0)
+++ fix-build-with-poppler-0.29.0.patch	2014-12-20 07:09:52 UTC (rev 227815)
@@ -0,0 +1,98 @@
+=== modified file 'configure.ac'
+--- configure.ac	2014-06-20 21:38:59 +0000
++++ configure.ac	2014-12-10 20:32:33 +0000
+@@ -593,6 +593,11 @@
+ 	AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0])
+ fi
+ 
++PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no)
++if test "x$popplernewernewcolorspaceapi" = "xyes"; then
++	AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0])
++fi
++
+ # Poppler's b604a008 commit changes this
+ AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
+ popplergfxcolor="no"
+=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
+--- src/extension/internal/pdfinput/pdf-parser.cpp	2014-06-03 15:44:09 +0000
++++ src/extension/internal/pdfinput/pdf-parser.cpp	2014-12-10 20:32:30 +0000
+@@ -860,7 +860,9 @@
+ 	  blendingColorSpace = NULL;
+ 	  isolated = knockout = gFalse;
+ 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++	    blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
+@@ -1085,7 +1087,13 @@
+ 
+   state->setFillPattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++  if (obj.isNull()) {
++    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
++  } else {
++    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
++  }
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+   if (obj.isNull()) {
+     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+   } else {
+@@ -1126,7 +1134,13 @@
+ 
+   state->setStrokePattern(NULL);
+   res->lookupColorSpace(args[0].getName(), &obj);
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++  if (obj.isNull()) {
++    colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL);
++  } else {
++    colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL);
++  }
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+   if (obj.isNull()) {
+     colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL);
+   } else {
+@@ -2756,8 +2770,10 @@
+       }
+     }
+     if (!obj1.isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+-            colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++      colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++      colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+       colorSpace = GfxColorSpace::parse(&obj1, NULL);
+ #else
+@@ -2847,8 +2863,10 @@
+ 	  obj2.free();
+ 	}
+       }
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+-            GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++      GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++      GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
+ #else
+@@ -3040,7 +3058,9 @@
+     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
+       transpGroup = gTrue;
+       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
+-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
++#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API)
++	blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL);
++#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL);
+ #elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI)
+ 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
+
+



More information about the arch-commits mailing list