| 1 |
mrueg 15/01/03 17:14:41 |
| 2 |
|
| 3 |
Added: inkscape-0.91_pre3-poppler-0.29.patch |
| 4 |
Log: |
| 5 |
Fix build with poppler-0.29. See bug #534352 |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key ) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/inkscape/files/inkscape-0.91_pre3-poppler-0.29.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-poppler-0.29.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/inkscape/files/inkscape-0.91_pre3-poppler-0.29.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: inkscape-0.91_pre3-poppler-0.29.patch |
| 16 |
=================================================================== |
| 17 |
=== modified file 'configure.ac' |
| 18 |
--- configure.ac 2014-11-30 23:03:49 +0000 |
| 19 |
+++ configure.ac 2014-12-11 00:09:21 +0000 |
| 20 |
@@ -497,6 +497,11 @@ |
| 21 |
AC_DEFINE(POPPLER_EVEN_NEWER_COLOR_SPACE_API, 1, [Use even newer color space API from Poppler >= 0.26.0]) |
| 22 |
fi |
| 23 |
|
| 24 |
+PKG_CHECK_MODULES(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, poppler >= 0.29.0, popplernewernewcolorspaceapi=yes, popplernewernewcolorspaceapi=no) |
| 25 |
+if test "x$popplernewernewcolorspaceapi" = "xyes"; then |
| 26 |
+ AC_DEFINE(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API, 1, [Use even newer new color space API from Poppler >= 0.29.0]) |
| 27 |
+fi |
| 28 |
+ |
| 29 |
# Poppler's b604a008 commit changes this |
| 30 |
AC_MSG_CHECKING([whether GfxPatch in Poppler no longer uses GfxColor]) |
| 31 |
popplergfxcolor="no" |
| 32 |
|
| 33 |
=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp' |
| 34 |
--- src/extension/internal/pdfinput/pdf-parser.cpp 2014-10-16 06:31:29 +0000 |
| 35 |
+++ src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-11 00:09:21 +0000 |
| 36 |
@@ -923,7 +923,9 @@ |
| 37 |
GBool isolated = gFalse; |
| 38 |
GBool knockout = gFalse; |
| 39 |
if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) { |
| 40 |
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 41 |
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) |
| 42 |
+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); |
| 43 |
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 44 |
blendingColorSpace = GfxColorSpace::parse(&obj5, NULL, NULL); |
| 45 |
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) |
| 46 |
blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); |
| 47 |
@@ -1159,7 +1161,13 @@ |
| 48 |
res->lookupColorSpace(args[0].getName(), &obj); |
| 49 |
|
| 50 |
GfxColorSpace *colorSpace = 0; |
| 51 |
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 52 |
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) |
| 53 |
+ if (obj.isNull()) { |
| 54 |
+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); |
| 55 |
+ } else { |
| 56 |
+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); |
| 57 |
+ } |
| 58 |
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 59 |
if (obj.isNull()) { |
| 60 |
colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); |
| 61 |
} else { |
| 62 |
@@ -1202,7 +1210,13 @@ |
| 63 |
|
| 64 |
state->setStrokePattern(NULL); |
| 65 |
res->lookupColorSpace(args[0].getName(), &obj); |
| 66 |
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 67 |
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) |
| 68 |
+ if (obj.isNull()) { |
| 69 |
+ colorSpace = GfxColorSpace::parse(NULL, &args[0], NULL, NULL); |
| 70 |
+ } else { |
| 71 |
+ colorSpace = GfxColorSpace::parse(NULL, &obj, NULL, NULL); |
| 72 |
+ } |
| 73 |
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 74 |
if (obj.isNull()) { |
| 75 |
colorSpace = GfxColorSpace::parse(&args[0], NULL, NULL); |
| 76 |
} else { |
| 77 |
@@ -2910,7 +2924,9 @@ |
| 78 |
} |
| 79 |
} |
| 80 |
if (!obj1.isNull()) { |
| 81 |
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 82 |
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) |
| 83 |
+ colorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); |
| 84 |
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 85 |
colorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); |
| 86 |
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) |
| 87 |
colorSpace = GfxColorSpace::parse(&obj1, NULL); |
| 88 |
@@ -3004,7 +3020,9 @@ |
| 89 |
obj2.free(); |
| 90 |
} |
| 91 |
} |
| 92 |
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 93 |
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) |
| 94 |
+ GfxColorSpace *maskColorSpace = GfxColorSpace::parse(NULL, &obj1, NULL, NULL); |
| 95 |
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 96 |
GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL, NULL); |
| 97 |
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) |
| 98 |
GfxColorSpace *maskColorSpace = GfxColorSpace::parse(&obj1, NULL); |
| 99 |
@@ -3196,7 +3214,9 @@ |
| 100 |
if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { |
| 101 |
transpGroup = gTrue; |
| 102 |
if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) { |
| 103 |
-#if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 104 |
+#if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) |
| 105 |
+ blendingColorSpace = GfxColorSpace::parse(NULL, &obj3, NULL, NULL); |
| 106 |
+#elif defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) |
| 107 |
blendingColorSpace = GfxColorSpace::parse(&obj3, NULL, NULL); |
| 108 |
#elif defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) |
| 109 |
blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); |
Archives