From 9ad64530a14930ba35e1d269febabfc02361c2f3 Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Sun, 7 Dec 2014 16:15:31 -0500 Subject: [PATCH] Upgrate to inkscape-0.48.5 --- config/packages-list | 2 +- .../common/inkscape-0.48.3.1-gdk_pixbuf.patch | 84 --- .../common/inkscape-0.48.3.1-libpng.patch | 42 -- .../inkscape-0.48.3.1-poppler-0.20-1.patch | 650 ------------------ .../patches/common/inkscape-0.48.5-gc-1.patch | 33 + .../common/inkscape-0.48.5-poppler-1.patch | 104 +++ 6 files changed, 138 insertions(+), 777 deletions(-) delete mode 100644 stage5/patches/common/inkscape-0.48.3.1-gdk_pixbuf.patch delete mode 100644 stage5/patches/common/inkscape-0.48.3.1-libpng.patch delete mode 100644 stage5/patches/common/inkscape-0.48.3.1-poppler-0.20-1.patch create mode 100644 stage5/patches/common/inkscape-0.48.5-gc-1.patch create mode 100644 stage5/patches/common/inkscape-0.48.5-poppler-1.patch diff --git a/config/packages-list b/config/packages-list index 74cd679..5ad6502 100644 --- a/config/packages-list +++ b/config/packages-list @@ -176,7 +176,7 @@ IMAGE_MAGICK="ImageMagick-6.7.9-6" IMLIB2="imlib-1.4.2" INDENT="indent-2.2.10" INETUTILS="inetutils-1.9.2" -INKSCAPE="inkscape-0.48.3.1" +INKSCAPE="inkscape-0.48.5" INTLTOOL="intltool-0.50.2" IPROUTE2="iproute2-3.3.0" IPTABLES="iptables-1.4.15" diff --git a/stage5/patches/common/inkscape-0.48.3.1-gdk_pixbuf.patch b/stage5/patches/common/inkscape-0.48.3.1-gdk_pixbuf.patch deleted file mode 100644 index 591b4f4..0000000 --- a/stage5/patches/common/inkscape-0.48.3.1-gdk_pixbuf.patch +++ /dev/null @@ -1,84 +0,0 @@ -Submitted By: Hugo Villeneuve -Date: 2012-08-11 -Initial Package Version: 0.48.3.1 -Upstream Status: Not sent -Origin: BLFS -Description: Fixes for compiling with new versions of gdk_pixbuf -diff -Naur inkscape-0.48.3.1.orig/src/display/sodipodi-ctrl.cpp inkscape-0.48.3.1.new/src/display/sodipodi-ctrl.cpp ---- inkscape-0.48.3.1.orig/src/display/sodipodi-ctrl.cpp 2011-07-08 14:25:09.468790000 -0400 -+++ inkscape-0.48.3.1.new/src/display/sodipodi-ctrl.cpp 2012-08-11 16:31:45.312455778 -0400 -@@ -200,7 +200,7 @@ - ctrl->pixbuf = pixbuf; - } else { - ctrl->pixbuf = gdk_pixbuf_add_alpha (pixbuf, FALSE, 0, 0, 0); -- gdk_pixbuf_unref (pixbuf); -+ g_object_unref (pixbuf); - } - ctrl->build = FALSE; - break; -diff -Naur inkscape-0.48.3.1.orig/src/extension/internal/cairo-renderer.cpp inkscape-0.48.3.1.new/src/extension/internal/cairo-renderer.cpp ---- inkscape-0.48.3.1.orig/src/extension/internal/cairo-renderer.cpp 2012-02-13 22:22:17.670697000 -0500 -+++ inkscape-0.48.3.1.new/src/extension/internal/cairo-renderer.cpp 2012-08-11 16:31:45.335458702 -0400 -@@ -502,7 +502,7 @@ - unsigned int h = gdk_pixbuf_get_height(pb); - unsigned int rs = gdk_pixbuf_get_rowstride(pb); - ctx->renderImage (px, w, h, rs, &t, SP_OBJECT_STYLE (item)); -- gdk_pixbuf_unref (pb); -+ g_object_unref (pb); - } - g_slist_free (items); - } -diff -Naur inkscape-0.48.3.1.orig/src/helper/pixbuf-ops.cpp inkscape-0.48.3.1.new/src/helper/pixbuf-ops.cpp ---- inkscape-0.48.3.1.orig/src/helper/pixbuf-ops.cpp 2012-02-13 22:22:17.670697000 -0500 -+++ inkscape-0.48.3.1.new/src/helper/pixbuf-ops.cpp 2012-08-11 16:31:45.318456540 -0400 -@@ -85,7 +85,7 @@ - g_snprintf(c, 32, "%f", quality); - gboolean saved = gdk_pixbuf_save (pixbuf, filename, "jpeg", NULL, "quality", c, NULL); - g_free(c); -- gdk_pixbuf_unref (pixbuf); -+ g_object_unref (pixbuf); - if (saved) return true; - else return false; - } -diff -Naur inkscape-0.48.3.1.orig/src/selection-chemistry.cpp inkscape-0.48.3.1.new/src/selection-chemistry.cpp ---- inkscape-0.48.3.1.orig/src/selection-chemistry.cpp 2012-02-13 22:22:17.670697000 -0500 -+++ inkscape-0.48.3.1.new/src/selection-chemistry.cpp 2012-08-11 16:31:45.369463023 -0400 -@@ -2822,7 +2822,7 @@ - - // Clean up - Inkscape::GC::release(repr); -- gdk_pixbuf_unref(pb); -+ g_object_unref(pb); - - // Complete undoable transaction - sp_document_done(document, SP_VERB_SELECTION_CREATE_BITMAP, -diff -Naur inkscape-0.48.3.1.orig/src/sp-image.cpp inkscape-0.48.3.1.new/src/sp-image.cpp ---- inkscape-0.48.3.1.orig/src/sp-image.cpp 2012-02-15 09:44:43.360507000 -0500 -+++ inkscape-0.48.3.1.new/src/sp-image.cpp 2012-08-11 16:31:45.385465058 -0400 -@@ -673,7 +673,7 @@ - } - - if (image->pixbuf) { -- gdk_pixbuf_unref (image->pixbuf); -+ g_object_unref (image->pixbuf); - image->pixbuf = NULL; - } - -@@ -833,7 +833,7 @@ - - if (flags & SP_IMAGE_HREF_MODIFIED_FLAG) { - if (image->pixbuf) { -- gdk_pixbuf_unref (image->pixbuf); -+ g_object_unref (image->pixbuf); - image->pixbuf = NULL; - } - if ( image->pixPath ) { -@@ -1291,7 +1291,7 @@ - result = pixbuf; - } else { - result = gdk_pixbuf_add_alpha(pixbuf, FALSE, 0, 0, 0); -- gdk_pixbuf_unref(pixbuf); -+ g_object_unref(pixbuf); - } - return result; - } diff --git a/stage5/patches/common/inkscape-0.48.3.1-libpng.patch b/stage5/patches/common/inkscape-0.48.3.1-libpng.patch deleted file mode 100644 index c5ec161..0000000 --- a/stage5/patches/common/inkscape-0.48.3.1-libpng.patch +++ /dev/null @@ -1,42 +0,0 @@ -Submitted By: Hugo Villeneuve -Date: 2012-08-11 -Initial Package Version: 0.48.3.1 -Upstream Status: Not sent -Origin: BLFS -Description: Fixes for compiling with libpng-1.5.x -diff -Naur inkscape-0.48.3.1.orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.48.3.1.new/src/extension/internal/pdfinput/svg-builder.cpp ---- inkscape-0.48.3.1.orig/src/extension/internal/pdfinput/svg-builder.cpp 2011-07-08 14:25:09.468790000 -0400 -+++ inkscape-0.48.3.1.new/src/extension/internal/pdfinput/svg-builder.cpp 2012-08-11 17:03:58.313130225 -0400 -@@ -1443,7 +1443,7 @@ - return NULL; - } - // Set error handler -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return NULL; - } -diff -Naur inkscape-0.48.3.1.orig/src/helper/png-write.cpp inkscape-0.48.3.1.new/src/helper/png-write.cpp ---- inkscape-0.48.3.1.orig/src/helper/png-write.cpp 2012-02-13 22:22:17.670697000 -0500 -+++ inkscape-0.48.3.1.new/src/helper/png-write.cpp 2012-08-11 17:03:58.322131368 -0400 -@@ -165,7 +165,7 @@ - /* Set error handling. REQUIRED if you aren't supplying your own - * error hadnling functions in the png_create_write_struct() call. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - /* If we get here, we had a problem reading the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, &info_ptr); -diff -Naur inkscape-0.48.3.1.orig/src/sp-image.cpp inkscape-0.48.3.1.new/src/sp-image.cpp ---- inkscape-0.48.3.1.orig/src/sp-image.cpp 2012-02-15 09:44:43.360507000 -0500 -+++ inkscape-0.48.3.1.new/src/sp-image.cpp 2012-08-11 17:03:58.352135180 -0400 -@@ -398,7 +398,7 @@ - int compression_type = 0; - char* profile = 0; - png_uint_32 proflen = 0; -- if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) { -+ if (0) { - // g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type); - } - } diff --git a/stage5/patches/common/inkscape-0.48.3.1-poppler-0.20-1.patch b/stage5/patches/common/inkscape-0.48.3.1-poppler-0.20-1.patch deleted file mode 100644 index 2710b20..0000000 --- a/stage5/patches/common/inkscape-0.48.3.1-poppler-0.20-1.patch +++ /dev/null @@ -1,650 +0,0 @@ -Submitted By: Andrew Benton -Date: 2012-06-27 -Initial Package Version: 2.10 -Upstream Status: unknown -Origin: Arch Linux -https://projects.archlinux.org/svntogit/packages.git/plain/trunk/poppler20.patch?h=packages/inkscape -Description: Fixes compiling Inkscape with poppler-0.20 installed - -diff -Naur inkscape-0.48.2-orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp ---- inkscape-0.48.2-orig/src/extension/internal/pdfinput/pdf-parser.cpp 2012-06-27 11:55:00.824259752 +0100 -+++ inkscape-0.48.2/src/extension/internal/pdfinput/pdf-parser.cpp 2012-06-27 11:55:49.686825179 +0100 -@@ -367,14 +367,14 @@ - 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")); - obj2.free(); - return; - } - obj2.free(); - } - } else if (!obj->isStream()) { -- error(-1, const_cast("Weird page contents")); -+ error(errInternal, -1, const_cast("Weird page contents")); - return; - } - parser = new Parser(xref, new Lexer(xref, obj), gFalse); -@@ -419,7 +419,7 @@ - - // 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")); - if (printCommands) { - printf("throwing away arg: "); - obj.print(stdout); -@@ -436,7 +436,7 @@ - - // 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")); - if (printCommands) { - printf("%d leftovers:", numArgs); - for (i = 0; i < numArgs; ++i) { -@@ -502,7 +502,7 @@ - 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); - return; - } - -@@ -510,26 +510,26 @@ - 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); - 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); - #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"), - 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)"), - i, name, argPtr[i].getTypeName()); - return; - } -@@ -690,7 +690,7 @@ - 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()); - obj1.free(); - return; - } -@@ -705,7 +705,7 @@ - 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")); - } - } - obj2.free(); -@@ -764,7 +764,7 @@ - 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")); - } - obj2.free(); - -@@ -784,7 +784,7 @@ - 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")); - delete funcs[0]; - funcs[0] = NULL; -@@ -809,11 +809,7 @@ - blendingColorSpace = NULL; - isolated = knockout = gFalse; - if (!obj4.dictLookup(const_cast("CS"), &obj5)->isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - 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 @@ - 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")); - } - 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")); - } - 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")); - } - } - obj2.free(); -@@ -876,7 +872,7 @@ - // 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")); - } - obj1.free(); - -@@ -884,7 +880,7 @@ - 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")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -1012,19 +1008,11 @@ - - state->setFillPattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - 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 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast("Bad color space (fill)")); -+ error(errInternal, getPos(), const_cast("Bad color space (fill)")); - } - } - -@@ -1043,19 +1031,11 @@ - - state->setStrokePattern(NULL); - res->lookupColorSpace(args[0].getName(), &obj); --#ifdef POPPLER_NEW_COLOR_SPACE_API - 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 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } else { -- error(getPos(), const_cast("Bad color space (stroke)")); -+ error(errInternal, getPos(), const_cast("Bad color space (stroke)")); - } - } - -@@ -1072,7 +1052,7 @@ - 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")); - return; - } - state->setFillPattern(NULL); -@@ -1088,7 +1068,7 @@ - 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")); - return; - } - state->setStrokePattern(NULL); -@@ -1109,7 +1089,7 @@ - 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")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1120,23 +1100,15 @@ - state->setFillColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - 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 - - } 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")); - return; - } - state->setFillPattern(NULL); -@@ -1161,7 +1133,7 @@ - ->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")); - return; - } - for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) { -@@ -1172,23 +1144,15 @@ - state->setStrokeColor(&color); - builder->updateStyle(state); - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - 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 - - } 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")); - return; - } - state->setStrokePattern(NULL); -@@ -1212,7 +1176,7 @@ - - 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")); - return; - } - state->lineTo(args[0].getNum(), args[1].getNum()); -@@ -1222,7 +1186,7 @@ - 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")); - return; - } - x1 = args[0].getNum(); -@@ -1238,7 +1202,7 @@ - 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")); - return; - } - x1 = state->getCurX(); -@@ -1254,7 +1218,7 @@ - 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")); - return; - } - x1 = args[0].getNum(); -@@ -1282,7 +1246,7 @@ - - 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")); - 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 @@ - 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"), - pattern->getType()); - break; - } -@@ -1459,7 +1423,7 @@ - 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"), - pattern->getType()); - break; - } -@@ -1579,15 +1543,9 @@ - double *matrix = NULL; - GBool savedState = gFalse; - --#ifdef POPPLER_NEW_COLOR_SPACE_API - 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 @@ - - 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")); - return; - } - if (fontChanged) { -@@ -2170,7 +2128,7 @@ - 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")); - return; - } - if (fontChanged) { -@@ -2188,7 +2146,7 @@ - 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")); - return; - } - if (fontChanged) { -@@ -2211,7 +2169,7 @@ - int i; - - if (!state->getFont()) { -- error(getPos(), const_cast("No font in show/space")); -+ error(errInternal, getPos(), const_cast("No font in show/space")); - return; - } - if (fontChanged) { -@@ -2236,7 +2194,7 @@ - } 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")); - } - obj.free(); - } -@@ -2334,7 +2292,7 @@ - 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")); - } - //out->endType3Char(state); - if (resDict) { -@@ -2410,7 +2368,7 @@ - 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); - obj1.free(); - return; - } -@@ -2426,9 +2384,9 @@ - /* 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()); - } else { -- error(getPos(), const_cast("XObject subtype is missing or wrong type")); -+ error(errInternal, getPos(), const_cast("XObject subtype is missing or wrong type")); - } - obj2.free(); - obj1.free(); -@@ -2559,11 +2517,7 @@ - } - } - if (!obj1.isNull()) { --#ifdef POPPLER_NEW_COLOR_SPACE_API - 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 @@ - obj2.free(); - } - } --#ifdef POPPLER_NEW_COLOR_SPACE_API - maskColorSpace = GfxColorSpace::parse(&obj1, NULL); --#else -- maskColorSpace = GfxColorSpace::parse(&obj1); --#endif - obj1.free(); - if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) { - goto err1; -@@ -2758,7 +2708,7 @@ - err2: - obj1.free(); - err1: -- error(getPos(), const_cast("Bad image parameters")); -+ error(errInternal, getPos(), const_cast("Bad image parameters")); - } - - void PdfParser::doForm(Object *str) { -@@ -2783,7 +2733,7 @@ - // 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")); - } - obj1.free(); - -@@ -2791,7 +2741,7 @@ - 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")); - return; - } - for (i = 0; i < 4; ++i) { -@@ -2827,11 +2777,7 @@ - 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 - 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 @@ - 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")); - obj.free(); - } else { - key = copyString(obj.getName()); -@@ -3005,7 +2951,7 @@ - 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")); - obj.free(); - dict.free(); - return NULL; -@@ -3020,11 +2966,11 @@ - } - - void PdfParser::opImageData(Object args[], int numArgs) { -- error(getPos(), const_cast("Internal: got 'ID' operator")); -+ error(errInternal, getPos(), const_cast("Internal: got 'ID' operator")); - } - - void PdfParser::opEndImage(Object args[], int numArgs) { -- error(getPos(), const_cast("Internal: got 'EI' operator")); -+ error(errInternal, getPos(), const_cast("Internal: got 'EI' operator")); - } - - //------------------------------------------------------------------------ -diff -Naur inkscape-0.48.2-orig/src/extension/internal/pdfinput/svg-builder.cpp inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.cpp ---- inkscape-0.48.2-orig/src/extension/internal/pdfinput/svg-builder.cpp 2012-06-27 11:55:00.827593033 +0100 -+++ inkscape-0.48.2/src/extension/internal/pdfinput/svg-builder.cpp 2012-06-27 11:55:49.686825179 +0100 -@@ -961,9 +961,7 @@ - _font_style = sp_repr_css_attr_new(); - GfxFont *font = state->getFont(); - // Store original name -- if (font->getOrigName()) { -- _font_specification = font->getOrigName()->getCString(); -- } else if (font->getName()) { -+ if (font->getName()) { - _font_specification = font->getName()->getCString(); - } else { - _font_specification = (char*) "Arial"; diff --git a/stage5/patches/common/inkscape-0.48.5-gc-1.patch b/stage5/patches/common/inkscape-0.48.5-gc-1.patch new file mode 100644 index 0000000..8307859 --- /dev/null +++ b/stage5/patches/common/inkscape-0.48.5-gc-1.patch @@ -0,0 +1,33 @@ +Submitted By: Armin K. , rediffed by Fernando de Oliveira +Date: 2014-06-23 +Initial Package Version: 0.48.5 +Upstream Status: Unknown +Origin: Armin K. +URL: +Description: Fixes build with gc-7.4.2 + + +--- inkscape-0.48.5.orig/configure 2014-06-20 19:05:43.525382393 -0300 ++++ inkscape-0.48.5/configure 2014-06-23 15:24:38.730084988 -0300 +@@ -9044,8 +9044,8 @@ + # include + #endif + #include +- extern unsigned GC_version; + int main(void){ ++ unsigned GC_version = GC_get_version(); + unsigned min = ((6 << 16) | (4 << 8) | 0); + printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); + if (GC_version>=min) return 0; +--- inkscape-0.48.5.orig/configure.ac 2014-06-20 17:29:03.717600589 -0300 ++++ inkscape-0.48.5/configure.ac 2014-06-23 15:24:19.592598799 -0300 +@@ -241,8 +241,8 @@ + # include + #endif + #include +- extern unsigned GC_version; + int main(void){ ++ unsigned GC_version = GC_get_version(); + unsigned min = ((6 << 16) | (4 << 8) | 0); + printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF); + if (GC_version>=min) return 0; diff --git a/stage5/patches/common/inkscape-0.48.5-poppler-1.patch b/stage5/patches/common/inkscape-0.48.5-poppler-1.patch new file mode 100644 index 0000000..7fa6d71 --- /dev/null +++ b/stage5/patches/common/inkscape-0.48.5-poppler-1.patch @@ -0,0 +1,104 @@ +Submitted By: Fernando de Oliveira +Date: 2014-12-21 +Initial Package Version: 0.48.5 +Upstream Status: committed +Origin: Upstream (rediffed for BLFS format) +URL: https://launchpadlibrarian.net/192286866/1399811-fix-build-with-poppler-0.29.0-048x-v1.diff +Description: Fixes build with poppler-0.29.0 + +diff -Naur inkscape-0.48.5.orig/configure.ac inkscape-0.48.5/configure.ac +--- inkscape-0.48.5.orig/configure.ac 2014-06-20 17:29:03.717600589 -0300 ++++ inkscape-0.48.5/configure.ac 2014-12-21 11:39:47.917337863 -0300 +@@ -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" +diff -Naur inkscape-0.48.5.orig/src/extension/internal/pdfinput/pdf-parser.cpp inkscape-0.48.5/src/extension/internal/pdfinput/pdf-parser.cpp +--- inkscape-0.48.5.orig/src/extension/internal/pdfinput/pdf-parser.cpp 2014-06-09 10:24:41.979418000 -0300 ++++ inkscape-0.48.5/src/extension/internal/pdfinput/pdf-parser.cpp 2014-12-21 11:39:47.920337775 -0300 +@@ -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); -- 2.20.1