diff -Nru xpdf-3.04/debian/changelog xpdf-3.04/debian/changelog --- xpdf-3.04/debian/changelog 2017-11-25 00:15:13.000000000 +0000 +++ xpdf-3.04/debian/changelog 2018-01-26 04:03:03.000000000 +0000 @@ -1,3 +1,15 @@ +xpdf (3.04-5ubuntu2) bionic; urgency=medium + + * Fix build with poppler-0.62. + + -- Matthias Klose Fri, 26 Jan 2018 05:03:03 +0100 + +xpdf (3.04-5ubuntu1) bionic; urgency=medium + + * Apply Debian hacks to build with poppler-0.62. See #883523. + + -- Matthias Klose Thu, 25 Jan 2018 06:49:14 +0100 + xpdf (3.04-5) unstable; urgency=medium * QA upload. diff -Nru xpdf-3.04/debian/patches/poppler-0.62.diff xpdf-3.04/debian/patches/poppler-0.62.diff --- xpdf-3.04/debian/patches/poppler-0.62.diff 1970-01-01 00:00:00.000000000 +0000 +++ xpdf-3.04/debian/patches/poppler-0.62.diff 2018-01-26 04:03:00.000000000 +0000 @@ -0,0 +1,13 @@ +Index: b/xpdf/GlobalParams.cc +=================================================================== +--- a/xpdf/GlobalParams.cc ++++ b/xpdf/GlobalParams.cc +@@ -74,7 +74,7 @@ + + #include "NameToUnicodeTable.h" + #include "UnicodeMapTables.h" +-#include "UTF8.h" ++#include "UnicodeMapFuncs.h" + + #ifdef ENABLE_PLUGINS + # ifdef _WIN32 diff -Nru xpdf-3.04/debian/patches/poppler.diff xpdf-3.04/debian/patches/poppler.diff --- xpdf-3.04/debian/patches/poppler.diff 1970-01-01 00:00:00.000000000 +0000 +++ xpdf-3.04/debian/patches/poppler.diff 2018-01-25 05:48:58.000000000 +0000 @@ -0,0 +1,55 @@ +Description: Hacks to compile with poppler 0.61 + - disable screenType setting + - disable Movie action +Author: Adrian Bunk +Bug-Debian: https://bugs.debian.org/883523 + +--- xpdf-3.04.orig/xpdf/GlobalParams.cc ++++ xpdf-3.04/xpdf/GlobalParams.cc +@@ -1174,8 +1174,8 @@ void GlobalParams::parseLine(char *buf, + /* + } else if (!cmd->cmp("strokeAdjust")) { + parseYesNo("strokeAdjust", &strokeAdjust, tokens, fileName, line); +- } else if (!cmd->cmp("screenType")) { +- parseScreenType(tokens, fileName, line); ++// } else if (!cmd->cmp("screenType")) { ++// parseScreenType(tokens, fileName, line); + } else if (!cmd->cmp("screenSize")) { + parseInteger("screenSize", &screenSize, tokens, fileName, line); + } else if (!cmd->cmp("screenDotRadius")) { +@@ -1617,6 +1617,7 @@ void GlobalParams::parseInitialZoom(GLis + initialZoom = ((GString *)tokens->get(1))->copy(); + } + ++/* + void GlobalParams::parseScreenType(GList *tokens, GString *fileName, + int line) { + GString *tok; +@@ -1638,6 +1639,7 @@ void GlobalParams::parseScreenType(GList + fileName, line); + } + } ++*/ + + + void GlobalParams::parseBind(GList *tokens, GString *fileName, int line) { +--- xpdf-3.04.orig/xpdf/XPDFCore.cc ++++ xpdf-3.04/xpdf/XPDFCore.cc +@@ -684,6 +684,8 @@ void XPDFCore::doAction(LinkAction *acti + + // Movie action + case actionMovie: ++ ++/* + if (!(cmd = xpdfParams->getMovieCommand())) { + error(errConfig, -1, "No movieCommand defined in config file"); + break; +@@ -732,6 +734,8 @@ void XPDFCore::doAction(LinkAction *acti + } + } + movieAnnot.free(); ++*/ ++ error(errSyntaxError, -1, "Movie action needs fixing"); + break; + + // unsupported action types diff -Nru xpdf-3.04/debian/patches/series xpdf-3.04/debian/patches/series --- xpdf-3.04/debian/patches/series 2017-11-24 23:08:09.000000000 +0000 +++ xpdf-3.04/debian/patches/series 2018-01-26 04:01:20.000000000 +0000 @@ -29,3 +29,6 @@ # misc fixes fix-737989.patch poppler-manpage.patch + +poppler.diff +poppler-0.62.diff