Hi, On Fri, Feb 15, 2019 at 04:12:07PM -0500, George Koehler wrote: > I'm looking for someone to handle the attached diff, which fixes the > build of editors/calligra with recent poppler. [...]
I'm suprised that I didn't notice that breakage -- I did run dpb -uR with the newer poppler in my tree and watched out for any error indicators in dpb's terminal output but didn't see anything. > I'm attaching a diff in editors/calligra with some patches from > calligra's git. This allows me to package calligra on powerpc, but I > can't run Qt5 apps like calligra because of a bug in powerpc clang [1], > and I haven't tried the diff on amd64. [...] The diff looks fine to me after a quick look (and from all the API breakages introduced with recent poppler versions i can remember). Thanks! But one comment below... I'll throw this into my current bulk update build on amd64, with an even newer poppler (0.74.0). This time, there were no API breakages from what I've seen in comparing sources of 0.73.0 and 0.74.0. > The diff doesn't bump REVISION, because I don't know whether to do so. I don't think a bumps is needed. It's broken with poppler-0.73.0, and any older installed calligra package will be updated properly when new packages (against poppler-0.73.0 or poppler-0.74.0) will be available. > +Index: filters/karbon/pdf/PdfImport.cpp > +--- filters/karbon/pdf/PdfImport.cpp.orig > ++++ filters/karbon/pdf/PdfImport.cpp [...] > +@@ -101,9 +101,6 @@ KoFilter::ConversionStatus PdfImport::convert(const QB > + delete pdfDoc; > + delete globalParams; > + globalParams = 0; > +- > +- // check for memory leaks > +- Object::memCheck(stderr); > + > + return KoFilter::OK; > + } Not sure about this one. At least I can't remember to run over it in all the other ports that required patches for poppler-0.73.0. But that doesn't mean it's not necessary ;-) I'll look at the current poppler includes files before putting your diff into my tree. Ciao, Kili