Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=b9a083fbe5a1e4bf6601e7cec7fe25ef8cdcb8a6

commit b9a083fbe5a1e4bf6601e7cec7fe25ef8cdcb8a6
Author: Baste <[email protected]>
Date:   Wed Apr 29 09:27:27 2015 +0200

inkscape-0.48.5-3-x86_64
- Add poppler patch

diff --git a/source/xapps-extra/inkscape/FrugalBuild 
b/source/xapps-extra/inkscape/FrugalBuild
index 5a3a948..d489781 100644
--- a/source/xapps-extra/inkscape/FrugalBuild
+++ b/source/xapps-extra/inkscape/FrugalBuild
@@ -20,7 +20,9 @@ _F_sourceforge_rss_limit=100
#_F_sourceforge_subdir="$pkgname"
Finclude sourceforge
url="http://www.inkscape.org/";
-sha1sums=('83ddb0c96069638f712a869039989bfd7d79c6a8')
+source=($source poppler.patch)
+sha1sums=('83ddb0c96069638f712a869039989bfd7d79c6a8' \
+          '8b5fa436298b992d6458e4e852a8baa55a92f224')

# TODO: java ?!

diff --git a/source/xapps-extra/inkscape/poppler.patch 
b/source/xapps-extra/inkscape/poppler.patch
new file mode 100644
index 0000000..fede780
--- /dev/null
+++ b/source/xapps-extra/inkscape/poppler.patch
@@ -0,0 +1,99 @@
+=== 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);
+
+
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to