From bb24bb3a1d04e54e557eea0bae33f16d5f93826d Mon Sep 17 00:00:00 2001 From: Alexpux Date: Sun, 4 May 2014 18:06:26 +0400 Subject: [PATCH] inkscape: Rebuild with poppler-0.26 --- mingw-w64-inkscape/PKGBUILD | 9 ++- mingw-w64-inkscape/poppler-0.26.patch | 89 +++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-inkscape/poppler-0.26.patch diff --git a/mingw-w64-inkscape/PKGBUILD b/mingw-w64-inkscape/PKGBUILD index ad86357643..ba0b68a4e4 100644 --- a/mingw-w64-inkscape/PKGBUILD +++ b/mingw-w64-inkscape/PKGBUILD @@ -5,7 +5,7 @@ _realname=inkscape _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}" pkgver=0.48.4 -pkgrel=3 +pkgrel=4 pkgdesc="Vector graphics editor using the SVG file format (mingw-w64)" arch=('any') url="http://inkscape.sourceforge.net/" @@ -50,7 +50,8 @@ source=("http://downloads.sourceforge.net/project/${_realname}/${_realname}/${pk inkscape-0.48.4-mingw-dont-need-dl.patch inkscape-0.48.4-win32-relocatable.patch inkscape-0.48.4-win32-file-dialog.patch - inkscape-0.48.4-python-extensions-location.patch) + inkscape-0.48.4-python-extensions-location.patch + poppler-0.26.patch) sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' '6b82b0a9f31d4da453e77665098c13dec1535d5b' '71f071627b53efaa0a7a66bae0e2ef194803cbbf' @@ -63,7 +64,8 @@ sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c' 'db9c1ce6372e8670f9949d2aaef3d27f8ded32ec' '6a65e95e9d310b48b3caebc98f323183cef60e0c' 'e4841ec881085400b787b90acab959f8fe67a77c' - '185cd8f6e4ad0b55862720c47f80da9dfa8a82ff') + '185cd8f6e4ad0b55862720c47f80da9dfa8a82ff' + 'b60843f43e6d3b6cfcf4e253abb3f7ea7bc69c2a') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -79,6 +81,7 @@ prepare() { patch -p1 -i ${srcdir}/inkscape-0.48.4-win32-relocatable.patch patch -p1 -i ${srcdir}/inkscape-0.48.4-win32-file-dialog.patch patch -p1 -i ${srcdir}/inkscape-0.48.4-python-extensions-location.patch + patch -p0 -i ${srcdir}/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 diff --git a/mingw-w64-inkscape/poppler-0.26.patch b/mingw-w64-inkscape/poppler-0.26.patch new file mode 100644 index 0000000000..84b324a5df --- /dev/null +++ b/mingw-w64-inkscape/poppler-0.26.patch @@ -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("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("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