Hello community, here is the log from the commit of package inkscape for openSUSE:Factory checked in at 2014-05-17 21:43:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-05-02 13:56:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.inkscape.new/inkscape.changes 2014-05-17 21:43:49.000000000 +0200 @@ -1,0 +2,7 @@ +Tue May 13 19:44:15 UTC 2014 - [email protected] + +- Pick + bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff + Port to poppler-0.26 (lp#1315142). + +------------------------------------------------------------------- New: ---- bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ inkscape.spec ++++++ --- /var/tmp/diff_new_pack.0JywHR/_old 2014-05-17 21:43:50.000000000 +0200 +++ /var/tmp/diff_new_pack.0JywHR/_new 2014-05-17 21:43:50.000000000 +0200 @@ -39,6 +39,8 @@ Patch5: inkscape-gcc48-buildfix.patch # PATCH-FIX-UPSTREAM inkscape-use-recommended-freetype-include.patch [email protected] -- Use freetype recommended include style Patch6: inkscape-use-recommended-freetype-include.patch +# PATCH-FIX-UPSTREAM bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff lp#1315142 [email protected] -- port to poppler 0.26 +Patch7: bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff BuildRequires: boost-devel BuildRequires: docbook-toys BuildRequires: fdupes @@ -164,6 +166,9 @@ %patch4 -p1 %patch5 -p0 %patch6 -p0 +%if 0%{suse_version} > 1310 +%patch7 -p0 +%endif %build RPM_OPT_FLAGS="%{optflags}" ++++++ bug-1315142-patch-src_extension_internal_pdfinput_pdf-parser_cpp-r13333-v2.diff ++++++ === modified file 'src/extension/internal/pdfinput/pdf-parser.cpp' Index: src/extension/internal/pdfinput/pdf-parser.cpp =================================================================== --- src/extension/internal/pdfinput/pdf-parser.cpp.orig +++ src/extension/internal/pdfinput/pdf-parser.cpp @@ -861,7 +861,7 @@ void PdfParser::opSetExtGState(Object ar isolated = knockout = gFalse; if (!obj4.dictLookup(const_cast<char*>("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 @@ void PdfParser::opSetFillColorSpace(Obje 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 @@ void PdfParser::opSetStrokeColorSpace(Ob 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 @@ void PdfParser::opSetFillColorN(Object a } #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 @@ void PdfParser::opSetStrokeColorN(Object } #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 @@ void PdfParser::opShFill(Object args[], 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 @@ void PdfParser::doImage(Object *ref, Str } 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 @@ void PdfParser::doImage(Object *ref, Str } } #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 @@ void PdfParser::doForm(Object *str) { transpGroup = gTrue; if (!obj1.dictLookup(const_cast<char*>("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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
