Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2014-12-30 00:49:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/inkscape (Old) and /work/SRC/openSUSE:Factory/.inkscape.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "inkscape" Changes: -------- --- /work/SRC/openSUSE:Factory/inkscape/inkscape.changes 2014-11-28 08:47:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2014-12-30 00:49:39.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Dec 29 08:31:27 UTC 2014 - [email protected] + +- Add inkscape-fix-build-with-poppler-0.29.patch: Fix build with + poppler 0.29. Patch has been backported from + https://bugs.launchpad.net/inkscape/+bug/1399811. + +------------------------------------------------------------------- New: ---- inkscape-fix-build-with-poppler-0.29.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.gez4VQ/_old 2014-12-30 00:49:41.000000000 +0100 +++ /var/tmp/diff_new_pack.gez4VQ/_new 2014-12-30 00:49:41.000000000 +0100 @@ -37,6 +37,8 @@ Patch4: inkscape-apply-invert-transform.patch # PATCH-FIX-UPSTREAM inkscape-0.48.5-librevenge.patch lp#1323592 [email protected] -- port to librevenge based libwpg (backported to inkscape 0.48.5) Patch8: inkscape-0.48.5-librevenge.patch +# PATCH-FIX-UPSTREAM inkscape-fix-build-with-poppler-0.29.patch lp#1399811 [email protected] -- fix build with poppler 0.29 (backported to inkscape 0.48.5) +Patch9: inkscape-fix-build-with-poppler-0.29.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel @@ -166,6 +168,7 @@ %patch2 -p1 %patch4 -p1 %patch8 -p1 +%patch9 -p1 %build libtoolize --force --copy --install ++++++ inkscape-fix-build-with-poppler-0.29.patch ++++++ --- inkscape-0.48.5.orig/configure.ac +++ inkscape-0.48.5/configure.ac @@ -593,6 +593,11 @@ if test "x$popplernewercolorspaceapi" = 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" --- inkscape-0.48.5.orig/src/extension/internal/pdfinput/pdf-parser.cpp +++ inkscape-0.48.5/src/extension/internal/pdfinput/pdf-parser.cpp @@ -860,7 +860,9 @@ void PdfParser::opSetExtGState(Object ar 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 @@ void PdfParser::opSetFillColorSpace(Obje 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 @@ void PdfParser::opSetStrokeColorSpace(Ob 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 @@ void PdfParser::doImage(Object *ref, Str } } 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 @@ void PdfParser::doImage(Object *ref, Str 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 @@ void PdfParser::doForm(Object *str) { 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); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
