From 8ae6a1d940308d7a445ce4c763ddab161c77f98e Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Thu, 25 Dec 2014 09:53:19 +0000 Subject: main/inkscape: rebuild with poppler-0.29 --- main/inkscape/APKBUILD | 12 +++-- main/inkscape/poppler-0.29.patch | 98 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 main/inkscape/poppler-0.29.patch (limited to 'main/inkscape') diff --git a/main/inkscape/APKBUILD b/main/inkscape/APKBUILD index c7706d7d8b..f51d3b2732 100644 --- a/main/inkscape/APKBUILD +++ b/main/inkscape/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=inkscape pkgver=0.48.5 -pkgrel=2 +pkgrel=3 pkgdesc="A vector-based drawing program - svg compliant" url="http://inkscape.sourceforge.net/" arch="all" @@ -27,6 +27,7 @@ install= subpackages="$pkgname-doc $pkgname-lang $pkgname-view" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz automake.patch + poppler-0.29.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -77,8 +78,11 @@ doc() { "$subpkgdir"/usr/share/inkscape } md5sums="4e25b665ab40506955fb520aaa4e0d8f inkscape-0.48.5.tar.gz -f212448d60a2182611071e40d247da06 automake.patch" +f212448d60a2182611071e40d247da06 automake.patch +682fd46194eb9f1cffbb1e0815e4b29e poppler-0.29.patch" sha256sums="ff5194f78057ab24234ed71b8e7aa227d4847d42166c6d44391efa86f3caf130 inkscape-0.48.5.tar.gz -4c21350f16032615ff98096a1cd7bf83ec3a55f8df4f3ed4ea356d47f9df6a78 automake.patch" +4c21350f16032615ff98096a1cd7bf83ec3a55f8df4f3ed4ea356d47f9df6a78 automake.patch +33a5cf1deb60984e1d1ab53358fe5cb29de031e2301d6c48d70234610a2a98e1 poppler-0.29.patch" sha512sums="dd62a3b7d1b6875f83f3ec88646c1576735b7d359f75722f1ad6204530370d45256de54781b9f51f97aed32f19e23d7bee059339d398efbff01169f66d982818 inkscape-0.48.5.tar.gz -fab98a525a3343eda7c8e8ce59ce9a8f977c1b8edea07870cc4f4b23fc0fd452792b39f2a87cebb5be110e2b82cf95bc871be9d0f3c1a764d6ded86e218e1537 automake.patch" +fab98a525a3343eda7c8e8ce59ce9a8f977c1b8edea07870cc4f4b23fc0fd452792b39f2a87cebb5be110e2b82cf95bc871be9d0f3c1a764d6ded86e218e1537 automake.patch +588038877a84fa8edfed953631ef202b75b599ee27ef3725ff0df074fca34f725803e831a564c8308073d36e2aa32835c3b09f40d7ca0c45b85d9e3bed9be0d8 poppler-0.29.patch" diff --git a/main/inkscape/poppler-0.29.patch b/main/inkscape/poppler-0.29.patch new file mode 100644 index 0000000000..8b326a4f62 --- /dev/null +++ b/main/inkscape/poppler-0.29.patch @@ -0,0 +1,98 @@ +=== modified file 'configure.ac' +--- a/configure.ac 2014-06-20 21:38:59 +0000 ++++ b/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' +--- a/src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-03 15:44:09 +0000 ++++ b/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("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("S"), &obj2)->isName(const_cast("Transparency"))) { + transpGroup = gTrue; + if (!obj1.dictLookup(const_cast("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); + + -- cgit v1.2.3