On Fri, 01 Aug 2008 10:27:20 +1000, Peter Moulder wrote:
# grep error: build.log extension/internal/pdfinput/pdf-parser.cpp:2259: error: expected primary-expression before '<<' token
That often indicates that there's an svn merge conflict in that file. Try doing svn revert extension/internal/pdfinput/pdf-parser.cpp (perhaps preceded by svn diff to check whether there are any deliberate changes of yours to that file that you want to keep).
You're right of course. I'm familiar with the conflict, but I hadn't anticipated that being the case because I use the inkscape svn checkout only to build, never edit. The diff was as follows:
$ svn diff Index: src/extension/internal/pdfinput/pdf-parser.cpp =================================================================== --- src/extension/internal/pdfinput/pdf-parser.cpp (revision 19501) +++ src/extension/internal/pdfinput/pdf-parser.cpp (working copy) @@ -2207,7 +2207,7 @@ #ifdef POPPLER_NEW_GFXFONT Unicode *u = NULL; #else - Unicode u[8]; + Unicode *u = NULL; #endif double x, y, dx, dy, dx2, dy2, curX, curY, tdx, tdy, lineX, lineY; double originX, originY, tOriginX, tOriginY; @@ -2256,10 +2256,14 @@ len = s->getLength(); while (len > 0) { n = font->getNextChar(p, len, &code, +<<<<<<< .mine + &u, &uLen, +======= #ifdef POPPLER_NEW_GFXFONT &u, &uLen, /* TODO: This looks like a memory leak for u. */ #else u, (int)(sizeof(u) / sizeof(Unicode)), &uLen, +>>>>>>> .r19372 #endif &dx, &dy, &originX, &originY); dx = dx * state->getFontSize() + state->getCharSpace(); @@ -2309,10 +2313,14 @@ len = s->getLength(); while (len > 0) { n = font->getNextChar(p, len, &code, +<<<<<<< .mine + &u, &uLen, +======= #ifdef POPPLER_NEW_GFXFONT &u, &uLen, /* TODO: This looks like a memory leak for u. */ #else u, (int)(sizeof(u) / sizeof(Unicode)), &uLen, +>>>>>>> .r19372 #endif &dx, &dy, &originX, &originY);
Thanks again.