Fix build for poppler-0.20, adjust WANTLIB.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/inkscape/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile 23 Mar 2012 13:28:25 -0000 1.25
+++ Makefile 12 Jul 2012 20:56:00 -0000
@@ -3,7 +3,7 @@
COMMENT= SVG vector drawing application
DISTNAME= inkscape-0.48.2
-REVISION= 1
+REVISION= 2
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
@@ -25,7 +25,7 @@ WANTLIB= GL Magick++ MagickCore X11 Xcom
Xext Xfixes Xi Xinerama Xrandr Xrender \
aspell atk-1.0 atkmm-1.6 c cairo cairomm-1.0 expat \
fontconfig freetype gc gdk-x11-2.0 gdk_pixbuf-2.0 gdkmm-2.4 \
- gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gmodule-2.0 gobject-2.0 \
+ gio-2.0 giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 \
gsl gslcblas gthread-2.0 gtk-x11-2.0 gtkmm-2.4 gtkspell \
lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0 pangomm-1.4 \
pixman-1 png poppler poppler-glib popt pthread pthread-stubs \
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/graphics/inkscape/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 16 May 2011 19:39:18 -0000 1.3
+++ patches/patch-configure_ac 12 Jul 2012 20:56:00 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2011/05/16 19:39:18 kili Exp $
---- configure.ac.orig Fri Apr 29 17:50:22 2011
-+++ configure.ac Fri Apr 29 17:51:09 2011
-@@ -767,7 +767,7 @@ if test "x$cairo_pdf" = "xyes"; then
+--- configure.ac.orig Fri Jul 8 21:23:16 2011
++++ configure.ac Thu Jul 12 18:27:17 2012
+@@ -795,7 +795,7 @@ if test "x$cairo_pdf" = "xyes"; then
fi
dnl Shouldn't we test for libpng and libz?
Index: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
===================================================================
RCS file: patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
diff -N patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_extension_internal_pdfinput_pdf-parser_cpp 12 Jul
2012 20:56:00 -0000
@@ -0,0 +1,631 @@
+$OpenBSD$
+
+Fix build with poppler-0.20. From arch linux.
+
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig Fri Jul 8
20:25:09 2011
++++ src/extension/internal/pdfinput/pdf-parser.cpp Thu Jul 12 18:55:07 2012
+@@ -367,14 +367,14 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
+ for (i = 0; i < obj->arrayGetLength(); ++i) {
+ obj->arrayGet(i, &obj2);
+ if (!obj2.isStream()) {
+- error(-1, const_cast<char*>("Weird page contents"));
++ error(errInternal, -1, const_cast<char*>("Weird page contents"));
+ obj2.free();
+ return;
+ }
+ obj2.free();
+ }
+ } else if (!obj->isStream()) {
+- error(-1, const_cast<char*>("Weird page contents"));
++ error(errInternal, -1, const_cast<char*>("Weird page contents"));
+ return;
+ }
+ parser = new Parser(xref, new Lexer(xref, obj), gFalse);
+@@ -419,7 +419,7 @@ void PdfParser::go(GBool topLevel) {
+
+ // too many arguments - something is wrong
+ } else {
+- error(getPos(), const_cast<char*>("Too many args in content stream"));
++ error(errInternal, getPos(), const_cast<char*>("Too many args in
content stream"));
+ if (printCommands) {
+ printf("throwing away arg: ");
+ obj.print(stdout);
+@@ -436,7 +436,7 @@ void PdfParser::go(GBool topLevel) {
+
+ // args at end with no command
+ if (numArgs > 0) {
+- error(getPos(), const_cast<char*>("Leftover args in content stream"));
++ error(errInternal, getPos(), const_cast<char*>("Leftover args in content
stream"));
+ if (printCommands) {
+ printf("%d leftovers:", numArgs);
+ for (i = 0; i < numArgs; ++i) {
+@@ -502,7 +502,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int
+ name = cmd->getCmd();
+ if (!(op = findOp(name))) {
+ if (ignoreUndef == 0)
+- error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
++ error(errInternal, getPos(), const_cast<char*>("Unknown operator
'%s'"), name);
+ return;
+ }
+
+@@ -510,26 +510,26 @@ void PdfParser::execOp(Object *cmd, Object args[], int
+ argPtr = args;
+ if (op->numArgs >= 0) {
+ if (numArgs < op->numArgs) {
+- error(getPos(), const_cast<char*>("Too few (%d) args to '%s'
operator"), numArgs, name);
++ error(errInternal, getPos(), const_cast<char*>("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<char*>("Too many (%d) args to '%s'
operator"),
++ error(errInternal, getPos(), const_cast<char*>("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<char*>("Arg #%d to '%s' operator is wrong
type (%s)"),
++ error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s'
operator is wrong type (%s)"),
+ i, name, argPtr[i].getTypeName());
+ return;
+ }
+@@ -690,7 +690,7 @@ void PdfParser::opSetExtGState(Object args[], int numA
+ return;
+ }
+ if (!obj1.isDict()) {
+- error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"),
args[0].getName());
++ error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong
type"), args[0].getName());
+ obj1.free();
+ return;
+ }
+@@ -705,7 +705,7 @@ void PdfParser::opSetExtGState(Object args[], int numA
+ if (state->parseBlendMode(&obj2, &mode)) {
+ state->setBlendMode(mode);
+ } else {
+- error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
++ error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in
ExtGState"));
+ }
+ }
+ obj2.free();
+@@ -764,7 +764,7 @@ void PdfParser::opSetExtGState(Object args[], int numA
+ state->setTransfer(funcs);
+ }
+ } else if (!obj2.isNull()) {
+- error(getPos(), const_cast<char*>("Invalid transfer function in
ExtGState"));
++ error(errInternal, getPos(), const_cast<char*>("Invalid transfer function
in ExtGState"));
+ }
+ obj2.free();
+
+@@ -784,7 +784,7 @@ void PdfParser::opSetExtGState(Object args[], int numA
+ funcs[0] = Function::parse(&obj3);
+ if (funcs[0]->getInputSize() != 1 ||
+ funcs[0]->getOutputSize() != 1) {
+- error(getPos(),
++ error(errInternal, getPos(),
+ const_cast<char*>("Invalid transfer function in soft mask in
ExtGState"));
+ delete funcs[0];
+ funcs[0] = NULL;
+@@ -809,11 +809,7 @@ void PdfParser::opSetExtGState(Object args[], int numA
+ blendingColorSpace = NULL;
+ isolated = knockout = gFalse;
+ if (!obj4.dictLookup(const_cast<char*>("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<char*>("I"), &obj5)->isBool()) {
+@@ -840,15 +836,15 @@ void PdfParser::opSetExtGState(Object args[], int numA
+ delete funcs[0];
+ }
+ } else {
+- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState -
missing group"));
++ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in
ExtGState - missing group"));
+ }
+ obj4.free();
+ } else {
+- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState -
missing group"));
++ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in
ExtGState - missing group"));
+ }
+ obj3.free();
+ } else if (!obj2.isNull()) {
+- error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
++ error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in
ExtGState"));
+ }
+ }
+ obj2.free();
+@@ -876,7 +872,7 @@ void PdfParser::doSoftMask(Object *str, GBool alpha,
+ // check form type
+ dict->lookup(const_cast<char*>("FormType"), &obj1);
+ if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
+- error(getPos(), const_cast<char*>("Unknown form type"));
++ error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
+ }
+ obj1.free();
+
+@@ -884,7 +880,7 @@ void PdfParser::doSoftMask(Object *str, GBool alpha,
+ dict->lookup(const_cast<char*>("BBox"), &obj1);
+ if (!obj1.isArray()) {
+ obj1.free();
+- error(getPos(), const_cast<char*>("Bad form bounding box"));
++ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
+ return;
+ }
+ for (i = 0; i < 4; ++i) {
+@@ -1012,19 +1008,11 @@ void PdfParser::opSetFillColorSpace(Object args[], int
+
+ 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 @@ void PdfParser::opSetFillColorSpace(Object args[], int
+ state->setFillColor(&color);
+ builder->updateStyle(state);
+ } else {
+- error(getPos(), const_cast<char*>("Bad color space (fill)"));
++ error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)"));
+ }
+ }
+
+@@ -1043,19 +1031,11 @@ void PdfParser::opSetStrokeColorSpace(Object args[], i
+
+ 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 @@ void PdfParser::opSetStrokeColorSpace(Object args[], i
+ state->setStrokeColor(&color);
+ builder->updateStyle(state);
+ } else {
+- error(getPos(), const_cast<char*>("Bad color space (stroke)"));
++ error(errInternal, getPos(), const_cast<char*>("Bad color space
(stroke)"));
+ }
+ }
+
+@@ -1072,7 +1052,7 @@ void PdfParser::opSetFillColor(Object args[], int numA
+ int i;
+
+ if (numArgs != state->getFillColorSpace()->getNComps()) {
+- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc'
command"));
++ error(errInternal, getPos(), const_cast<char*>("Incorrect number of
arguments in 'sc' command"));
+ return;
+ }
+ state->setFillPattern(NULL);
+@@ -1088,7 +1068,7 @@ void PdfParser::opSetStrokeColor(Object args[], int nu
+ int i;
+
+ if (numArgs != state->getStrokeColorSpace()->getNComps()) {
+- error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC'
command"));
++ error(errInternal, getPos(), const_cast<char*>("Incorrect number of
arguments in 'SC' command"));
+ return;
+ }
+ state->setStrokePattern(NULL);
+@@ -1109,7 +1089,7 @@ void PdfParser::opSetFillColorN(Object args[], int num
+ if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() ||
+ numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())
+ ->getUnder()->getNComps()) {
+- error(getPos(), const_cast<char*>("Incorrect number of arguments in
'scn' command"));
++ error(errInternal, getPos(), const_cast<char*>("Incorrect number of
arguments in 'scn' command"));
+ return;
+ }
+ for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
+@@ -1120,23 +1100,15 @@ void PdfParser::opSetFillColorN(Object args[], int num
+ 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<char*>("Incorrect number of arguments in
'scn' command"));
++ error(errInternal, getPos(), const_cast<char*>("Incorrect number of
arguments in 'scn' command"));
+ return;
+ }
+ state->setFillPattern(NULL);
+@@ -1161,7 +1133,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int n
+ ->getUnder() ||
+ numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())
+ ->getUnder()->getNComps()) {
+- error(getPos(), const_cast<char*>("Incorrect number of arguments in
'SCN' command"));
++ error(errInternal, getPos(), const_cast<char*>("Incorrect number of
arguments in 'SCN' command"));
+ return;
+ }
+ for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
+@@ -1172,23 +1144,15 @@ void PdfParser::opSetStrokeColorN(Object args[], int n
+ 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<char*>("Incorrect number of arguments in
'SCN' command"));
++ error(errInternal, getPos(), const_cast<char*>("Incorrect number of
arguments in 'SCN' command"));
+ return;
+ }
+ state->setStrokePattern(NULL);
+@@ -1212,7 +1176,7 @@ void PdfParser::opMoveTo(Object args[], int numArgs) {
+
+ void PdfParser::opLineTo(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- error(getPos(), const_cast<char*>("No current point in lineto"));
++ error(errInternal, getPos(), const_cast<char*>("No current point in
lineto"));
+ return;
+ }
+ state->lineTo(args[0].getNum(), args[1].getNum());
+@@ -1222,7 +1186,7 @@ void PdfParser::opCurveTo(Object args[], int numArgs)
+ double x1, y1, x2, y2, x3, y3;
+
+ if (!state->isCurPt()) {
+- error(getPos(), const_cast<char*>("No current point in curveto"));
++ error(errInternal, getPos(), const_cast<char*>("No current point in
curveto"));
+ return;
+ }
+ x1 = args[0].getNum();
+@@ -1238,7 +1202,7 @@ void PdfParser::opCurveTo1(Object args[], int numArgs)
+ double x1, y1, x2, y2, x3, y3;
+
+ if (!state->isCurPt()) {
+- error(getPos(), const_cast<char*>("No current point in curveto1"));
++ error(errInternal, getPos(), const_cast<char*>("No current point in
curveto1"));
+ return;
+ }
+ x1 = state->getCurX();
+@@ -1254,7 +1218,7 @@ void PdfParser::opCurveTo2(Object args[], int numArgs)
+ double x1, y1, x2, y2, x3, y3;
+
+ if (!state->isCurPt()) {
+- error(getPos(), const_cast<char*>("No current point in curveto2"));
++ error(errInternal, getPos(), const_cast<char*>("No current point in
curveto2"));
+ return;
+ }
+ x1 = args[0].getNum();
+@@ -1282,7 +1246,7 @@ void PdfParser::opRectangle(Object args[], int numArgs
+
+ void PdfParser::opClosePath(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- error(getPos(), const_cast<char*>("No current point in closepath"));
++ error(errInternal, getPos(), const_cast<char*>("No current point in
closepath"));
+ return;
+ }
+ state->closePath();
+@@ -1298,7 +1262,7 @@ void PdfParser::opEndPath(Object args[], int numArgs)
+
+ void PdfParser::opStroke(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- //error(getPos(), const_cast<char*>("No path in stroke"));
++ //error(errInternal, getPos(), const_cast<char*>("No path in stroke"));
+ return;
+ }
+ if (state->isPath()) {
+@@ -1314,7 +1278,7 @@ void PdfParser::opStroke(Object args[], int numArgs) {
+
+ void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) {
+ if (!state->isCurPt()) {
+- //error(getPos(), const_cast<char*>("No path in closepath/stroke"));
++ //error(errInternal, getPos(), const_cast<char*>("No path in
closepath/stroke"));
+ return;
+ }
+ state->closePath();
+@@ -1331,7 +1295,7 @@ void PdfParser::opCloseStroke(Object * /*args[]*/, int
+
+ void PdfParser::opFill(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- //error(getPos(), const_cast<char*>("No path in fill"));
++ //error(errInternal, getPos(), const_cast<char*>("No path in fill"));
+ return;
+ }
+ if (state->isPath()) {
+@@ -1347,7 +1311,7 @@ void PdfParser::opFill(Object args[], int numArgs) {
+
+ void PdfParser::opEOFill(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- //error(getPos(), const_cast<char*>("No path in eofill"));
++ //error(errInternal, getPos(), const_cast<char*>("No path in eofill"));
+ return;
+ }
+ if (state->isPath()) {
+@@ -1363,7 +1327,7 @@ void PdfParser::opEOFill(Object args[], int numArgs) {
+
+ void PdfParser::opFillStroke(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- //error(getPos(), const_cast<char*>("No path in fill/stroke"));
++ //error(errInternal, getPos(), const_cast<char*>("No path in
fill/stroke"));
+ return;
+ }
+ if (state->isPath()) {
+@@ -1376,7 +1340,7 @@ void PdfParser::opFillStroke(Object args[], int numArg
+
+ void PdfParser::opCloseFillStroke(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
++ //error(errInternal, getPos(), const_cast<char*>("No path in
closepath/fill/stroke"));
+ return;
+ }
+ if (state->isPath()) {
+@@ -1388,7 +1352,7 @@ void PdfParser::opCloseFillStroke(Object args[], int n
+
+ void PdfParser::opEOFillStroke(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- //error(getPos(), const_cast<char*>("No path in eofill/stroke"));
++ //error(errInternal, getPos(), const_cast<char*>("No path in
eofill/stroke"));
+ return;
+ }
+ if (state->isPath()) {
+@@ -1399,7 +1363,7 @@ void PdfParser::opEOFillStroke(Object args[], int numA
+
+ void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) {
+ if (!state->isCurPt()) {
+- //error(getPos(), const_cast<char*>("No path in
closepath/eofill/stroke"));
++ //error(errInternal, getPos(), const_cast<char*>("No path in
closepath/eofill/stroke"));
+ return;
+ }
+ if (state->isPath()) {
+@@ -1440,7 +1404,7 @@ void PdfParser::doPatternFillFallback(GBool eoFill) {
+ doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse,
eoFill);
+ break;
+ default:
+- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in
fill"),
++ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern
type (%d) in fill"),
+ pattern->getType());
+ break;
+ }
+@@ -1459,7 +1423,7 @@ void PdfParser::doPatternStrokeFallback() {
+ doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
+ break;
+ default:
+- error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in
stroke"),
++ error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern
type (%d) in stroke"),
+ pattern->getType());
+ break;
+ }
+@@ -1579,15 +1543,9 @@ void PdfParser::opShFill(Object args[], int numArgs) {
+ 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::opTextNextLine(Object args[], int numA
+
+ void PdfParser::opShowText(Object args[], int numArgs) {
+ if (!state->getFont()) {
+- error(getPos(), const_cast<char*>("No font in show"));
++ error(errInternal, getPos(), const_cast<char*>("No font in show"));
+ return;
+ }
+ if (fontChanged) {
+@@ -2170,7 +2128,7 @@ void PdfParser::opMoveShowText(Object args[], int numA
+ double tx, ty;
+
+ if (!state->getFont()) {
+- error(getPos(), const_cast<char*>("No font in move/show"));
++ error(errInternal, getPos(), const_cast<char*>("No font in move/show"));
+ return;
+ }
+ if (fontChanged) {
+@@ -2188,7 +2146,7 @@ void PdfParser::opMoveSetShowText(Object args[], int n
+ double tx, ty;
+
+ if (!state->getFont()) {
+- error(getPos(), const_cast<char*>("No font in move/set/show"));
++ error(errInternal, getPos(), const_cast<char*>("No font in
move/set/show"));
+ return;
+ }
+ if (fontChanged) {
+@@ -2211,7 +2169,7 @@ void PdfParser::opShowSpaceText(Object args[], int num
+ int i;
+
+ if (!state->getFont()) {
+- error(getPos(), const_cast<char*>("No font in show/space"));
++ error(errInternal, getPos(), const_cast<char*>("No font in show/space"));
+ return;
+ }
+ if (fontChanged) {
+@@ -2236,7 +2194,7 @@ void PdfParser::opShowSpaceText(Object args[], int num
+ } else if (obj.isString()) {
+ doShowText(obj.getString());
+ } else {
+- error(getPos(), const_cast<char*>("Element of show/space array must be
number or string"));
++ error(errInternal, getPos(), const_cast<char*>("Element of show/space
array must be number or string"));
+ }
+ obj.free();
+ }
+@@ -2334,7 +2292,7 @@ void PdfParser::doShowText(GooString *s) {
+ if (charProc.isStream()) {
+ //parse(&charProc, gFalse); // TODO: parse into SVG font
+ } else {
+- error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc
entry"));
++ error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3
CharProc entry"));
+ }
+ //out->endType3Char(state);
+ if (resDict) {
+@@ -2410,7 +2368,7 @@ void PdfParser::opXObject(Object args[], int numArgs)
+ return;
+ }
+ if (!obj1.isStream()) {
+- error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
++ error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong
type"), name);
+ obj1.free();
+ return;
+ }
+@@ -2426,9 +2384,9 @@ void PdfParser::opXObject(Object args[], int numArgs)
+ /* out->psXObject(obj1.getStream(),
+ obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
+ } else if (obj2.isName()) {
+- error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"),
obj2.getName());
++ error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype
'%s'"), obj2.getName());
+ } else {
+- error(getPos(), const_cast<char*>("XObject subtype is missing or wrong
type"));
++ error(errInternal, getPos(), const_cast<char*>("XObject subtype is
missing or wrong type"));
+ }
+ obj2.free();
+ obj1.free();
+@@ -2559,11 +2517,7 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
+ }
+ }
+ 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 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
+ 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 @@ void PdfParser::doImage(Object *ref, Stream *str, GBoo
+ err2:
+ obj1.free();
+ err1:
+- error(getPos(), const_cast<char*>("Bad image parameters"));
++ error(errInternal, getPos(), const_cast<char*>("Bad image parameters"));
+ }
+
+ void PdfParser::doForm(Object *str) {
+@@ -2783,7 +2733,7 @@ void PdfParser::doForm(Object *str) {
+ // check form type
+ dict->lookup(const_cast<char*>("FormType"), &obj1);
+ if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
+- error(getPos(), const_cast<char*>("Unknown form type"));
++ error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
+ }
+ obj1.free();
+
+@@ -2791,7 +2741,7 @@ void PdfParser::doForm(Object *str) {
+ dict->lookup(const_cast<char*>("BBox"), &bboxObj);
+ if (!bboxObj.isArray()) {
+ bboxObj.free();
+- error(getPos(), const_cast<char*>("Bad form bounding box"));
++ error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
+ return;
+ }
+ for (i = 0; i < 4; ++i) {
+@@ -2827,11 +2777,7 @@ 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()) {
+-#ifdef POPPLER_NEW_COLOR_SPACE_API
+ blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
+-#else
+- blendingColorSpace = GfxColorSpace::parse(&obj3);
+-#endif
+ }
+ obj3.free();
+ if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
+@@ -2990,7 +2936,7 @@ Stream *PdfParser::buildImageStream() {
+ parser->getObj(&obj);
+ while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
+ if (!obj.isName()) {
+- error(getPos(), const_cast<char*>("Inline image dictionary key must be
a name object"));
++ error(errInternal, getPos(), const_cast<char*>("Inline image dictionary
key must be a name object"));
+ obj.free();
+ } else {
+ key = copyString(obj.getName());
+@@ -3005,7 +2951,7 @@ Stream *PdfParser::buildImageStream() {
+ parser->getObj(&obj);
+ }
+ if (obj.isEOF()) {
+- error(getPos(), const_cast<char*>("End of file in inline image"));
++ error(errInternal, getPos(), const_cast<char*>("End of file in inline
image"));
+ obj.free();
+ dict.free();
+ return NULL;
+@@ -3020,11 +2966,11 @@ Stream *PdfParser::buildImageStream() {
+ }
+
+ void PdfParser::opImageData(Object args[], int numArgs) {
+- error(getPos(), const_cast<char*>("Internal: got 'ID' operator"));
++ error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID'
operator"));
+ }
+
+ void PdfParser::opEndImage(Object args[], int numArgs) {
+- error(getPos(), const_cast<char*>("Internal: got 'EI' operator"));
++ error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI'
operator"));
+ }
+
+ //------------------------------------------------------------------------
Index: patches/patch-src_extension_internal_pdfinput_svg-builder_cpp
===================================================================
RCS file:
/cvs/ports/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_extension_internal_pdfinput_svg-builder_cpp
--- patches/patch-src_extension_internal_pdfinput_svg-builder_cpp 8 Jul
2011 20:38:00 -0000 1.1
+++ patches/patch-src_extension_internal_pdfinput_svg-builder_cpp 12 Jul
2012 20:56:00 -0000
@@ -1,10 +1,21 @@
$OpenBSD: patch-src_extension_internal_pdfinput_svg-builder_cpp,v 1.1
2011/07/08 20:38:00 naddy Exp $
-Fix build with png-1.5.
+Fix build with poppler-0.20 (from arch linux) png-1.5.
---- src/extension/internal/pdfinput/svg-builder.cpp.orig Wed Jul 6
19:01:29 2011
-+++ src/extension/internal/pdfinput/svg-builder.cpp Wed Jul 6 19:01:45 2011
-@@ -1443,7 +1443,7 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *
+--- src/extension/internal/pdfinput/svg-builder.cpp.orig Fri Jul 8
20:25:09 2011
++++ src/extension/internal/pdfinput/svg-builder.cpp Thu Jul 12 18:28:52 2012
+@@ -961,9 +961,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+ _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";
+@@ -1443,7 +1441,7 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *
return NULL;
}
// Set error handler
Index: patches/patch-src_sp-image_cpp
===================================================================
RCS file: /cvs/ports/graphics/inkscape/patches/patch-src_sp-image_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_sp-image_cpp
--- patches/patch-src_sp-image_cpp 8 Jul 2011 20:38:00 -0000 1.1
+++ patches/patch-src_sp-image_cpp 12 Jul 2012 20:56:00 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-src_sp-image_cpp,v 1.1 2
Fix build with png-1.5.
---- src/sp-image.cpp.orig Wed Jul 6 18:23:19 2011
-+++ src/sp-image.cpp Wed Jul 6 18:23:45 2011
-@@ -388,7 +388,7 @@ static bool readPngAndHeaders( PushPull &youme, gint &
+--- src/sp-image.cpp.orig Thu Jul 12 18:27:13 2012
++++ src/sp-image.cpp Thu Jul 12 18:27:13 2012
+@@ -389,7 +389,7 @@ static bool readPngAndHeaders( PushPull &youme, gint &
{
char* name = 0;
int compression_type = 0;
