From 05f6b769c6ffe523f56635712b5d8a273b025f40 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 23 Jun 2012 12:22:26 -0500 Subject: [PATCH] adapt upstream poppler-0.20 patch this one fixes things conditionally instead of hard-coding poppler-0.20 use --- inkscape-0.48.2-poppler_020.patch | 639 ++++++++++++++++-------------- inkscape.spec | 13 +- 2 files changed, 346 insertions(+), 306 deletions(-) diff --git a/inkscape-0.48.2-poppler_020.patch b/inkscape-0.48.2-poppler_020.patch index b6f11fe..427d436 100644 --- a/inkscape-0.48.2-poppler_020.patch +++ b/inkscape-0.48.2-poppler_020.patch @@ -1,12 +1,31 @@ -diff -Naur inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.48.2-new/src/extension/internal/pdfinput/pdf-parser.cpp ---- inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp 2011-07-08 20:25:09.000000000 +0200 -+++ inkscape-0.48.2-new/src/extension/internal/pdfinput/pdf-parser.cpp 2012-05-27 02:17:07.253947245 +0200 -@@ -367,14 +367,14 @@ +diff -up inkscape-0.48.2/configure.ac.poppler_020 inkscape-0.48.2/configure.ac +--- inkscape-0.48.2/configure.ac.poppler_020 2011-07-08 14:23:16.270623076 -0500 ++++ inkscape-0.48.2/configure.ac 2012-06-23 12:01:38.918678539 -0500 +@@ -623,6 +623,12 @@ if test "x$popplernew" = "xyes"; then + AC_DEFINE(POPPLER_NEW_GFXFONT, 1, [Use GfxFont from Poppler >= 0.8.3]) + fi + ++PKG_CHECK_MODULES(POPPLER_NEWERRORAPI, poppler >= 0.20.0, popplernewerror=yes, popplernewerror=no) ++if test "x$popplernewerror" = "xyes"; then ++ AC_DEFINE(POPPLER_NEW_ERRORAPI, 1, [Use new error API from Poppler >= 0.20.0]) ++fi ++ ++ + ink_svd_CPPFLAGS=$CPPFLAGS + ink_svd_LIBS=$LIBS + CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS" +diff -up inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp.poppler_020 inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp +--- inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp.poppler_020 2011-07-08 13:25:09.468790000 -0500 ++++ inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp 2012-06-23 12:08:49.285298266 -0500 +@@ -367,15 +367,23 @@ void PdfParser::parse(Object *obj, GBool for (i = 0; i < obj->arrayGetLength(); ++i) { obj->arrayGet(i, &obj2); if (!obj2.isStream()) { -- error(-1, const_cast("Weird page contents")); -+ error(errInternal, -1, const_cast("Weird page contents")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errInternal, -1, "Weird page contents"); ++#else + error(-1, const_cast("Weird page contents")); ++#endif obj2.free(); return; } @@ -14,622 +33,644 @@ diff -Naur inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp inksca } } else if (!obj->isStream()) { - error(-1, const_cast("Weird page contents")); -+ error(errInternal, -1, const_cast("Weird page contents")); - return; +- return; ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errInternal, -1, "Weird page contents"); ++#else ++ error(-1, const_cast("Weird page contents")); ++#endif ++ return; } parser = new Parser(xref, new Lexer(xref, obj), gFalse); -@@ -419,7 +419,7 @@ + go(topLevel); +@@ -419,7 +427,11 @@ void PdfParser::go(GBool topLevel) { // too many arguments - something is wrong } else { -- error(getPos(), const_cast("Too many args in content stream")); -+ error(errInternal, getPos(), const_cast("Too many args in content stream")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Too many args in content stream"); ++#else + error(getPos(), const_cast("Too many args in content stream")); ++#endif if (printCommands) { printf("throwing away arg: "); obj.print(stdout); -@@ -436,7 +436,7 @@ +@@ -436,7 +448,11 @@ void PdfParser::go(GBool topLevel) { // args at end with no command if (numArgs > 0) { -- error(getPos(), const_cast("Leftover args in content stream")); -+ error(errInternal, getPos(), const_cast("Leftover args in content stream")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Leftover args in content stream"); ++#else + error(getPos(), const_cast("Leftover args in content stream")); ++#endif if (printCommands) { printf("%d leftovers:", numArgs); for (i = 0; i < numArgs; ++i) { -@@ -502,7 +502,7 @@ +@@ -502,7 +518,11 @@ void PdfParser::execOp(Object *cmd, Obje name = cmd->getCmd(); if (!(op = findOp(name))) { if (ignoreUndef == 0) -- error(getPos(), const_cast("Unknown operator '%s'"), name); -+ error(errInternal, getPos(), const_cast("Unknown operator '%s'"), name); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Unknown operator '{0:s}'", name); ++#else + error(getPos(), const_cast("Unknown operator '%s'"), name); ++#endif return; } -@@ -510,26 +510,26 @@ +@@ -510,26 +530,42 @@ void PdfParser::execOp(Object *cmd, Obje argPtr = args; if (op->numArgs >= 0) { if (numArgs < op->numArgs) { -- error(getPos(), const_cast("Too few (%d) args to '%s' operator"), numArgs, name); -+ error(errInternal, getPos(), const_cast("Too few (%d) args to '%s' operator"), numArgs, name); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Too few ({0:d}) args to '{1:d}' operator", numArgs, name); ++#else + error(getPos(), const_cast("Too few (%d) args to '%s' operator"), numArgs, name); ++#endif return; } if (numArgs > op->numArgs) { #if 0 -- error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name); -+ error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Too many ({0:d}) args to '{1:s}' operator", numArgs, name); ++#else + error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name); #endif ++#endif argPtr += numArgs - op->numArgs; numArgs = op->numArgs; } } else { if (numArgs > -op->numArgs) { -- error(getPos(), const_cast("Too many (%d) args to '%s' operator"), -+ error(errInternal, getPos(), const_cast("Too many (%d) args to '%s' operator"), ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Too many ({0:d}) args to '{1:s}' operator", ++#else + error(getPos(), const_cast("Too many (%d) args to '%s' operator"), ++#endif numArgs, name); return; } } for (i = 0; i < numArgs; ++i) { if (!checkArg(&argPtr[i], op->tchk[i])) { -- error(getPos(), const_cast("Arg #%d to '%s' operator is wrong type (%s)"), -+ error(errInternal, getPos(), const_cast("Arg #%d to '%s' operator is wrong type (%s)"), ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Arg #{0:d} to '{1:s}' operator is wrong type ({2:s})", ++#else + error(getPos(), const_cast("Arg #%d to '%s' operator is wrong type (%s)"), ++#endif i, name, argPtr[i].getTypeName()); return; } -@@ -690,7 +690,7 @@ +@@ -690,7 +726,11 @@ void PdfParser::opSetExtGState(Object ar return; } if (!obj1.isDict()) { -- error(getPos(), const_cast("ExtGState '%s' is wrong type"), args[0].getName()); -+ error(errInternal, getPos(), const_cast("ExtGState '%s' is wrong type"), args[0].getName()); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "ExtGState '{0:s}' is wrong type"), args[0].getName(); ++#else + error(getPos(), const_cast("ExtGState '%s' is wrong type"), args[0].getName()); ++#endif obj1.free(); return; } -@@ -705,7 +705,7 @@ +@@ -705,7 +745,11 @@ void PdfParser::opSetExtGState(Object ar if (state->parseBlendMode(&obj2, &mode)) { state->setBlendMode(mode); } else { -- error(getPos(), const_cast("Invalid blend mode in ExtGState")); -+ error(errInternal, getPos(), const_cast("Invalid blend mode in ExtGState")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Invalid blend mode in ExtGState"); ++#else + error(getPos(), const_cast("Invalid blend mode in ExtGState")); ++#endif } } obj2.free(); -@@ -764,7 +764,7 @@ +@@ -764,7 +808,11 @@ void PdfParser::opSetExtGState(Object ar state->setTransfer(funcs); } } else if (!obj2.isNull()) { -- error(getPos(), const_cast("Invalid transfer function in ExtGState")); -+ error(errInternal, getPos(), const_cast("Invalid transfer function in ExtGState")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Invalid transfer function in ExtGState"); ++#else + error(getPos(), const_cast("Invalid transfer function in ExtGState")); ++#endif } obj2.free(); -@@ -784,7 +784,7 @@ +@@ -784,8 +832,11 @@ void PdfParser::opSetExtGState(Object ar funcs[0] = Function::parse(&obj3); if (funcs[0]->getInputSize() != 1 || funcs[0]->getOutputSize() != 1) { - error(getPos(), -+ error(errInternal, getPos(), - const_cast("Invalid transfer function in soft mask in ExtGState")); +- const_cast("Invalid transfer function in soft mask in ExtGState")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Invalid transfer function in soft mask in ExtGState"); ++#else ++ error(getPos(), const_cast("Invalid transfer function in soft mask in ExtGState")); ++#endif delete funcs[0]; funcs[0] = NULL; -@@ -809,11 +809,7 @@ + } +@@ -809,7 +860,7 @@ void PdfParser::opSetExtGState(Object ar blendingColorSpace = NULL; isolated = knockout = gFalse; if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) blendingColorSpace = GfxColorSpace::parse(&obj5, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj5); --#endif - } - obj5.free(); - if (obj4.dictLookup(const_cast("I"), &obj5)->isBool()) { -@@ -840,15 +836,15 @@ + #else + blendingColorSpace = GfxColorSpace::parse(&obj5); +@@ -840,15 +891,27 @@ void PdfParser::opSetExtGState(Object ar delete funcs[0]; } } else { -- error(getPos(), const_cast("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast("Invalid soft mask in ExtGState - missing group")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); ++#else + error(getPos(), const_cast("Invalid soft mask in ExtGState - missing group")); ++#endif } obj4.free(); } else { -- error(getPos(), const_cast("Invalid soft mask in ExtGState - missing group")); -+ error(errInternal, getPos(), const_cast("Invalid soft mask in ExtGState - missing group")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState - missing group"); ++#else + error(getPos(), const_cast("Invalid soft mask in ExtGState - missing group")); ++#endif } obj3.free(); } else if (!obj2.isNull()) { -- error(getPos(), const_cast("Invalid soft mask in ExtGState")); -+ error(errInternal, getPos(), const_cast("Invalid soft mask in ExtGState")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Invalid soft mask in ExtGState"); ++#else + error(getPos(), const_cast("Invalid soft mask in ExtGState")); ++#endif } } obj2.free(); -@@ -876,7 +872,7 @@ +@@ -876,7 +939,11 @@ void PdfParser::doSoftMask(Object *str, // check form type dict->lookup(const_cast("FormType"), &obj1); if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast("Unknown form type")); -+ error(errInternal, getPos(), const_cast("Unknown form type")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Unknown form type"); ++#else + error(getPos(), const_cast("Unknown form type")); ++#endif } obj1.free(); -@@ -884,7 +880,7 @@ +@@ -884,7 +951,11 @@ void PdfParser::doSoftMask(Object *str, dict->lookup(const_cast("BBox"), &obj1); if (!obj1.isArray()) { obj1.free(); -- error(getPos(), const_cast("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast("Bad form bounding box")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Bad form bounding box"); ++#else + error(getPos(), const_cast("Bad form bounding box")); ++#endif return; } for (i = 0; i < 4; ++i) { -@@ -1012,19 +1008,11 @@ +@@ -1012,7 +1083,7 @@ void PdfParser::opSetFillColorSpace(Obje state->setFillPattern(NULL); res->lookupColorSpace(args[0].getName(), &obj); -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (obj.isNull()) { colorSpace = GfxColorSpace::parse(&args[0], NULL); } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setFillColorSpace(colorSpace); -@@ -1032,7 +1020,7 @@ +@@ -1032,7 +1103,11 @@ void PdfParser::opSetFillColorSpace(Obje state->setFillColor(&color); builder->updateStyle(state); } else { -- error(getPos(), const_cast("Bad color space (fill)")); -+ error(errInternal, getPos(), const_cast("Bad color space (fill)")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Bad color space (fill)"); ++#else + error(getPos(), const_cast("Bad color space (fill)")); ++#endif } } -@@ -1043,19 +1031,11 @@ +@@ -1043,7 +1118,7 @@ void PdfParser::opSetStrokeColorSpace(Ob state->setStrokePattern(NULL); res->lookupColorSpace(args[0].getName(), &obj); -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (obj.isNull()) { colorSpace = GfxColorSpace::parse(&args[0], NULL); } else { - colorSpace = GfxColorSpace::parse(&obj, NULL); - } --#else -- if (obj.isNull()) { -- colorSpace = GfxColorSpace::parse(&args[0]); -- } else { -- colorSpace = GfxColorSpace::parse(&obj); -- } --#endif - obj.free(); - if (colorSpace) { - state->setStrokeColorSpace(colorSpace); -@@ -1063,7 +1043,7 @@ +@@ -1063,7 +1138,11 @@ void PdfParser::opSetStrokeColorSpace(Ob state->setStrokeColor(&color); builder->updateStyle(state); } else { -- error(getPos(), const_cast("Bad color space (stroke)")); -+ error(errInternal, getPos(), const_cast("Bad color space (stroke)")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Bad color space (stroke)"); ++#else + error(getPos(), const_cast("Bad color space (stroke)")); ++#endif } } -@@ -1072,7 +1052,7 @@ +@@ -1072,7 +1151,11 @@ void PdfParser::opSetFillColor(Object ar int i; if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast("Incorrect number of arguments in 'sc' command")); -+ error(errInternal, getPos(), const_cast("Incorrect number of arguments in 'sc' command")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'sc' command"); ++#else + error(getPos(), const_cast("Incorrect number of arguments in 'sc' command")); ++#endif return; } state->setFillPattern(NULL); -@@ -1088,7 +1068,7 @@ +@@ -1088,7 +1171,11 @@ void PdfParser::opSetStrokeColor(Object int i; if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast("Incorrect number of arguments in 'SC' command")); -+ error(errInternal, getPos(), const_cast("Incorrect number of arguments in 'SC' command")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SC' command"); ++#else + error(getPos(), const_cast("Incorrect number of arguments in 'SC' command")); ++#endif return; } state->setStrokePattern(NULL); -@@ -1109,7 +1089,7 @@ +@@ -1109,7 +1196,11 @@ void PdfParser::opSetFillColorN(Object a if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() || numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace()) ->getUnder()->getNComps()) { -- error(getPos(), const_cast("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast("Incorrect number of arguments in 'scn' command")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'scn' command"); ++#else + error(getPos(), const_cast("Incorrect number of arguments in 'scn' command")); ++#endif return; } for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1120,23 +1100,15 @@ +@@ -1120,7 +1211,7 @@ void PdfParser::opSetFillColorN(Object a state->setFillColor(&color); builder->updateStyle(state); } -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (args[numArgs-1].isName() && (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { state->setFillPattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setFillPattern(pattern); -- builder->updateStyle(state); -- } --#endif +@@ -1136,7 +1227,11 @@ void PdfParser::opSetFillColorN(Object a } else { if (numArgs != state->getFillColorSpace()->getNComps()) { -- error(getPos(), const_cast("Incorrect number of arguments in 'scn' command")); -+ error(errInternal, getPos(), const_cast("Incorrect number of arguments in 'scn' command")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'scn' command"); ++#else + error(getPos(), const_cast("Incorrect number of arguments in 'scn' command")); ++#endif return; } state->setFillPattern(NULL); -@@ -1161,7 +1133,7 @@ +@@ -1161,7 +1256,11 @@ void PdfParser::opSetStrokeColorN(Object ->getUnder() || numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace()) ->getUnder()->getNComps()) { -- error(getPos(), const_cast("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast("Incorrect number of arguments in 'SCN' command")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SCN' command"); ++#else + error(getPos(), const_cast("Incorrect number of arguments in 'SCN' command")); ++#endif return; } for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1172,23 +1144,15 @@ +@@ -1172,7 +1271,7 @@ void PdfParser::opSetStrokeColorN(Object state->setStrokeColor(&color); builder->updateStyle(state); } -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (args[numArgs-1].isName() && (pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) { state->setStrokePattern(pattern); - builder->updateStyle(state); - } --#else -- if (args[numArgs-1].isName() && -- (pattern = res->lookupPattern(args[numArgs-1].getName()))) { -- state->setStrokePattern(pattern); -- builder->updateStyle(state); -- } --#endif +@@ -1188,7 +1287,11 @@ void PdfParser::opSetStrokeColorN(Object } else { if (numArgs != state->getStrokeColorSpace()->getNComps()) { -- error(getPos(), const_cast("Incorrect number of arguments in 'SCN' command")); -+ error(errInternal, getPos(), const_cast("Incorrect number of arguments in 'SCN' command")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Incorrect number of arguments in 'SCN' command"); ++#else + error(getPos(), const_cast("Incorrect number of arguments in 'SCN' command")); ++#endif return; } state->setStrokePattern(NULL); -@@ -1212,7 +1176,7 @@ +@@ -1212,7 +1315,11 @@ void PdfParser::opMoveTo(Object args[], void PdfParser::opLineTo(Object args[], int numArgs) { if (!state->isCurPt()) { -- error(getPos(), const_cast("No current point in lineto")); -+ error(errInternal, getPos(), const_cast("No current point in lineto")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No current point in lineto"); ++#else + error(getPos(), const_cast("No current point in lineto")); ++#endif return; } state->lineTo(args[0].getNum(), args[1].getNum()); -@@ -1222,7 +1186,7 @@ +@@ -1222,7 +1329,11 @@ void PdfParser::opCurveTo(Object args[], double x1, y1, x2, y2, x3, y3; if (!state->isCurPt()) { -- error(getPos(), const_cast("No current point in curveto")); -+ error(errInternal, getPos(), const_cast("No current point in curveto")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No current point in curveto"); ++#else + error(getPos(), const_cast("No current point in curveto")); ++#endif return; } x1 = args[0].getNum(); -@@ -1238,7 +1202,7 @@ +@@ -1238,7 +1349,11 @@ void PdfParser::opCurveTo1(Object args[] double x1, y1, x2, y2, x3, y3; if (!state->isCurPt()) { -- error(getPos(), const_cast("No current point in curveto1")); -+ error(errInternal, getPos(), const_cast("No current point in curveto1")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No current point in curveto1"); ++#else + error(getPos(), const_cast("No current point in curveto1")); ++#endif return; } x1 = state->getCurX(); -@@ -1254,7 +1218,7 @@ +@@ -1254,7 +1369,11 @@ void PdfParser::opCurveTo2(Object args[] double x1, y1, x2, y2, x3, y3; if (!state->isCurPt()) { -- error(getPos(), const_cast("No current point in curveto2")); -+ error(errInternal, getPos(), const_cast("No current point in curveto2")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No current point in curveto2"); ++#else + error(getPos(), const_cast("No current point in curveto2")); ++#endif return; } x1 = args[0].getNum(); -@@ -1282,7 +1246,7 @@ +@@ -1282,7 +1401,11 @@ void PdfParser::opRectangle(Object args[ void PdfParser::opClosePath(Object args[], int numArgs) { if (!state->isCurPt()) { -- error(getPos(), const_cast("No current point in closepath")); -+ error(errInternal, getPos(), const_cast("No current point in closepath")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No current point in closepath"); ++#else + error(getPos(), const_cast("No current point in closepath")); ++#endif return; } state->closePath(); -@@ -1298,7 +1262,7 @@ - - void PdfParser::opStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast("No path in stroke")); -+ //error(errInternal, getPos(), const_cast("No path in stroke")); - return; - } - if (state->isPath()) { -@@ -1314,7 +1278,7 @@ - - void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast("No path in closepath/stroke")); -+ //error(errInternal, getPos(), const_cast("No path in closepath/stroke")); - return; - } - state->closePath(); -@@ -1331,7 +1295,7 @@ - - void PdfParser::opFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast("No path in fill")); -+ //error(errInternal, getPos(), const_cast("No path in fill")); - return; - } - if (state->isPath()) { -@@ -1347,7 +1311,7 @@ - - void PdfParser::opEOFill(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast("No path in eofill")); -+ //error(errInternal, getPos(), const_cast("No path in eofill")); - return; - } - if (state->isPath()) { -@@ -1363,7 +1327,7 @@ - - void PdfParser::opFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast("No path in fill/stroke")); -+ //error(errInternal, getPos(), const_cast("No path in fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1376,7 +1340,7 @@ - - void PdfParser::opCloseFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast("No path in closepath/fill/stroke")); -+ //error(errInternal, getPos(), const_cast("No path in closepath/fill/stroke")); - return; - } - if (state->isPath()) { -@@ -1388,7 +1352,7 @@ - - void PdfParser::opEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast("No path in eofill/stroke")); -+ //error(errInternal, getPos(), const_cast("No path in eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1399,7 +1363,7 @@ - - void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) { - if (!state->isCurPt()) { -- //error(getPos(), const_cast("No path in closepath/eofill/stroke")); -+ //error(errInternal, getPos(), const_cast("No path in closepath/eofill/stroke")); - return; - } - if (state->isPath()) { -@@ -1440,7 +1404,7 @@ +@@ -1440,7 +1563,11 @@ void PdfParser::doPatternFillFallback(GB doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill); break; default: -- error(getPos(), const_cast("Unimplemented pattern type (%d) in fill"), -+ error(errInternal, getPos(), const_cast("Unimplemented pattern type (%d) in fill"), ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errUnimplemented, getPos(), "Unimplemented pattern type (%d) in fill", ++#else + error(getPos(), const_cast("Unimplemented pattern type (%d) in fill"), ++#endif pattern->getType()); break; } -@@ -1459,7 +1423,7 @@ +@@ -1459,7 +1586,11 @@ void PdfParser::doPatternStrokeFallback( doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse); break; default: -- error(getPos(), const_cast("Unimplemented pattern type (%d) in stroke"), -+ error(errInternal, getPos(), const_cast("Unimplemented pattern type (%d) in stroke"), ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errUnimplemented, getPos(), "Unimplemented pattern type ({0:d}) in stroke", ++#else + error(getPos(), const_cast("Unimplemented pattern type (%d) in stroke"), ++#endif pattern->getType()); break; } -@@ -1579,15 +1543,9 @@ +@@ -1579,7 +1710,7 @@ void PdfParser::opShFill(Object args[], double *matrix = NULL; GBool savedState = gFalse; -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) if (!(shading = res->lookupShading(args[0].getName(), NULL))) { return; } --#else -- if (!(shading = res->lookupShading(args[0].getName()))) { -- return; -- } --#endif - - // save current graphics state - if (shading->getType() != 2 && shading->getType() != 3) { -@@ -2156,7 +2114,7 @@ +@@ -2156,7 +2287,11 @@ void PdfParser::opTextNextLine(Object ar void PdfParser::opShowText(Object args[], int numArgs) { if (!state->getFont()) { -- error(getPos(), const_cast("No font in show")); -+ error(errInternal, getPos(), const_cast("No font in show")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No font in show"); ++#else + error(getPos(), const_cast("No font in show")); ++#endif return; } if (fontChanged) { -@@ -2170,7 +2128,7 @@ +@@ -2170,7 +2305,11 @@ void PdfParser::opMoveShowText(Object ar double tx, ty; if (!state->getFont()) { -- error(getPos(), const_cast("No font in move/show")); -+ error(errInternal, getPos(), const_cast("No font in move/show")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No font in move/show"); ++#else + error(getPos(), const_cast("No font in move/show")); ++#endif return; } if (fontChanged) { -@@ -2188,7 +2146,7 @@ +@@ -2188,7 +2327,11 @@ void PdfParser::opMoveSetShowText(Object double tx, ty; if (!state->getFont()) { -- error(getPos(), const_cast("No font in move/set/show")); -+ error(errInternal, getPos(), const_cast("No font in move/set/show")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No font in move/set/show"); ++#else + error(getPos(), const_cast("No font in move/set/show")); ++#endif return; } if (fontChanged) { -@@ -2211,7 +2169,7 @@ +@@ -2211,7 +2354,11 @@ void PdfParser::opShowSpaceText(Object a int i; if (!state->getFont()) { -- error(getPos(), const_cast("No font in show/space")); -+ error(errInternal, getPos(), const_cast("No font in show/space")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "No font in show/space"); ++#else + error(getPos(), const_cast("No font in show/space")); ++#endif return; } if (fontChanged) { -@@ -2236,7 +2194,7 @@ +@@ -2236,7 +2383,11 @@ void PdfParser::opShowSpaceText(Object a } else if (obj.isString()) { doShowText(obj.getString()); } else { -- error(getPos(), const_cast("Element of show/space array must be number or string")); -+ error(errInternal, getPos(), const_cast("Element of show/space array must be number or string")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Element of show/space array must be number or string"); ++#else + error(getPos(), const_cast("Element of show/space array must be number or string")); ++#endif } obj.free(); } -@@ -2334,7 +2292,7 @@ +@@ -2334,7 +2485,11 @@ void PdfParser::doShowText(GooString *s) if (charProc.isStream()) { //parse(&charProc, gFalse); // TODO: parse into SVG font } else { -- error(getPos(), const_cast("Missing or bad Type3 CharProc entry")); -+ error(errInternal, getPos(), const_cast("Missing or bad Type3 CharProc entry")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry"); ++#else + error(getPos(), const_cast("Missing or bad Type3 CharProc entry")); ++#endif } //out->endType3Char(state); if (resDict) { -@@ -2410,7 +2368,7 @@ +@@ -2410,7 +2565,11 @@ void PdfParser::opXObject(Object args[], return; } if (!obj1.isStream()) { -- error(getPos(), const_cast("XObject '%s' is wrong type"), name); -+ error(errInternal, getPos(), const_cast("XObject '%s' is wrong type"), name); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "XObject '{0:s}' is wrong type", name); ++#else + error(getPos(), const_cast("XObject '%s' is wrong type"), name); ++#endif obj1.free(); return; } -@@ -2426,9 +2384,9 @@ +@@ -2426,9 +2585,17 @@ void PdfParser::opXObject(Object args[], /* out->psXObject(obj1.getStream(), obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/ } else if (obj2.isName()) { -- error(getPos(), const_cast("Unknown XObject subtype '%s'"), obj2.getName()); -+ error(errInternal, getPos(), const_cast("Unknown XObject subtype '%s'"), obj2.getName()); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Unknown XObject subtype '{0:s}'", obj2.getName()); ++#else + error(getPos(), const_cast("Unknown XObject subtype '%s'"), obj2.getName()); ++#endif } else { -- error(getPos(), const_cast("XObject subtype is missing or wrong type")); -+ error(errInternal, getPos(), const_cast("XObject subtype is missing or wrong type")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "XObject subtype is missing or wrong type"); ++#else + error(getPos(), const_cast("XObject subtype is missing or wrong type")); ++#endif } obj2.free(); obj1.free(); -@@ -2559,11 +2517,7 @@ +@@ -2559,7 +2726,7 @@ void PdfParser::doImage(Object *ref, Str } } if (!obj1.isNull()) { -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) colorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- colorSpace = GfxColorSpace::parse(&obj1); --#endif - } else if (csMode == streamCSDeviceGray) { - colorSpace = new GfxDeviceGrayColorSpace(); - } else if (csMode == streamCSDeviceRGB) { -@@ -2648,11 +2602,7 @@ + #else + colorSpace = GfxColorSpace::parse(&obj1); +@@ -2648,7 +2815,7 @@ void PdfParser::doImage(Object *ref, Str obj2.free(); } } -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) maskColorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- maskColorSpace = GfxColorSpace::parse(&obj1); --#endif - obj1.free(); - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; -@@ -2758,7 +2708,7 @@ + #else + maskColorSpace = GfxColorSpace::parse(&obj1); +@@ -2758,7 +2925,11 @@ void PdfParser::doImage(Object *ref, Str err2: obj1.free(); err1: -- error(getPos(), const_cast("Bad image parameters")); -+ error(errInternal, getPos(), const_cast("Bad image parameters")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Bad image parameters"); ++#else + error(getPos(), const_cast("Bad image parameters")); ++#endif } void PdfParser::doForm(Object *str) { -@@ -2783,7 +2733,7 @@ +@@ -2783,7 +2954,11 @@ void PdfParser::doForm(Object *str) { // check form type dict->lookup(const_cast("FormType"), &obj1); if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) { -- error(getPos(), const_cast("Unknown form type")); -+ error(errInternal, getPos(), const_cast("Unknown form type")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Unknown form type"); ++#else + error(getPos(), const_cast("Unknown form type")); ++#endif } obj1.free(); -@@ -2791,7 +2741,7 @@ +@@ -2791,7 +2966,11 @@ void PdfParser::doForm(Object *str) { dict->lookup(const_cast("BBox"), &bboxObj); if (!bboxObj.isArray()) { bboxObj.free(); -- error(getPos(), const_cast("Bad form bounding box")); -+ error(errInternal, getPos(), const_cast("Bad form bounding box")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Bad form bounding box"); ++#else + error(getPos(), const_cast("Bad form bounding box")); ++#endif return; } for (i = 0; i < 4; ++i) { -@@ -2827,11 +2777,7 @@ +@@ -2827,7 +3006,7 @@ void PdfParser::doForm(Object *str) { if (obj1.dictLookup(const_cast("S"), &obj2)->isName(const_cast("Transparency"))) { transpGroup = gTrue; if (!obj1.dictLookup(const_cast("CS"), &obj3)->isNull()) { -#ifdef POPPLER_NEW_COLOR_SPACE_API ++#if defined(POPPLER_NEW_COLOR_SPACE_API) || defined(POPPLER_NEW_ERRORAPI) blendingColorSpace = GfxColorSpace::parse(&obj3, NULL); --#else -- blendingColorSpace = GfxColorSpace::parse(&obj3); --#endif - } - obj3.free(); - if (obj1.dictLookup(const_cast("I"), &obj3)->isBool()) { -@@ -2990,7 +2936,7 @@ + #else + blendingColorSpace = GfxColorSpace::parse(&obj3); +@@ -2990,7 +3169,11 @@ Stream *PdfParser::buildImageStream() { parser->getObj(&obj); while (!obj.isCmd(const_cast("ID")) && !obj.isEOF()) { if (!obj.isName()) { -- error(getPos(), const_cast("Inline image dictionary key must be a name object")); -+ error(errInternal, getPos(), const_cast("Inline image dictionary key must be a name object")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "Inline image dictionary key must be a name object"); ++#else + error(getPos(), const_cast("Inline image dictionary key must be a name object")); ++#endif obj.free(); } else { key = copyString(obj.getName()); -@@ -3005,7 +2951,7 @@ +@@ -3005,7 +3188,11 @@ Stream *PdfParser::buildImageStream() { parser->getObj(&obj); } if (obj.isEOF()) { -- error(getPos(), const_cast("End of file in inline image")); -+ error(errInternal, getPos(), const_cast("End of file in inline image")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errSyntaxError, getPos(), "End of file in inline image"); ++#else + error(getPos(), const_cast("End of file in inline image")); ++#endif obj.free(); dict.free(); return NULL; -@@ -3020,11 +2966,11 @@ +@@ -3020,11 +3207,19 @@ Stream *PdfParser::buildImageStream() { } void PdfParser::opImageData(Object args[], int numArgs) { -- error(getPos(), const_cast("Internal: got 'ID' operator")); -+ error(errInternal, getPos(), const_cast("Internal: got 'ID' operator")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errInternal, getPos(), "Internal: got 'ID' operator"); ++#else + error(getPos(), const_cast("Internal: got 'ID' operator")); ++#endif } void PdfParser::opEndImage(Object args[], int numArgs) { -- error(getPos(), const_cast("Internal: got 'EI' operator")); -+ error(errInternal, getPos(), const_cast("Internal: got 'EI' operator")); ++#ifdef POPPLER_NEW_ERRORAPI ++ error(errInternal, getPos(), "Internal: got 'EI' operator"); ++#else + error(getPos(), const_cast("Internal: got 'EI' operator")); ++#endif } //------------------------------------------------------------------------ -diff -Naur inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.48.2-new/src/extension/internal/pdfinput/svg-builder.cpp ---- inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.cpp 2012-05-27 01:55:07.000000000 +0200 -+++ inkscape-0.48.2-new/src/extension/internal/pdfinput/svg-builder.cpp 2012-05-27 02:18:01.410549224 +0200 -@@ -961,9 +961,7 @@ +diff -up inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.cpp.poppler_020 inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.cpp +--- inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.cpp.poppler_020 2012-06-23 12:01:38.912678613 -0500 ++++ inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.cpp 2012-06-23 12:01:38.920678513 -0500 +@@ -961,9 +961,7 @@ void SvgBuilder::updateFont(GfxState *st _font_style = sp_repr_css_attr_new(); GfxFont *font = state->getFont(); // Store original name diff --git a/inkscape.spec b/inkscape.spec index 275da73..14707a5 100644 --- a/inkscape.spec +++ b/inkscape.spec @@ -14,9 +14,7 @@ Patch6: inkscape-0.48.2-png-write.patch Patch7: inkscape-0.48.2-gcc47.patch Patch8: inkscape-0.48.2-poppler_020.patch -%if 0%{?fedora} > 18 -%define poppler_020 1 -%else +%if 0%{?fedora} && 0%{?fedora} < 18 %define desktop_vendor fedora %endif @@ -37,7 +35,7 @@ BuildRequires: lcms-devel >= 1.13 BuildRequires: cairo-devel BuildRequires: dos2unix BuildRequires: python-devel -BuildRequires: poppler-glib-devel%{?poppler_020: >= 0.20.0} +BuildRequires: poppler-glib-devel BuildRequires: boost-devel BuildRequires: gsl-devel BuildRequires: libwpg-devel @@ -46,6 +44,8 @@ BuildRequires: perl(XML::Parser) BuildRequires: perl(ExtUtils::Embed) BuildRequires: intltool BuildRequires: popt-devel +# We detect new poppler in inkscape-0.48.2-poppler_020.patch +BuildRequires: automake # Disable all for now. TODO: Be smarter %if 0 @@ -127,10 +127,7 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. %patch5 -p0 -b .png %patch6 -p0 -b .png-write %patch7 -p0 -b .gcc47 -%if 0%{?poppler_020} -# seems this patch works *only* with poppler-0.20.x %patch8 -p1 -b .poppler_020 -%endif # https://bugs.launchpad.net/inkscape/+bug/314381 # A couple of files have executable bits set, @@ -142,6 +139,8 @@ graphics in W3C standard Scalable Vector Graphics (SVG) file format. # Fix end of line encodings dos2unix -k -q share/extensions/*.py +autoreconf -i + %build %configure \