diff -Nru ipe-tools-7.2.7.2/debian/changelog ipe-tools-7.2.7.2/debian/changelog --- ipe-tools-7.2.7.2/debian/changelog 2020-02-22 16:20:58.000000000 +0000 +++ ipe-tools-7.2.7.2/debian/changelog 2020-08-20 15:36:31.000000000 +0000 @@ -1,3 +1,21 @@ +ipe-tools (1:7.2.7.2-4+rpi1) bullseye-staging; urgency=medium + + * fix build with poppler 0.85 + + Change Guchar to unsigned char. + + Remove include of goo/gtypes.h which no longer exists, + + Change getCString to c_str, + + Adjust globalParams creation for the fact it is now + a unique_ptr + + Include header for std::make_unique + + Change std=c++11 to std=c++14 for std::make_unique + + Remove "delete globalParams;", globalParams is now managed + by a unique_ptr. + + Fix const correctness. + + Bump build-dependencies on poppler because above changes + will break build with older versions. + + -- Peter Michael Green Thu, 20 Aug 2020 15:36:31 +0000 + ipe-tools (1:7.2.7.2-4) unstable; urgency=medium [ Steve Robbins ] diff -Nru ipe-tools-7.2.7.2/debian/control ipe-tools-7.2.7.2/debian/control --- ipe-tools-7.2.7.2/debian/control 2020-02-22 16:18:15.000000000 +0000 +++ ipe-tools-7.2.7.2/debian/control 2020-08-20 15:36:31.000000000 +0000 @@ -8,7 +8,7 @@ dh-python, python3:any | python3-all:any | python3-dev:any | python3-all-dev:any | dh-sequence-python3, pkg-config, - libpoppler-private-dev + libpoppler-private-dev (>= 0.85) Standards-Version: 4.1.3 Vcs-Browser: https://salsa.debian.org/science-team/ipe-tools Vcs-Git: https://salsa.debian.org/science-team/ipe-tools.git diff -Nru ipe-tools-7.2.7.2/debian/patches/poppler-0.85.patch ipe-tools-7.2.7.2/debian/patches/poppler-0.85.patch --- ipe-tools-7.2.7.2/debian/patches/poppler-0.85.patch 1970-01-01 00:00:00.000000000 +0000 +++ ipe-tools-7.2.7.2/debian/patches/poppler-0.85.patch 2020-08-20 15:36:31.000000000 +0000 @@ -0,0 +1,111 @@ +Description: fix build with poppler 0.85 + Change Guchar to unsigned char. + Remove include of goo/gtypes.h which no longer exists, + Change getCString to c_str, + Adjust globalParams creation for the fact it is now a unique_ptr + Include header for std::make_unique + Change std=c++11 to std=c++14 for std::make_unique + Remove "delete globalParams;", globalParams is now managed by a unique_ptr. + Fix const correctness. +Author: Peter Michael Green + +Index: ipe-tools-7.2.7.2/pdftoipe/xmloutputdev.cpp +=================================================================== +--- ipe-tools-7.2.7.2.orig/pdftoipe/xmloutputdev.cpp ++++ ipe-tools-7.2.7.2/pdftoipe/xmloutputdev.cpp +@@ -196,8 +196,8 @@ void XmlOutputDev::eoFill(GfxState *stat + + void XmlOutputDev::doPath(GfxState *state) + { +- GfxPath *path = state->getPath(); +- GfxSubpath *subpath; ++ const GfxPath *path = state->getPath(); ++ const GfxSubpath *subpath; + int n, m, i, j; + + n = path->getNumSubpaths(); +@@ -330,7 +330,7 @@ void XmlOutputDev::drawImage(GfxState *s + finishText(); + + ImageStream *imgStr; +- Guchar *p; ++ unsigned char *p; + GfxRGB rgb; + int x, y; + int c; +Index: ipe-tools-7.2.7.2/pdftoipe/Makefile +=================================================================== +--- ipe-tools-7.2.7.2.orig/pdftoipe/Makefile ++++ ipe-tools-7.2.7.2/pdftoipe/Makefile +@@ -24,7 +24,7 @@ else + TARGET = pdftoipe + endif + +-CXXFLAGS += -Wno-write-strings -std=c++11 ++CXXFLAGS += -Wno-write-strings -std=c++14 + + all: $(TARGET) + +Index: ipe-tools-7.2.7.2/pdftoipe/parseargs.h +=================================================================== +--- ipe-tools-7.2.7.2.orig/pdftoipe/parseargs.h ++++ ipe-tools-7.2.7.2/pdftoipe/parseargs.h +@@ -27,8 +27,6 @@ + extern "C" { + #endif + +-#include "goo/gtypes.h" +- + /* + * Argument kinds. + */ +Index: ipe-tools-7.2.7.2/pdftoipe/pdftoipe.cpp +=================================================================== +--- ipe-tools-7.2.7.2.orig/pdftoipe/pdftoipe.cpp ++++ ipe-tools-7.2.7.2/pdftoipe/pdftoipe.cpp +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + + #include "goo/GooString.h" + #include "goo/gmem.h" +@@ -79,7 +80,7 @@ int main(int argc, char *argv[]) + + GooString *fileName = new GooString(argv[1]); + +- globalParams = new GlobalParams(); ++ globalParams = std::make_unique(); + if (quiet) + globalParams->setErrQuiet(quiet); + +@@ -108,9 +109,9 @@ int main(int argc, char *argv[]) + if (argc == 3) { + xmlFileName = new GooString(argv[2]); + } else { +- const char *p = fileName->getCString() + fileName->getLength() - 4; ++ const char *p = fileName->c_str() + fileName->getLength() - 4; + if (!strcmp(p, ".pdf") || !strcmp(p, ".PDF")) { +- xmlFileName = new GooString(fileName->getCString(), ++ xmlFileName = new GooString(fileName->c_str(), + fileName->getLength() - 4); + } else { + xmlFileName = fileName->copy(); +@@ -127,7 +128,7 @@ int main(int argc, char *argv[]) + + // write XML file + XmlOutputDev *xmlOut = +- new XmlOutputDev(xmlFileName->getCString(), doc->getXRef(), ++ new XmlOutputDev(xmlFileName->c_str(), doc->getXRef(), + doc->getCatalog(), firstPage, lastPage); + + // tell output device about text handling +@@ -154,7 +155,6 @@ int main(int argc, char *argv[]) + delete xmlOut; + delete xmlFileName; + delete doc; +- delete globalParams; + + return exitCode; + } diff -Nru ipe-tools-7.2.7.2/debian/patches/series ipe-tools-7.2.7.2/debian/patches/series --- ipe-tools-7.2.7.2/debian/patches/series 2020-01-19 19:33:32.000000000 +0000 +++ ipe-tools-7.2.7.2/debian/patches/series 2020-08-20 15:36:31.000000000 +0000 @@ -1,2 +1,3 @@ 0001-Upgrade-svgtoipe-for-python3.patch cross.patch +poppler-0.85.patch