diff options
72 files changed, 2946 insertions, 812 deletions
@@ -10785,3 +10785,4 @@ biology/njplot|biology/seaview|2018-12-11|Has expired: Deprecated by upstream; u devel/dcmtk|graphics/dcmtk|2018-12-12|Move to a proper category graphics/cuneiform||2018-12-16|Has expired: Unmaintained upstream dns/knot1|dns/knot2|2018-12-16|Has expired: EOL upstream; successor dns/knot2 is in place +print/frescobaldi||2018-12-16|Depends on non-existent poppler-qt4 diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile index cc4e06571918..23d6a76b2be9 100644 --- a/databases/kbibtex/Makefile +++ b/databases/kbibtex/Makefile @@ -3,7 +3,7 @@ PORTNAME= kbibtex DISTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases kde MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION}/ diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 37dbd00b2667..8df72ab7c9f0 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -2,7 +2,7 @@ PORTNAME= calligra DISTVERSION= 3.1.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} DIST_SUBDIR= KDE/${PORTNAME} diff --git a/editors/calligra/files/patch-debian_poppler-0.69.patch b/editors/calligra/files/patch-debian_poppler-0.69.patch new file mode 100644 index 000000000000..327435149bc1 --- /dev/null +++ b/editors/calligra/files/patch-debian_poppler-0.69.patch @@ -0,0 +1,17 @@ +Description: Fix build with poppler 0.69 +Author: Gianfranco Costamagna <locutusofborg@debian.org> +Bug-Debian: https://bugs.debian.org/910873 +Last-Update: 2018-10-22 + +--- filters/karbon/pdf/PdfImport.cpp ++++ filters/karbon/pdf/PdfImport.cpp +@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::co + delete globalParams; + globalParams = 0; + +- // check for memory leaks +- Object::memCheck(stderr); +- + return KoFilter::OK; + } + diff --git a/editors/calligra/files/patch-filters_karbon_pdf_PdfImport.cpp b/editors/calligra/files/patch-filters_karbon_pdf_PdfImport.cpp new file mode 100644 index 000000000000..24c28f41e9c1 --- /dev/null +++ b/editors/calligra/files/patch-filters_karbon_pdf_PdfImport.cpp @@ -0,0 +1,15 @@ +--- filters/karbon/pdf/PdfImport.cpp.orig 2018-12-08 16:48:32 UTC ++++ filters/karbon/pdf/PdfImport.cpp +@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QB + SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); + if (dev->isOk()) { + int rotate = 0; +- GBool useMediaBox = gTrue; +- GBool crop = gFalse; +- GBool printing = gFalse; ++ bool useMediaBox = true; ++ bool crop = false; ++ bool printing = false; + pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); + dev->dumpContent(); + } diff --git a/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp new file mode 100644 index 000000000000..911bedf7e936 --- /dev/null +++ b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp @@ -0,0 +1,175 @@ +--- filters/karbon/pdf/SvgOutputDev.cpp.orig 2018-01-26 09:24:44 UTC ++++ filters/karbon/pdf/SvgOutputDev.cpp +@@ -39,7 +39,7 @@ class SvgOutputDev::Private + { + public: + Private(const QString &fname) +- : svgFile(fname), defs(0), body(0), state(gTrue) ++ : svgFile(fname), defs(0), body(0), state(true) + , brush(Qt::SolidPattern) {} + + ~Private() { +@@ -52,7 +52,7 @@ class SvgOutputDev::Private + QString defsData; + QTextStream * defs; + QTextStream * body; +- GBool state; ++ bool state; + QSizeF pageSize; + QPen pen; + QBrush brush; +@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName) + : d(new Private(fileName)) + { + if (! d->svgFile.open(QIODevice::WriteOnly)) { +- d->state = gFalse; ++ d->state = false; + return; + } + +@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev() + delete d; + } + +-GBool SvgOutputDev::isOk() ++bool SvgOutputDev::isOk() + { + return d->state; + } + +-GBool SvgOutputDev::upsideDown() ++bool SvgOutputDev::upsideDown() + { +- return gTrue; ++ return true; + } + +-GBool SvgOutputDev::useDrawChar() ++bool SvgOutputDev::useDrawChar() + { +- return gFalse; ++ return false; + } + +-GBool SvgOutputDev::interpretType3Chars() ++bool SvgOutputDev::interpretType3Chars() + { +- return gFalse; ++ return false; + } + + void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) +@@ -143,7 +143,9 @@ void SvgOutputDev::stroke(GfxState * state) + { + QString path = convertPath(state->getPath()); + *d->body << "<path"; +- *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\""; ++ const double * ctm = state->getCTM(); ++ QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); ++ *d->body << " transform=\"" << convertMatrix(transform) << "\""; + *d->body << printStroke(); + *d->body << " fill=\"none\""; + *d->body << " d=\"" << path << "\""; +@@ -154,7 +156,9 @@ void SvgOutputDev::fill(GfxState * state) + { + QString path = convertPath(state->getPath()); + *d->body << "<path"; +- *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\""; ++ const double * ctm = state->getCTM(); ++ QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); ++ *d->body << " transform=\"" << convertMatrix(transform) << "\""; + *d->body << printFill(); + *d->body << " fill-rule=\"nonzero\""; + *d->body << " d=\"" << path << "\""; +@@ -165,7 +169,9 @@ void SvgOutputDev::eoFill(GfxState *state) + { + QString path = convertPath(state->getPath()); + *d->body << "<path"; +- *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\""; ++ const double * ctm = state->getCTM(); ++ QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); ++ *d->body << " transform=\"" << convertMatrix(transform) << "\""; + *d->body << printFill(); + *d->body << " fill-rule=\"evenodd\""; + *d->body << " d=\"" << path << "\""; +@@ -387,7 +393,7 @@ QString SvgOutputDev::printStroke() + return stroke; + } + +-void SvgOutputDev::drawString(GfxState * state, GooString * s) ++void SvgOutputDev::drawString(GfxState * state, const GooString * s) + { + int render = state->getRender(); + // check for invisible text -- this is used by Acrobat Capture +@@ -402,7 +408,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr + + QString str; + +- char * p = s->getCString(); ++ const char * p = s->c_str(); + int len = s->getLength(); + CharCode code; + Unicode *u = nullptr; +@@ -429,7 +435,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr + double x = state->getCurX(); + double y = state->getCurY(); + +- double * ctm = state->getCTM(); ++ const double * ctm = state->getCTM(); + QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + + QMatrix mirror; +@@ -451,11 +457,11 @@ void SvgOutputDev::drawString(GfxState * state, GooStr + *d->body << " y=\"" << y << "px\""; + + if (font && font->getFamily()) { +- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; +- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); ++ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; ++ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() ); + } else if (font && font->getName()) { +- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; +- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); ++ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; ++ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() ); + } + *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; + +@@ -476,7 +482,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr + + void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool /*inlineImg*/) ++ int *maskColors, bool /*inlineImg*/) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); +@@ -522,7 +528,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object * + return; + } + +- double * ctm = state->getCTM(); ++ const double * ctm = state->getCTM(); + QMatrix m; + m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]); + +@@ -531,7 +537,9 @@ void SvgOutputDev::drawImage(GfxState *state, Object * + device.open(QIODevice::WriteOnly); + if (image->save(&device, "PNG")) { + *d->body << "<image"; +- *d->body << " transform=\"" << convertMatrix(m) << "\""; ++ const double * ctm = state->getCTM(); ++ QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); ++ *d->body << " transform=\"" << convertMatrix(transform) << "\""; + *d->body << " width=\"" << width << "px\""; + *d->body << " height=\"" << height << "px\""; + *d->body << " xlink:href=\"data:image/png;base64," << ba.toBase64() << "\""; +@@ -545,7 +553,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object * + + void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- GBool /*interpolate*/, int *maskColors, GBool inlineImg) ++ bool /*interpolate*/, int *maskColors, bool inlineImg) + { + drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); + } diff --git a/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h new file mode 100644 index 000000000000..731c1a9a086f --- /dev/null +++ b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h @@ -0,0 +1,37 @@ +--- filters/karbon/pdf/SvgOutputDev.h.orig 2018-01-26 09:24:44 UTC ++++ filters/karbon/pdf/SvgOutputDev.h +@@ -44,11 +44,11 @@ class SvgOutputDev : public OutputDev (public) + explicit SvgOutputDev(const QString &fileName); + virtual ~SvgOutputDev(); + +- GBool isOk(); ++ bool isOk(); + +- virtual GBool upsideDown(); +- virtual GBool useDrawChar(); +- virtual GBool interpretType3Chars(); ++ virtual bool upsideDown(); ++ virtual bool useDrawChar(); ++ virtual bool interpretType3Chars(); + virtual void startPage(int pageNum, GfxState *state, XRef *xref); + virtual void endPage(); + +@@ -58,15 +58,15 @@ class SvgOutputDev : public OutputDev (public) + virtual void eoFill(GfxState *state); + + // text +- virtual void drawString(GfxState * state, GooString * s); ++ virtual void drawString(GfxState * state, const GooString * s); + + // images + virtual void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool inlineImg); ++ int *maskColors, bool inlineImg); + virtual void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg); ++ bool interpolate, int *maskColors, bool inlineImg); + + // styles + virtual void updateAll(GfxState *state); diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 55e3509e0877..fa501d4b28de 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 3 +PORTREVISION= 4 MASTER_SITES= https://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ https://dev-www.libreoffice.org/src/:src \ https://dev-www.libreoffice.org/extern/:ext diff --git a/editors/libreoffice/files/patch-archgit_poppler-0.70.patch b/editors/libreoffice/files/patch-archgit_poppler-0.70.patch index 037fcd0e51f4..8ad0c409c5e9 100644 --- a/editors/libreoffice/files/patch-archgit_poppler-0.70.patch +++ b/editors/libreoffice/files/patch-archgit_poppler-0.70.patch @@ -1,45 +1,179 @@ -From 557ee0a0f4e40b934c72515f41f3a605803ddb1d Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evangelos@foutrelis.com> -Date: Wed, 24 Oct 2018 17:48:53 +0300 -Subject: [PATCH] fix build with poppler 0.70 - ---- - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++ - sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index 575a90acb..99219f7e6 100644 ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig 2018-10-30 16:55:21 UTC +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*) +@@ -528,7 +528,7 @@ void PDFOutDev::printPath( GfxPath* pPath ) + PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : + m_pDoc( pDoc ), + m_aFontMap(), +- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ), ++ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), + m_bSkipImages(false) + { + } +@@ -569,7 +569,7 @@ void PDFOutDev::processLink(Link* link, Catalog*) + LinkAction* pAction = link->getAction(); + if (pAction && pAction->getKind() == actionURI) + { +- const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString(); ++ const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str(); + + std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) ); + +@@ -592,7 +592,7 @@ void PDFOutDev::restoreState(GfxState*) printf( "restoreState\n" ); } -+#if POPPLER_CHECK_VERSION(0, 70, 0) +-void PDFOutDev::setDefaultCTM(double *pMat) +void PDFOutDev::setDefaultCTM(const double *pMat) -+#else - void PDFOutDev::setDefaultCTM(double *pMat) -+#endif { assert(pMat); -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index da021a2a0..27440f2bb 100644 ---- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -767,7 +767,7 @@ void PDFOutDev::updateFont(GfxState *state) + + aFont = it->second; + +- std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); ++ std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); + printf( " %d %d %d %d %f %d %s", + aFont.isEmbedded, + aFont.isBold, +@@ -953,11 +953,11 @@ void PDFOutDev::endTextObject(GfxState*) + } + + void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, +- int width, int height, GBool invert, ++ int width, int height, bool invert, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif +- GBool /*inlineImg*/ ) ++ bool /*inlineImg*/ ) + { + if (m_bSkipImages) + return; +@@ -986,9 +986,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object + void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, + int width, int height, GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif +- int* maskColors, GBool /*inlineImg*/ ) ++ int* maskColors, bool /*inlineImg*/ ) + { + if (m_bSkipImages) + return; +@@ -1037,13 +1037,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, St + int width, int height, + GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif + Stream* maskStr, + int maskWidth, int maskHeight, +- GBool maskInvert ++ bool maskInvert + #if POPPLER_CHECK_VERSION(0, 12, 0) +- , GBool /*maskInterpolate*/ ++ , bool /*maskInterpolate*/ + #endif + ) + { +@@ -1059,13 +1059,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object* + int width, int height, + GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif + Stream* maskStr, + int maskWidth, int maskHeight, + GfxImageColorMap* maskColorMap + #if POPPLER_CHECK_VERSION(0, 12, 0) +- , GBool /*maskInterpolate*/ ++ , bool /*maskInterpolate*/ + #endif + ) + { +--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig 2018-10-30 16:55:21 UTC +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -166,7 +166,11 @@ namespace pdfi +@@ -150,22 +150,22 @@ namespace pdfi + + // Does this device use upside-down coordinates? + // (Upside-down means (0,0) is the top left corner of the page.) +- virtual GBool upsideDown() override { return gTrue; } ++ virtual bool upsideDown() override { return true; } + + // Does this device use drawChar() or drawString()? +- virtual GBool useDrawChar() override { return gTrue; } ++ virtual bool useDrawChar() override { return true; } + + // Does this device use beginType3Char/endType3Char? Otherwise, + // text in Type 3 fonts will be drawn with drawChar/drawString. +- virtual GBool interpretType3Chars() override { return gFalse; } ++ virtual bool interpretType3Chars() override { return false; } + + // Does this device need non-text content? +- virtual GBool needNonText() override { return gTrue; } ++ virtual bool needNonText() override { return true; } + //----- initialization and control // Set default transform matrix. -+#if POPPLER_CHECK_VERSION(0, 70, 0) +- virtual void setDefaultCTM(double *ctm) override; + virtual void setDefaultCTM(const double *ctm) override; -+#else - virtual void setDefaultCTM(double *ctm) override; -+#endif // Start a page. virtual void startPage(int pageNum, GfxState *state --- -2.19.1 - +@@ -232,40 +232,40 @@ namespace pdfi + + //----- image drawing + virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, +- int width, int height, GBool invert, ++ int width, int height, bool invert, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool interpolate, ++ bool interpolate, + #endif +- GBool inlineImg) override; ++ bool inlineImg) override; + virtual void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool interpolate, ++ bool interpolate, + #endif +- int *maskColors, GBool inlineImg) override; ++ int *maskColors, bool inlineImg) override; + virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool interpolate, ++ bool interpolate, + #endif + Stream *maskStr, int maskWidth, int maskHeight, +- GBool maskInvert ++ bool maskInvert + #if POPPLER_CHECK_VERSION(0, 12, 0) +- , GBool maskInterpolate ++ , bool maskInterpolate + #endif + ) override; + virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool interpolate, ++ bool interpolate, + #endif + Stream *maskStr, + int maskWidth, int maskHeight, + GfxImageColorMap *maskColorMap + #if POPPLER_CHECK_VERSION(0, 12, 0) +- , GBool maskInterpolate ++ , bool maskInterpolate + #endif + ) override; + diff --git a/editors/libreoffice/files/patch-archgit_poppler-0.71.patch b/editors/libreoffice/files/patch-archgit_poppler-0.71.patch index 9589dcc36297..8a95132d38ba 100644 --- a/editors/libreoffice/files/patch-archgit_poppler-0.71.patch +++ b/editors/libreoffice/files/patch-archgit_poppler-0.71.patch @@ -1,155 +1,6 @@ -diff -ru sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ---- sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx 2018-11-01 20:43:55.802520387 +0000 -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-11-01 20:44:33.399286879 +0000 -@@ -514,7 +514,7 @@ - PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : - m_pDoc( pDoc ), - m_aFontMap(), -- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ), -+ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), - m_bSkipImages(false) - { - } -@@ -943,11 +943,11 @@ - } - - void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, -- int width, int height, GBool invert, -+ int width, int height, bool invert, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ bool /*interpolate*/, - #endif -- GBool /*inlineImg*/ ) -+ bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -976,9 +976,9 @@ - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ bool /*interpolate*/, - #endif -- int* maskColors, GBool /*inlineImg*/ ) -+ int* maskColors, bool /*inlineImg*/ ) - { - if (m_bSkipImages) - return; -@@ -1027,13 +1027,13 @@ - int width, int height, - GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ bool /*interpolate*/, - #endif - Stream* maskStr, - int maskWidth, int maskHeight, -- GBool maskInvert -+ bool maskInvert - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool /*maskInterpolate*/ -+ , bool /*maskInterpolate*/ - #endif - ) - { -@@ -1049,13 +1049,13 @@ - int width, int height, - GfxImageColorMap* colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool /*interpolate*/, -+ bool /*interpolate*/, - #endif - Stream* maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap* maskColorMap - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool /*maskInterpolate*/ -+ , bool /*maskInterpolate*/ - #endif - ) - { -diff -ru sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ---- sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx 2018-11-01 20:43:55.802520387 +0000 -+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2018-11-01 20:44:33.402620221 +0000 -@@ -151,17 +151,17 @@ - - // Does this device use upside-down coordinates? - // (Upside-down means (0,0) is the top left corner of the page.) -- virtual GBool upsideDown() override { return gTrue; } -+ virtual bool upsideDown() override { return true; } - - // Does this device use drawChar() or drawString()? -- virtual GBool useDrawChar() override { return gTrue; } -+ virtual bool useDrawChar() override { return true; } - - // Does this device use beginType3Char/endType3Char? Otherwise, - // text in Type 3 fonts will be drawn with drawChar/drawString. -- virtual GBool interpretType3Chars() override { return gFalse; } -+ virtual bool interpretType3Chars() override { return false; } - - // Does this device need non-text content? -- virtual GBool needNonText() override { return gTrue; } -+ virtual bool needNonText() override { return true; } - - //----- initialization and control - -@@ -237,40 +237,40 @@ - - //----- image drawing - virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, -- int width, int height, GBool invert, -+ int width, int height, bool invert, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ bool interpolate, - #endif -- GBool inlineImg) override; -+ bool inlineImg) override; - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ bool interpolate, - #endif -- int *maskColors, GBool inlineImg) override; -+ int *maskColors, bool inlineImg) override; - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ bool interpolate, - #endif - Stream *maskStr, int maskWidth, int maskHeight, -- GBool maskInvert -+ bool maskInvert - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool maskInterpolate -+ , bool maskInterpolate - #endif - ) override; - virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, - #if POPPLER_CHECK_VERSION(0, 12, 0) -- GBool interpolate, -+ bool interpolate, - #endif - Stream *maskStr, - int maskWidth, int maskHeight, - GfxImageColorMap *maskColorMap - #if POPPLER_CHECK_VERSION(0, 12, 0) -- , GBool maskInterpolate -+ , bool maskInterpolate - #endif - ) override; - -diff -ru sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ---- sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx 2018-11-01 20:43:55.802520387 +0000 -+++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 2018-11-01 20:44:33.402620221 +0000 -@@ -69,7 +69,7 @@ +--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig 2018-10-30 16:55:21 UTC ++++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -69,7 +69,7 @@ int main(int argc, char **argv) // read config file globalParams = new GlobalParams(); @@ -158,7 +9,7 @@ diff -ru sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx sdext/source/pd #if defined(_MSC_VER) globalParams->setupBaseFonts(nullptr); #endif -@@ -143,7 +143,7 @@ +@@ -143,7 +143,7 @@ int main(int argc, char **argv) i, PDFI_OUTDEV_RESOLUTION, PDFI_OUTDEV_RESOLUTION, @@ -167,4 +18,3 @@ diff -ru sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx sdext/source/pd rDoc.processLinks(&aOutDev, i); } - diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index 9bf4b438b096..df27cb976857 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -196,9 +196,10 @@ MYSQL_USES= mysql SDK_CONFIGURE_ENABLE= odk SDK_DISTFILES= unowinreg.dll:unoreg +# The current version of openoffice is not compatible with the changed API and +# requirements of popller-0.7x. Switch to using bundled version for now. +CONFIGURE_ARGS+= --without-system-poppler PDFIMPORT_CONFIGURE_ENABLE= pdfimport -PDFIMPORT_CONFIGURE_WITH= system-poppler -PDFIMPORT_LIB_DEPENDS= libpoppler.so:graphics/poppler REPORT_BUILDER_BROKEN= REPORT_BUILDER option requires additional .jar files REPORT_BUILDER_CONFIGURE_ENABLE= report-builder diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile index d2865e959cc2..7e0324146f87 100644 --- a/editors/texmaker/Makefile +++ b/editors/texmaker/Makefile @@ -3,7 +3,7 @@ PORTNAME= texmaker PORTVERSION= 4.5 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= http://www.xm1math.net/texmaker/ @@ -33,7 +33,6 @@ OPTIONS_DEFAULT= QT5 TOOLKIT_DESC= Qt toolkit QT4_USES= qt:4 QT4_USE= ${_USE_QT4:S/^/QT=/} -QT4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 QT5_USES= qt:5 QT5_USE= ${_USE_QT5:S/^/QT=/} QT5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile index 7b0bda3828ed..45f751d72ddf 100644 --- a/editors/texstudio/Makefile +++ b/editors/texstudio/Makefile @@ -1,9 +1,8 @@ # $FreeBSD$ PORTNAME= texstudio -DISTVERSION= 2.12.8 +DISTVERSION= 2.12.10 CATEGORIES= editors -PKGNAMESUFFIX= -${FLAVOR} MAINTAINER= abiliojr@gmail.com COMMENT= Integrated writing environment for LaTeX documents @@ -14,36 +13,17 @@ BROKEN_aarch64= fails to compile: error: no member named mc_eip in __mcontext BROKEN_armv6= fails to compile: error: no member named mc_eip in __mcontext LIB_DEPENDS= libhunspell-1.6.so:textproc/hunspell \ - libpoppler.so:graphics/poppler - -FLAVORS= qt5 qt4 -FLAVOR?= ${FLAVORS:[1]} - -qt4_DEPRECATED= Qt4 has been EOL since december 2015 -qt4_EXPIRATION_DATE= 2019-03-15 - -qt4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ - libquazip.so:archivers/quazip@qt4 -qt5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 \ - libquazip5.so:archivers/quazip@qt5 + libpoppler.so:graphics/poppler \ + libpoppler-qt5.so:graphics/poppler-qt5 \ + libquazip5.so:archivers/quazip@qt5 USES= desktop-file-utils dos2unix ghostscript:run \ - pkgconfig qmake - -.if ${FLAVOR} == qt4 -USES+= qt:4 -USE_QT= corelib gui network script svg xml \ - iconengines_run designer_build moc_build rcc_build uic_build -QMAKE_ARGS= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \ - QUAZIP_LIB="-lquazip" -.else -USES+= qt:5 + pkgconfig qmake qt:5 USE_QT = core gui network script svg widgets xml \ printsupport concurrent uitools buildtools_build QMAKE_ARGS= QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \ QUAZIP_LIB="-lquazip5" QTVER_SUFFIX= 5 -.endif USE_XORG= x11 USE_GL= gl diff --git a/editors/texstudio/distinfo b/editors/texstudio/distinfo index 48285746e3cb..427acdd862df 100644 --- a/editors/texstudio/distinfo +++ b/editors/texstudio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523190835 -SHA256 (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 3dec30ded3f36bb0591f8ed1b78b86fa23f276f5744925bc91075715c3f58062 -SIZE (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 26555418 +TIMESTAMP = 1538913866 +SHA256 (texstudio-org-texstudio-2.12.10_GH0.tar.gz) = 92cf9cbb536e58a5929611fa40438cd9d7ea6880022cd3c5de0483fd15d3df0b +SIZE (texstudio-org-texstudio-2.12.10_GH0.tar.gz) = 26770850 diff --git a/editors/texstudio/pkg-plist b/editors/texstudio/pkg-plist index 805aaeef1b47..bc0718b2dff1 100644 --- a/editors/texstudio/pkg-plist +++ b/editors/texstudio/pkg-plist @@ -128,6 +128,8 @@ share/icons/hicolor/scalable/apps/texstudio.svg %%DATADIR%%/texstudio_hu.qm %%DATADIR%%/texstudio_it.qm %%DATADIR%%/texstudio_ja.qm +%%DATADIR%%/texstudio_ko.qm +%%DATADIR%%/texstudio_ko_KR.qm %%DATADIR%%/texstudio_nl.qm %%DATADIR%%/texstudio_pl.qm %%DATADIR%%/texstudio_pt_BR.qm diff --git a/graphics/Makefile b/graphics/Makefile index 5ca7667ac9b9..6b468d6f1f76 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -864,7 +864,6 @@ SUBDIR += poppler SUBDIR += poppler-data SUBDIR += poppler-glib - SUBDIR += poppler-qt4 SUBDIR += poppler-qt5 SUBDIR += poppler-utils SUBDIR += potrace @@ -935,7 +934,6 @@ SUBDIR += py-plotly SUBDIR += py-png SUBDIR += py-poppler - SUBDIR += py-poppler-qt4 SUBDIR += py-pycha SUBDIR += py-pycollada SUBDIR += py-pydot diff --git a/graphics/diff-pdf/Makefile b/graphics/diff-pdf/Makefile index 27d3002c3718..2d2f7b56367a 100644 --- a/graphics/diff-pdf/Makefile +++ b/graphics/diff-pdf/Makefile @@ -4,6 +4,7 @@ PORTNAME= diff-pdf DISTVERSIONPREFIX= v DISTVERSION= 0.2-27 DISTVERSIONSUFFIX= -gc4d6722 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= uzsolt@uzsolt.hu diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index cf01d93fb102..84a8b6b9ba2e 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -3,7 +3,7 @@ PORTNAME= inkscape PORTVERSION= 0.92.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics gnome MASTER_SITES= https://inkscape.org/en/gallery/item/12187/ @@ -82,5 +82,8 @@ USES+= gettext post-patch: @${REINPLACE_CMD} -e 's|COMMAND python|COMMAND ${PYTHON_VERSION}|g' \ ${WRKSRC}/share/*/CMakeLists.txt + # Obtained from Arch Linux + @${REINPLACE_CMD} -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \ + ${WRKSRC}/src/extension/internal/pdfinput/pdf-parser.* .include <bsd.port.mk> diff --git a/graphics/inkscape/files/patch-CMakeScripts_Pod2man.cmake b/graphics/inkscape/files/patch-CMakeScripts_Pod2man.cmake index 444de6438b1a..99e053ddb697 100644 --- a/graphics/inkscape/files/patch-CMakeScripts_Pod2man.cmake +++ b/graphics/inkscape/files/patch-CMakeScripts_Pod2man.cmake @@ -1,6 +1,6 @@ ---- CMakeScripts/Pod2man.cmake.orig 2017-01-06 16:19:54.351838000 +0100 -+++ CMakeScripts/Pod2man.cmake 2017-01-06 16:20:26.957487000 +0100 -@@ -48,7 +48,7 @@ +--- CMakeScripts/Pod2man.cmake.orig 2018-03-11 20:38:09 UTC ++++ CMakeScripts/Pod2man.cmake +@@ -48,7 +48,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER) ) install( FILES ${MANFILE_FULL} diff --git a/graphics/inkscape/files/patch-archgit_bee18ea b/graphics/inkscape/files/patch-archgit_bee18ea new file mode 100644 index 000000000000..e5554ecbfe4e --- /dev/null +++ b/graphics/inkscape/files/patch-archgit_bee18ea @@ -0,0 +1,1156 @@ +--- CMakeScripts/DefineDependsandFlags.cmake.orig 2018-03-11 20:38:09 UTC ++++ CMakeScripts/DefineDependsandFlags.cmake +@@ -116,18 +116,6 @@ if(ENABLE_POPPLER) + set(HAVE_POPPLER_GLIB ON) + endif() + endif() +- if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR +- POPPLER_VERSION VERSION_EQUAL "0.26.0") +- set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON) +- endif() +- if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR +- POPPLER_VERSION VERSION_EQUAL "0.29.0") +- set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON) +- endif() +- if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR +- POPPLER_VERSION VERSION_EQUAL "0.58.0") +- set(POPPLER_NEW_OBJECT_API ON) +- endif() + else() + set(ENABLE_POPPLER_CAIRO OFF) + endif() +--- src/extension/internal/pdfinput/pdf-input.cpp.orig 2018-03-11 20:38:09 UTC ++++ src/extension/internal/pdfinput/pdf-input.cpp +@@ -319,7 +319,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gc + _render_thumb = true; + + // Create PopplerDocument +- Glib::ustring filename = _pdf_doc->getFileName()->getCString(); ++ Glib::ustring filename = _pdf_doc->getFileName()->c_str(); + if (!Glib::path_is_absolute(filename)) { + filename = Glib::build_filename(Glib::get_current_dir(),filename); + } +@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, + dlg->getImportSettings(prefs); + + // Apply crop settings +- PDFRectangle *clipToBox = NULL; ++ _POPPLER_CONST PDFRectangle *clipToBox = NULL; + double crop_setting; + sp_repr_get_double(prefs, "cropTo", &crop_setting); + +--- src/extension/internal/pdfinput/pdf-input.h.orig 2018-03-11 20:38:09 UTC ++++ src/extension/internal/pdfinput/pdf-input.h +@@ -15,6 +15,7 @@ + #endif + + #ifdef HAVE_POPPLER ++#include "poppler-transition-api.h" + + #include <gtkmm/dialog.h> + +--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2018-03-11 20:38:09 UTC ++++ src/extension/internal/pdfinput/pdf-parser.cpp +@@ -38,7 +38,6 @@ extern "C" { + + #include "goo/gmem.h" + #include "goo/GooTimer.h" +-#include "goo/GooHash.h" + #include "GlobalParams.h" + #include "CharTypes.h" + #include "Object.h" +@@ -271,7 +270,7 @@ class ClipHistoryEntry { (public) + // Manipulate clip path stack + ClipHistoryEntry *save(); + ClipHistoryEntry *restore(); +- GBool hasSaves() { return saved != NULL; } ++ bool hasSaves() { return saved != NULL; } + void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); + GfxPath *getClipPath() { return clipPath; } + GfxClipType getClipType() { return clipType; } +@@ -295,15 +294,15 @@ PdfParser::PdfParser(XRef *xrefA, + int /*pageNum*/, + int rotate, + Dict *resDict, +- PDFRectangle *box, +- PDFRectangle *cropBox) : ++ _POPPLER_CONST PDFRectangle *box, ++ _POPPLER_CONST PDFRectangle *cropBox) : + xref(xrefA), + builder(builderA), +- subPage(gFalse), ++ subPage(false), + printCommands(false), + res(new GfxResources(xref, resDict, NULL)), // start the resource stack +- state(new GfxState(72.0, 72.0, box, rotate, gTrue)), +- fontChanged(gFalse), ++ state(new GfxState(72.0, 72.0, box, rotate, true)), ++ fontChanged(false), + clip(clipNone), + ignoreUndef(0), + baseMatrix(), +@@ -318,7 +317,7 @@ PdfParser::PdfParser(XRef *xrefA, + builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"), + Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px")); + +- double *ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + double scaledCTM[6]; + for (int i = 0; i < 6; ++i) { + baseMatrix[i] = ctm[i]; +@@ -353,14 +352,14 @@ PdfParser::PdfParser(XRef *xrefA, + PdfParser::PdfParser(XRef *xrefA, + Inkscape::Extension::Internal::SvgBuilder *builderA, + Dict *resDict, +- PDFRectangle *box) : ++ _POPPLER_CONST PDFRectangle *box) : + xref(xrefA), + builder(builderA), +- subPage(gTrue), ++ subPage(true), + printCommands(false), + res(new GfxResources(xref, resDict, NULL)), // start the resource stack +- state(new GfxState(72, 72, box, 0, gFalse)), +- fontChanged(gFalse), ++ state(new GfxState(72, 72, box, 0, false)), ++ fontChanged(false), + clip(clipNone), + ignoreUndef(0), + baseMatrix(), +@@ -409,7 +408,7 @@ PdfParser::~PdfParser() { + } + } + +-void PdfParser::parse(Object *obj, GBool topLevel) { ++void PdfParser::parse(Object *obj, bool topLevel) { + Object obj2; + + if (obj->isArray()) { +@@ -434,13 +433,13 @@ void PdfParser::parse(Object *obj, GBool topLevel) { + error(errInternal, -1, "Weird page contents"); + return; + } +- parser = new Parser(xref, new Lexer(xref, obj), gFalse); ++ parser = new Parser(xref, new Lexer(xref, obj), false); + go(topLevel); + delete parser; + parser = NULL; + } + +-void PdfParser::go(GBool /*topLevel*/) ++void PdfParser::go(bool /*topLevel*/) + { + Object obj; + Object args[maxArgs]; +@@ -572,7 +571,7 @@ const char *PdfParser::getPreviousOperator(unsigned in + + void PdfParser::execOp(Object *cmd, Object args[], int numArgs) { + PdfOperator *op; +- char *name; ++ const char *name; + Object *argPtr; + int i; + +@@ -620,7 +619,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int + (this->*op->func)(argPtr, numArgs); + } + +-PdfOperator* PdfParser::findOp(char *name) { ++PdfOperator* PdfParser::findOp(const char *name) { + int a = -1; + int b = numOps; + int cmp = -1; +@@ -640,7 +639,7 @@ PdfOperator* PdfParser::findOp(char *name) { + return &opTab[a]; + } + +-GBool PdfParser::checkArg(Object *arg, TchkType type) { ++bool PdfParser::checkArg(Object *arg, TchkType type) { + switch (type) { + case tchkBool: return arg->isBool(); + case tchkInt: return arg->isInt(); +@@ -650,9 +649,9 @@ GBool PdfParser::checkArg(Object *arg, TchkType type) + case tchkArray: return arg->isArray(); + case tchkProps: return arg->isDict() || arg->isName(); + case tchkSCN: return arg->isNum() || arg->isName(); +- case tchkNone: return gFalse; ++ case tchkNone: return false; + } +- return gFalse; ++ return false; + } + + int PdfParser::getPos() { +@@ -707,7 +706,7 @@ void PdfParser::opConcat(Object args[], int /*numArgs* + builder->pushGroup(); + builder->setTransform(a0, a1, a2, a3, a4, a5); + } +- fontChanged = gTrue; ++ fontChanged = true; + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -773,8 +772,8 @@ void PdfParser::opSetExtGState(Object args[], int /*nu + Object obj1, obj2, obj3, obj4, obj5; + Function *funcs[4] = {0, 0, 0, 0}; + GfxColor backdropColor; +- GBool haveBackdropColor = gFalse; +- GBool alpha = gFalse; ++ bool haveBackdropColor = false; ++ bool alpha = false; + + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = res->lookupGState(args[0].getName())).isNull()) { +@@ -830,7 +829,7 @@ void PdfParser::opSetExtGState(Object args[], int /*nu + #endif + + // fill/stroke overprint +- GBool haveFillOP = gFalse; ++ bool haveFillOP = false; + #if defined(POPPLER_NEW_OBJECT_API) + if ((haveFillOP = (obj2 = obj1.dictLookup(const_cast<char*>("op"))).isBool())) { + #else +@@ -925,9 +924,9 @@ void PdfParser::opSetExtGState(Object args[], int /*nu + #else + if (obj2.dictLookup(const_cast<char*>("S"), &obj3)->isName(const_cast<char*>("Alpha"))) { + #endif +- alpha = gTrue; ++ alpha = true; + } else { // "Luminosity" +- alpha = gFalse; ++ alpha = false; + } + #if !defined(POPPLER_NEW_OBJECT_API) + obj3.free(); +@@ -978,8 +977,8 @@ void PdfParser::opSetExtGState(Object args[], int /*nu + if (obj3.streamGetDict()->lookup(const_cast<char*>("Group"), &obj4)->isDict()) { + #endif + GfxColorSpace *blendingColorSpace = 0; +- GBool isolated = gFalse; +- GBool knockout = gFalse; ++ bool isolated = false; ++ bool knockout = false; + #if defined(POPPLER_NEW_OBJECT_API) + if (!((obj5 = obj4.dictLookup(const_cast<char*>("CS"))).isNull())) { + #else +@@ -1050,9 +1049,9 @@ void PdfParser::opSetExtGState(Object args[], int /*nu + #endif + } + +-void PdfParser::doSoftMask(Object *str, GBool alpha, ++void PdfParser::doSoftMask(Object *str, bool alpha, + GfxColorSpace *blendingColorSpace, +- GBool isolated, GBool knockout, ++ bool isolated, bool knockout, + Function *transferFunc, GfxColor *backdropColor) { + Dict *dict, *resDict; + double m[6], bbox[4]; +@@ -1145,7 +1144,7 @@ void PdfParser::doSoftMask(Object *str, GBool alpha, + + // draw it + ++formDepth; +- doForm1(str, resDict, m, bbox, gTrue, gTrue, ++ doForm1(str, resDict, m, bbox, true, true, + blendingColorSpace, isolated, knockout, + alpha, transferFunc, backdropColor); + --formDepth; +@@ -1615,7 +1614,7 @@ void PdfParser::opFill(Object /*args*/[], int /*numArg + if (state->isPath()) { + if (state->getFillColorSpace()->getMode() == csPattern && + !builder->isPatternTypeSupported(state->getFillPattern())) { +- doPatternFillFallback(gFalse); ++ doPatternFillFallback(false); + } else { + builder->addPath(state, true, false); + } +@@ -1632,7 +1631,7 @@ void PdfParser::opEOFill(Object /*args*/[], int /*numA + if (state->isPath()) { + if (state->getFillColorSpace()->getMode() == csPattern && + !builder->isPatternTypeSupported(state->getFillPattern())) { +- doPatternFillFallback(gTrue); ++ doPatternFillFallback(true); + } else { + builder->addPath(state, true, false, true); + } +@@ -1647,7 +1646,7 @@ void PdfParser::opFillStroke(Object /*args*/[], int /* + return; + } + if (state->isPath()) { +- doFillAndStroke(gFalse); ++ doFillAndStroke(false); + } else { + builder->addPath(state, true, true); + } +@@ -1662,7 +1661,7 @@ void PdfParser::opCloseFillStroke(Object /*args*/[], i + } + if (state->isPath()) { + state->closePath(); +- doFillAndStroke(gFalse); ++ doFillAndStroke(false); + } + doEndPath(); + } +@@ -1674,7 +1673,7 @@ void PdfParser::opEOFillStroke(Object /*args*/[], int + return; + } + if (state->isPath()) { +- doFillAndStroke(gTrue); ++ doFillAndStroke(true); + } + doEndPath(); + } +@@ -1687,20 +1686,20 @@ void PdfParser::opCloseEOFillStroke(Object /*args*/[], + } + if (state->isPath()) { + state->closePath(); +- doFillAndStroke(gTrue); ++ doFillAndStroke(true); + } + doEndPath(); + } + +-void PdfParser::doFillAndStroke(GBool eoFill) { +- GBool fillOk = gTrue, strokeOk = gTrue; ++void PdfParser::doFillAndStroke(bool eoFill) { ++ bool fillOk = true, strokeOk = true; + if (state->getFillColorSpace()->getMode() == csPattern && + !builder->isPatternTypeSupported(state->getFillPattern())) { +- fillOk = gFalse; ++ fillOk = false; + } + if (state->getStrokeColorSpace()->getMode() == csPattern && + !builder->isPatternTypeSupported(state->getStrokePattern())) { +- strokeOk = gFalse; ++ strokeOk = false; + } + if (fillOk && strokeOk) { + builder->addPath(state, true, true, eoFill); +@@ -1710,7 +1709,7 @@ void PdfParser::doFillAndStroke(GBool eoFill) { + } + } + +-void PdfParser::doPatternFillFallback(GBool eoFill) { ++void PdfParser::doPatternFillFallback(bool eoFill) { + GfxPattern *pattern; + + if (!(pattern = state->getFillPattern())) { +@@ -1720,7 +1719,7 @@ void PdfParser::doPatternFillFallback(GBool eoFill) { + case 1: + break; + case 2: +- doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), gFalse, eoFill); ++ doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), false, eoFill); + break; + default: + error(errUnimplemented, getPos(), "Unimplemented pattern type (%d) in fill", +@@ -1739,7 +1738,7 @@ void PdfParser::doPatternStrokeFallback() { + case 1: + break; + case 2: +- doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), gTrue, gFalse); ++ doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), true, false); + break; + default: + error(errUnimplemented, getPos(), "Unimplemented pattern type ({0:d}) in stroke", +@@ -1749,10 +1748,10 @@ void PdfParser::doPatternStrokeFallback() { + } + + void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat, +- GBool stroke, GBool eoFill) { ++ bool stroke, bool eoFill) { + GfxShading *shading; + GfxPath *savedPath; +- double *ctm, *btm, *ptm; ++ const double *ctm, *btm, *ptm; + double m[6], ictm[6], m1[6]; + double xMin, yMin, xMax, yMax; + double det; +@@ -1863,7 +1862,7 @@ void PdfParser::opShFill(Object args[], int /*numArgs* + double xTemp, yTemp; + double gradientTransform[6]; + double *matrix = NULL; +- GBool savedState = gFalse; ++ bool savedState = false; + + #if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) + if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { +@@ -1879,13 +1878,13 @@ void PdfParser::opShFill(Object args[], int /*numArgs* + if (shading->getType() != 2 && shading->getType() != 3) { + savedPath = state->getPath()->copy(); + saveState(); +- savedState = gTrue; ++ savedState = true; + } else { // get gradient transform if possible + // check proper operator sequence + // first there should be one W(*) and then one 'cm' somewhere before 'sh' +- GBool seenClip, seenConcat; ++ bool seenClip, seenConcat; + seenClip = (clipHistory->getClipPath() != NULL); +- seenConcat = gFalse; ++ seenConcat = false; + int i = 1; + while (i <= maxOperatorHistoryDepth) { + const char *opName = getPreviousOperator(i); +@@ -1893,7 +1892,7 @@ void PdfParser::opShFill(Object args[], int /*numArgs* + if (seenConcat) { // more than one 'cm' + break; + } else { +- seenConcat = gTrue; ++ seenConcat = true; + } + } + i++; +@@ -1994,7 +1993,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading * + GfxColor color0M, color1M, colorM0, colorM1, colorMM; + GfxColor colors2[4]; + double functionColorDelta = colorDeltas[pdfFunctionShading-1]; +- double *matrix; ++ const double *matrix; + double xM, yM; + int nComps, i, j; + +@@ -2174,7 +2173,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading + } + } + +-void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) { ++void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) { + GfxPatch patch00 = blankPatch(); + GfxPatch patch01 = blankPatch(); + GfxPatch patch10 = blankPatch(); +@@ -2348,7 +2347,7 @@ void PdfParser::opBeginText(Object /*args*/[], int /*n + state->setTextMat(1, 0, 0, 1, 0, 0); + state->textMoveTo(0, 0); + builder->updateTextPosition(0.0, 0.0); +- fontChanged = gTrue; ++ fontChanged = true; + builder->beginTextObject(state); + } + +@@ -2376,20 +2375,20 @@ void PdfParser::opSetFont(Object args[], int /*numArgs + // unsetting the font (drawing no text) is better than using the + // previous one and drawing random glyphs from it + state->setFont(NULL, args[1].getNum()); +- fontChanged = gTrue; ++ fontChanged = true; + return; + } + if (printCommands) { + printf(" font: tag=%s name='%s' %g\n", +- font->getTag()->getCString(), +- font->getName() ? font->getName()->getCString() : "???", ++ font->getTag()->c_str(), ++ font->getName() ? font->getName()->c_str() : "???", + args[1].getNum()); + fflush(stdout); + } + + font->incRefCnt(); + state->setFont(font, args[1].getNum()); +- fontChanged = gTrue; ++ fontChanged = true; + } + + // TODO not good that numArgs is ignored but args[] is used: +@@ -2422,7 +2421,7 @@ void PdfParser::opSetHorizScaling(Object args[], int / + { + state->setHorizScaling(args[0].getNum()); + builder->updateTextMatrix(state); +- fontChanged = gTrue; ++ fontChanged = true; + } + + //------------------------------------------------------------------------ +@@ -2462,7 +2461,7 @@ void PdfParser::opSetTextMatrix(Object args[], int /*n + state->textMoveTo(0, 0); + builder->updateTextMatrix(state); + builder->updateTextPosition(0.0, 0.0); +- fontChanged = gTrue; ++ fontChanged = true; + } + + void PdfParser::opTextNextLine(Object /*args*/[], int /*numArgs*/) +@@ -2488,7 +2487,7 @@ void PdfParser::opShowText(Object args[], int /*numArg + } + if (fontChanged) { + builder->updateFont(state); +- fontChanged = gFalse; ++ fontChanged = false; + } + doShowText(args[0].getString()); + } +@@ -2505,7 +2504,7 @@ void PdfParser::opMoveShowText(Object args[], int /*nu + } + if (fontChanged) { + builder->updateFont(state); +- fontChanged = gFalse; ++ fontChanged = false; + } + tx = state->getLineX(); + ty = state->getLineY() - state->getLeading(); +@@ -2526,7 +2525,7 @@ void PdfParser::opMoveSetShowText(Object args[], int / + } + if (fontChanged) { + builder->updateFont(state); +- fontChanged = gFalse; ++ fontChanged = false; + } + state->setWordSpace(args[0].getNum()); + state->setCharSpace(args[1].getNum()); +@@ -2550,7 +2549,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*n + } + if (fontChanged) { + builder->updateFont(state); +- fontChanged = gFalse; ++ fontChanged = false; + } + wMode = state->getFont()->getWMode(); + a = args[0].getArray(); +@@ -2582,7 +2581,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*n + } + } + +-void PdfParser::doShowText(GooString *s) { ++void PdfParser::doShowText(const GooString *s) { + GfxFont *font; + int wMode; + double riseX, riseY; +@@ -2591,11 +2590,11 @@ void PdfParser::doShowText(GooString *s) { + double x, y, dx, dy, tdx, tdy; + double originX, originY, tOriginX, tOriginY; + double oldCTM[6], newCTM[6]; +- double *mat; ++ const double *mat; + Object charProc; + Dict *resDict; + Parser *oldParser; +- char *p; ++ const char *p; + int len, n, uLen; + + font = state->getFont(); +@@ -2631,7 +2630,7 @@ void PdfParser::doShowText(GooString *s) { + double lineX = state->getLineX(); + double lineY = state->getLineY(); + oldParser = parser; +- p = s->getCString(); ++ p = s->c_str(); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2660,7 +2659,7 @@ void PdfParser::doShowText(GooString *s) { + pushResources(resDict); + } + if (charProc.isStream()) { +- //parse(&charProc, gFalse); // TODO: parse into SVG font ++ //parse(&charProc, false); // TODO: parse into SVG font + } else { + error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry"); + } +@@ -2686,7 +2685,7 @@ void PdfParser::doShowText(GooString *s) { + + } else { + state->textTransformDelta(0, state->getRise(), &riseX, &riseY); +- p = s->getCString(); ++ p = s->c_str(); + len = s->getLength(); + while (len > 0) { + n = font->getNextChar(p, len, &code, +@@ -2732,7 +2731,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs + { + Object obj1, obj2, obj3, refObj; + +- char *name = args[0].getName(); ++ const char *name = args[0].getName(); + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = res->lookupXObject(name)).isNull()) { + #else +@@ -2758,7 +2757,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs + #else + res->lookupXObjectNF(name, &refObj); + #endif +- doImage(&refObj, obj1.getStream(), gFalse); ++ doImage(&refObj, obj1.getStream(), false); + #if !defined(POPPLER_NEW_OBJECT_API) + refObj.free(); + #endif +@@ -2783,19 +2782,19 @@ void PdfParser::opXObject(Object args[], int /*numArgs + #endif + } + +-void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg) ++void PdfParser::doImage(Object * /*ref*/, Stream *str, bool inlineImg) + { + Dict *dict; + int width, height; + int bits; +- GBool interpolate; ++ bool interpolate; + StreamColorSpaceMode csMode; +- GBool mask; +- GBool invert; ++ bool mask; ++ bool invert; + Object maskObj, smaskObj; +- GBool haveColorKeyMask, haveExplicitMask, haveSoftMask; +- GBool maskInvert; +- GBool maskInterpolate; ++ bool haveColorKeyMask, haveExplicitMask, haveSoftMask; ++ bool maskInvert; ++ bool maskInterpolate; + Object obj1, obj2; + + // get info from the stream +@@ -2873,11 +2872,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + if (obj1.isBool()) + interpolate = obj1.getBool(); + else +- interpolate = gFalse; ++ interpolate = false; + #if !defined(POPPLER_NEW_OBJECT_API) + obj1.free(); + #endif +- maskInterpolate = gFalse; ++ maskInterpolate = false; + + // image or mask? + #if defined(POPPLER_NEW_OBJECT_API) +@@ -2893,7 +2892,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + dict->lookup(const_cast<char*>("IM"), &obj1); + #endif + } +- mask = gFalse; ++ mask = false; + if (obj1.isBool()) { + mask = obj1.getBool(); + } +@@ -2937,7 +2936,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + if (bits != 1) { + goto err1; + } +- invert = gFalse; ++ invert = false; + #if defined(POPPLER_NEW_OBJECT_API) + obj1 = dict->lookup(const_cast<char*>("Decode")); + #else +@@ -2958,7 +2957,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + obj1.arrayGet(0, &obj2); + #endif + if (obj2.isInt() && obj2.getInt() == 1) { +- invert = gTrue; ++ invert = true; + } + #if !defined(POPPLER_NEW_OBJECT_API) + obj2.free(); +@@ -3055,11 +3054,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + + // get the mask + int maskColors[2*gfxColorMaxComps]; +- haveColorKeyMask = haveExplicitMask = haveSoftMask = gFalse; ++ haveColorKeyMask = haveExplicitMask = haveSoftMask = false; + Stream *maskStr = NULL; + int maskWidth = 0; + int maskHeight = 0; +- maskInvert = gFalse; ++ maskInvert = false; + GfxImageColorMap *maskColorMap = NULL; + #if defined(POPPLER_NEW_OBJECT_API) + maskObj = dict->lookup(const_cast<char*>("Mask")); +@@ -3146,7 +3145,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + if (obj1.isBool()) + maskInterpolate = obj1.getBool(); + else +- maskInterpolate = gFalse; ++ maskInterpolate = false; + #if defined(POPPLER_NEW_OBJECT_API) + obj1 = maskDict->lookup(const_cast<char*>("ColorSpace")); + #else +@@ -3215,7 +3214,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + goto err1; + } + //~ handle the Matte entry +- haveSoftMask = gTrue; ++ haveSoftMask = true; + } else if (maskObj.isArray()) { + // color key mask + int i; +@@ -3230,7 +3229,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + obj1.free(); + #endif + } +- haveColorKeyMask = gTrue; ++ haveColorKeyMask = true; + } else if (maskObj.isStream()) { + // explicit mask + if (inlineImg) { +@@ -3307,11 +3306,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + if (obj1.isBool()) + maskInterpolate = obj1.getBool(); + else +- maskInterpolate = gFalse; ++ maskInterpolate = false; + #if !defined(POPPLER_NEW_OBJECT_API) + obj1.free(); + #endif +- maskInvert = gFalse; ++ maskInvert = false; + #if defined(POPPLER_NEW_OBJECT_API) + obj1 = maskDict->lookup(const_cast<char*>("Decode")); + #else +@@ -3332,7 +3331,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + obj1.arrayGet(0, &obj2); + #endif + if (obj2.isInt() && obj2.getInt() == 1) { +- maskInvert = gTrue; ++ maskInvert = true; + } + #if !defined(POPPLER_NEW_OBJECT_API) + obj2.free(); +@@ -3343,7 +3342,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + #if !defined(POPPLER_NEW_OBJECT_API) + obj1.free(); + #endif +- haveExplicitMask = gTrue; ++ haveExplicitMask = true; + } + + // draw it +@@ -3378,7 +3377,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str, + + void PdfParser::doForm(Object *str) { + Dict *dict; +- GBool transpGroup, isolated, knockout; ++ bool transpGroup, isolated, knockout; + GfxColorSpace *blendingColorSpace; + Object matrixObj, bboxObj; + double m[6], bbox[4]; +@@ -3472,7 +3471,7 @@ void PdfParser::doForm(Object *str) { + resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL; + + // check for a transparency group +- transpGroup = isolated = knockout = gFalse; ++ transpGroup = isolated = knockout = false; + blendingColorSpace = NULL; + #if defined(POPPLER_NEW_OBJECT_API) + if ((obj1 = dict->lookup(const_cast<char*>("Group"))).isDict()) { +@@ -3481,7 +3480,7 @@ void PdfParser::doForm(Object *str) { + if (dict->lookup(const_cast<char*>("Group"), &obj1)->isDict()) { + if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) { + #endif +- transpGroup = gTrue; ++ transpGroup = true; + #if defined(POPPLER_NEW_OBJECT_API) + if (!((obj3 = obj1.dictLookup(const_cast<char*>("CS"))).isNull())) { + #else +@@ -3525,7 +3524,7 @@ void PdfParser::doForm(Object *str) { + // draw it + ++formDepth; + doForm1(str, resDict, m, bbox, +- transpGroup, gFalse, blendingColorSpace, isolated, knockout); ++ transpGroup, false, blendingColorSpace, isolated, knockout); + --formDepth; + + if (blendingColorSpace) { +@@ -3537,10 +3536,10 @@ void PdfParser::doForm(Object *str) { + } + + void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, +- GBool transpGroup, GBool softMask, ++ bool transpGroup, bool softMask, + GfxColorSpace *blendingColorSpace, +- GBool isolated, GBool knockout, +- GBool alpha, Function *transferFunc, ++ bool isolated, bool knockout, ++ bool alpha, Function *transferFunc, + GfxColor *backdropColor) { + Parser *oldParser; + double oldBaseMatrix[6]; +@@ -3601,7 +3600,7 @@ void PdfParser::doForm1(Object *str, Dict *resDict, do + } + + // draw the form +- parse(str, gFalse); ++ parse(str, false); + + // restore base matrix + for (i = 0; i < 6; ++i) { +@@ -3641,7 +3640,7 @@ void PdfParser::opBeginImage(Object /*args*/[], int /* + + // display the image + if (str) { +- doImage(NULL, str, gTrue); ++ doImage(NULL, str, true); + + // skip 'EI' tag + int c1 = str->getUndecodedStream()->getChar(); +@@ -3657,7 +3656,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /* + Stream *PdfParser::buildImageStream() { + Object dict; + Object obj; +- char *key; + Stream *str; + + // build dictionary +@@ -3675,26 +3673,17 @@ Stream *PdfParser::buildImageStream() { + obj.free(); + #endif + } else { +- key = copyString(obj.getName()); +-#if defined(POPPLER_NEW_OBJECT_API) +- obj = parser->getObj(); +-#else +- obj.free(); +- parser->getObj(&obj); +-#endif +- if (obj.isEOF() || obj.isError()) { +- gfree(key); ++ Object obj2; ++ _POPPLER_CALL(obj2, parser->getObj); ++ if (obj2.isEOF() || obj2.isError()) { ++ _POPPLER_FREE(obj); + break; + } +-#if defined(POPPLER_NEW_OBJECT_API) +- dict.dictAdd(key, std::move(obj)); ++ _POPPLER_DICTADD(dict, obj.getName(), obj2); ++ _POPPLER_FREE(obj); ++ _POPPLER_FREE(obj2); + } +- obj = parser->getObj(); +-#else +- dict.dictAdd(key, &obj); +- } +- parser->getObj(&obj); +-#endif ++ _POPPLER_CALL(obj, parser->getObj); + } + if (obj.isEOF()) { + error(errSyntaxError, getPos(), "End of file in inline image"); +@@ -3710,10 +3699,10 @@ Stream *PdfParser::buildImageStream() { + + // make stream + #if defined(POPPLER_NEW_OBJECT_API) +- str = new EmbedStream(parser->getStream(), dict.copy(), gFalse, 0); ++ str = new EmbedStream(parser->getStream(), dict.copy(), false, 0); + str = str->addFilters(dict.getDict()); + #else +- str = new EmbedStream(parser->getStream(), &dict, gFalse, 0); ++ str = new EmbedStream(parser->getStream(), &dict, false, 0); + str = str->addFilters(&dict); + #endif + +--- src/extension/internal/pdfinput/pdf-parser.h.orig 2018-03-11 20:38:09 UTC ++++ src/extension/internal/pdfinput/pdf-parser.h +@@ -9,6 +9,7 @@ + #define PDF_PARSER_H + + #ifdef HAVE_POPPLER ++#include "poppler-transition-api.h" + + #ifdef USE_GCC_PRAGMAS + #pragma interface +@@ -96,7 +97,7 @@ struct PdfOperator { + struct OpHistoryEntry { + const char *name; // operator's name + GfxState *state; // saved state, NULL if none +- GBool executed; // whether the operator has been executed ++ bool executed; // whether the operator has been executed + + OpHistoryEntry *next; // next entry on stack + unsigned depth; // total number of entries descending from this +@@ -127,16 +128,19 @@ class PdfParser { (public) + + // Constructor for regular output. + PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate, +- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox); ++ Dict *resDict, ++ _POPPLER_CONST PDFRectangle *box, ++ _POPPLER_CONST PDFRectangle *cropBox); + + // Constructor for a sub-page object. + PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA, +- Dict *resDict, PDFRectangle *box); ++ Dict *resDict, ++ _POPPLER_CONST PDFRectangle *box); + + virtual ~PdfParser(); + + // Interpret a stream or array of streams. +- void parse(Object *obj, GBool topLevel = gTrue); ++ void parse(Object *obj, bool topLevel = true); + + // Save graphics state. + void saveState(); +@@ -154,12 +158,12 @@ class PdfParser { (public) + + XRef *xref; // the xref table for this PDF file + SvgBuilder *builder; // SVG generator +- GBool subPage; // is this a sub-page object? +- GBool printCommands; // print the drawing commands (for debugging) ++ bool subPage; // is this a sub-page object? ++ bool printCommands; // print the drawing commands (for debugging) + GfxResources *res; // resource stack + + GfxState *state; // current graphics state +- GBool fontChanged; // set if font or text matrix has changed ++ bool fontChanged; // set if font or text matrix has changed + GfxClipType clip; // do a clip? + int ignoreUndef; // current BX/EX nesting level + double baseMatrix[6]; // default matrix for most recent +@@ -183,10 +187,10 @@ class PdfParser { (public) + OpHistoryEntry *popOperator(); + const char *getPreviousOperator(unsigned int look_back=1); // returns the nth previous operator's name + +- void go(GBool topLevel); ++ void go(bool topLevel); + void execOp(Object *cmd, Object args[], int numArgs); +- PdfOperator *findOp(char *name); +- GBool checkArg(Object *arg, TchkType type); ++ PdfOperator *findOp(const char *name); ++ bool checkArg(Object *arg, TchkType type); + int getPos(); + + // graphics state operators +@@ -200,9 +204,9 @@ class PdfParser { (public) + void opSetMiterLimit(Object args[], int numArgs); + void opSetLineWidth(Object args[], int numArgs); + void opSetExtGState(Object args[], int numArgs); +- void doSoftMask(Object *str, GBool alpha, ++ void doSoftMask(Object *str, bool alpha, + GfxColorSpace *blendingColorSpace, +- GBool isolated, GBool knockout, ++ bool isolated, bool knockout, + Function *transferFunc, GfxColor *backdropColor); + void opSetRenderingIntent(Object args[], int numArgs); + +@@ -239,11 +243,11 @@ class PdfParser { (public) + void opCloseFillStroke(Object args[], int numArgs); + void opEOFillStroke(Object args[], int numArgs); + void opCloseEOFillStroke(Object args[], int numArgs); +- void doFillAndStroke(GBool eoFill); +- void doPatternFillFallback(GBool eoFill); ++ void doFillAndStroke(bool eoFill); ++ void doPatternFillFallback(bool eoFill); + void doPatternStrokeFallback(); + void doShadingPatternFillFallback(GfxShadingPattern *sPat, +- GBool stroke, GBool eoFill); ++ bool stroke, bool eoFill); + void opShFill(Object args[], int numArgs); + void doFunctionShFill(GfxFunctionShading *shading); + void doFunctionShFill1(GfxFunctionShading *shading, +@@ -256,7 +260,7 @@ class PdfParser { (public) + double x2, double y2, GfxColor *color2, + int nComps, int depth); + void doPatchMeshShFill(GfxPatchMeshShading *shading); +- void fillPatch(GfxPatch *patch, int nComps, int depth); ++ void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth); + void doEndPath(); + + // path clipping operators +@@ -287,17 +291,17 @@ class PdfParser { (public) + void opMoveShowText(Object args[], int numArgs); + void opMoveSetShowText(Object args[], int numArgs); + void opShowSpaceText(Object args[], int numArgs); +- void doShowText(GooString *s); ++ void doShowText(const GooString *s); + + // XObject operators + void opXObject(Object args[], int numArgs); +- void doImage(Object *ref, Stream *str, GBool inlineImg); ++ void doImage(Object *ref, Stream *str, bool inlineImg); + void doForm(Object *str); + void doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, +- GBool transpGroup = gFalse, GBool softMask = gFalse, ++ bool transpGroup = false, bool softMask = false, + GfxColorSpace *blendingColorSpace = NULL, +- GBool isolated = gFalse, GBool knockout = gFalse, +- GBool alpha = gFalse, Function *transferFunc = NULL, ++ bool isolated = false, bool knockout = false, ++ bool alpha = false, Function *transferFunc = NULL, + GfxColor *backdropColor = NULL); + + // in-line image operators +--- src/extension/internal/pdfinput/poppler-transition-api.h.orig 2018-12-09 09:09:13 UTC ++++ src/extension/internal/pdfinput/poppler-transition-api.h +@@ -0,0 +1,39 @@ ++#ifndef SEEN_POPPLER_TRANSITION_API_H ++#define SEEN_POPPLER_TRANSITION_API_H ++ ++#include <glib/poppler-features.h> ++ ++#if POPPLER_CHECK_VERSION(0,70,0) ++#define _POPPLER_CONST const ++#else ++#define _POPPLER_CONST ++#endif ++ ++#if POPPLER_CHECK_VERSION(0,69,0) ++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj)) ++#elif POPPLER_CHECK_VERSION(0,58,0) ++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj)) ++#else ++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj) ++#endif ++ ++#if POPPLER_CHECK_VERSION(0,58,0) ++#define POPPLER_NEW_OBJECT_API ++#define _POPPLER_FREE(obj) ++#define _POPPLER_CALL(ret, func) (ret = func()) ++#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__)) ++#else ++#define _POPPLER_FREE(obj) (obj).free() ++#define _POPPLER_CALL(ret, func) (*func(&ret)) ++#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret)) ++#endif ++ ++#if POPPLER_CHECK_VERSION(0, 29, 0) ++#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ++#endif ++ ++#if POPPLER_CHECK_VERSION(0, 25, 0) ++#define POPPLER_EVEN_NEWER_COLOR_SPACE_API ++#endif ++ ++#endif +--- src/extension/internal/pdfinput/svg-builder.cpp.orig 2018-03-11 20:38:09 UTC ++++ src/extension/internal/pdfinput/svg-builder.cpp +@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, + if ( pattern != NULL ) { + if ( pattern->getType() == 2 ) { // Shading pattern + GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern); +- double *ptm; ++ const double *ptm; + double m[6] = {1, 0, 0, 1, 0, 0}; + double det; + +@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPatte + + Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern"); + // Set pattern transform matrix +- double *p2u = tiling_pattern->getMatrix(); ++ const double *p2u = tiling_pattern->getMatrix(); + double m[6] = {1, 0, 0, 1, 0, 0}; + double det; + det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2]; // see LP Bug 1168908 +@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPatte + pattern_node->setAttribute("patternUnits", "userSpaceOnUse"); + // Set pattern tiling + // FIXME: don't ignore XStep and YStep +- double *bbox = tiling_pattern->getBBox(); ++ const double *bbox = tiling_pattern->getBBox(); + sp_repr_set_svg_double(pattern_node, "x", 0.0); + sp_repr_set_svg_double(pattern_node, "y", 0.0); + sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]); +@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPatte + */ + gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) { + Inkscape::XML::Node *gradient; +- Function *func; ++ _POPPLER_CONST Function *func; + int num_funcs; + bool extend0, extend1; + +@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, + + #define INT_EPSILON 8 + bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, +- Function *func) { ++ _POPPLER_CONST Function *func) { + int type = func->getType(); + if ( type == 0 || type == 2 ) { // Sampled or exponential function + GfxRGB stop1, stop2; +@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node + _addStopToGradient(gradient, 1.0, &stop2, 1.0); + } + } else if ( type == 3 ) { // Stitching +- StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func); +- double *bounds = stitchingFunc->getBounds(); +- double *encode = stitchingFunc->getEncode(); ++ auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func); ++ const double *bounds = stitchingFunc->getBounds(); ++ const double *encode = stitchingFunc->getEncode(); + int num_funcs = stitchingFunc->getNumFuncs(); + + // Add stops from all the stitched functions +@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node + svgGetShadingColorRGB(shading, bounds[i + 1], &color); + // Add stops + if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn +- double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE(); ++ double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE(); + if (expE > 1.0) { + expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1 + if (encode[2*i] == 0) { // normal sequence +@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) { + GfxFont *font = state->getFont(); + // Store original name + if (font->getName()) { +- _font_specification = font->getName()->getCString(); ++ _font_specification = g_strdup(font->getName()->c_str()); + } else { + _font_specification = (char*) "Arial"; + } +@@ -1047,7 +1047,7 @@ void SvgBuilder::updateFont(GfxState *state) { + + // Font family + if (font->getFamily()) { // if font family is explicitly given use it. +- sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->getCString()); ++ sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->c_str()); + } else { + int attr_value = 1; + sp_repr_get_int(_preferences, "localFonts", &attr_value); +@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) { + Inkscape::CSSOStringStream os_font_size; + double css_font_size = _font_scaling * state->getFontSize(); + if ( font->getType() == fontType3 ) { +- double *font_matrix = font->getFontMatrix(); ++ const double *font_matrix = font->getFontMatrix(); + if ( font_matrix[0] != 0.0 ) { + css_font_size *= font_matrix[3] / font_matrix[0]; + } +@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double + void SvgBuilder::updateTextMatrix(GfxState *state) { + _flushText(); + // Update text matrix +- double *text_matrix = state->getTextMat(); ++ const double *text_matrix = state->getTextMat(); + double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] ); + double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] ); + double max_scale; +@@ -1361,7 +1361,7 @@ void SvgBuilder::_flushText() { + _glyphs.clear(); + } + +-void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) { ++void SvgBuilder::beginString(GfxState *state, const GooString * /*s*/) { + if (_need_font_update) { + updateFont(state); + } +--- src/extension/internal/pdfinput/svg-builder.h.orig 2018-03-11 20:38:09 UTC ++++ src/extension/internal/pdfinput/svg-builder.h +@@ -15,6 +15,7 @@ + #endif + + #ifdef HAVE_POPPLER ++#include "poppler-transition-api.h" + + class SPDocument; + namespace Inkscape { +@@ -136,7 +137,7 @@ class SvgBuilder { (public) + void clearSoftMask(GfxState *state); + + // Text handling +- void beginString(GfxState *state, GooString *s); ++ void beginString(GfxState *state, const GooString *s); + void endString(GfxState *state); + void addChar(GfxState *state, double x, double y, + double dx, double dy, +@@ -175,7 +176,7 @@ class SvgBuilder { (public) + void _addStopToGradient(Inkscape::XML::Node *gradient, double offset, + GfxRGB *color, double opacity); + bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, +- Function *func); ++ _POPPLER_CONST Function *func); + gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state, + bool is_stroke=false); + // Image/mask creation diff --git a/graphics/inkscape/files/patch-src_libnrtype_FontFactory.cpp b/graphics/inkscape/files/patch-src_libnrtype_FontFactory.cpp index a6c5ac90e45b..6511674a7aac 100644 --- a/graphics/inkscape/files/patch-src_libnrtype_FontFactory.cpp +++ b/graphics/inkscape/files/patch-src_libnrtype_FontFactory.cpp @@ -1,6 +1,6 @@ ---- src/libnrtype/FontFactory.cpp.orig 2017-01-05 22:10:01.490293000 +0100 -+++ src/libnrtype/FontFactory.cpp 2017-01-05 22:13:37.547401000 +0100 -@@ -695,8 +695,9 @@ +--- src/libnrtype/FontFactory.cpp.orig 2018-03-11 20:38:09 UTC ++++ src/libnrtype/FontFactory.cpp +@@ -704,8 +704,9 @@ font_instance *font_factory::Face(PangoFontDescription guint script_index = -1; if( pango_ot_info_find_script( info, PANGO_OT_TABLE_GSUB, scripts[i], &script_index )) { diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index 116f09a4d133..0ee9f891b6c2 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -2,7 +2,7 @@ PORTNAME= krita DISTVERSION= 4.1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/${PORTNAME} diff --git a/graphics/okular-kde4/Makefile b/graphics/okular-kde4/Makefile index 5a1c21b184d3..a58c3ad57254 100644 --- a/graphics/okular-kde4/Makefile +++ b/graphics/okular-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= okular PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= graphics kde kde-kde4 MAINTAINER= kde@FreeBSD.org @@ -15,7 +15,6 @@ LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \ libkscreen.so:graphics/libkscreen \ libqca.so:devel/qca@qt4 \ libtiff.so:graphics/tiff \ - libpoppler-qt4.so:graphics/poppler-qt4 \ libspectre.so:print/libspectre \ libchm.so:misc/chmlib \ libfreetype.so:print/freetype2 \ diff --git a/graphics/okular-kde4/pkg-plist b/graphics/okular-kde4/pkg-plist index 49cd3510367a..34921b80f112 100644 --- a/graphics/okular-kde4/pkg-plist +++ b/graphics/okular-kde4/pkg-plist @@ -44,7 +44,6 @@ lib/kde4/okularGenerator_kimgio.so lib/kde4/okularGenerator_mobi.so lib/kde4/okularGenerator_ooo.so lib/kde4/okularGenerator_plucker.so -lib/kde4/okularGenerator_poppler.so lib/kde4/okularGenerator_tiff.so lib/kde4/okularGenerator_txt.so lib/kde4/okularGenerator_xps.so @@ -63,7 +62,6 @@ share/applications/kde4/active-documentviewer_fb.desktop share/applications/kde4/active-documentviewer_ghostview.desktop share/applications/kde4/active-documentviewer_kimgio.desktop share/applications/kde4/active-documentviewer_ooo.desktop -share/applications/kde4/active-documentviewer_pdf.desktop share/applications/kde4/active-documentviewer_plucker.desktop share/applications/kde4/active-documentviewer_tiff.desktop share/applications/kde4/active-documentviewer_txt.desktop @@ -80,7 +78,6 @@ share/applications/kde4/okularApplication_ghostview.desktop share/applications/kde4/okularApplication_kimgio.desktop share/applications/kde4/okularApplication_mobi.desktop share/applications/kde4/okularApplication_ooo.desktop -share/applications/kde4/okularApplication_pdf.desktop share/applications/kde4/okularApplication_plucker.desktop share/applications/kde4/okularApplication_tiff.desktop share/applications/kde4/okularApplication_txt.desktop @@ -125,7 +122,6 @@ share/apps/okular/tools.xml share/config.kcfg/gssettings.kcfg share/config.kcfg/okular.kcfg share/config.kcfg/okular_core.kcfg -share/config.kcfg/pdfsettings.kcfg share/doc/HTML/en/okular/annotation-properties.png share/doc/HTML/en/okular/annotations.png share/doc/HTML/en/okular/bookmark-management.png @@ -174,7 +170,6 @@ share/kde4/services/libokularGenerator_kimgio.desktop share/kde4/services/libokularGenerator_mobi.desktop share/kde4/services/libokularGenerator_ooo.desktop share/kde4/services/libokularGenerator_plucker.desktop -share/kde4/services/libokularGenerator_poppler.desktop share/kde4/services/libokularGenerator_tiff.desktop share/kde4/services/libokularGenerator_txt.desktop share/kde4/services/libokularGenerator_xps.desktop @@ -191,7 +186,6 @@ share/kde4/services/okularKimgio.desktop share/kde4/services/okularMobi.desktop share/kde4/services/okularOoo.desktop share/kde4/services/okularPlucker.desktop -share/kde4/services/okularPoppler.desktop share/kde4/services/okularTiff.desktop share/kde4/services/okularTxt.desktop share/kde4/services/okularXps.desktop diff --git a/graphics/okular/Makefile b/graphics/okular/Makefile index ba562018944b..d3577d650788 100644 --- a/graphics/okular/Makefile +++ b/graphics/okular/Makefile @@ -2,6 +2,7 @@ PORTNAME= okular DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= graphics kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/graphics/openfx-arena/Makefile b/graphics/openfx-arena/Makefile index 2b9827e69cf0..94046062d30d 100644 --- a/graphics/openfx-arena/Makefile +++ b/graphics/openfx-arena/Makefile @@ -3,7 +3,7 @@ PORTNAME= openfx-arena PORTVERSION= 2.3.14 DISTVERSIONPREFIX= Natron- -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MAINTAINER= olivier@FreeBSD.org diff --git a/graphics/poppler-glib/Makefile b/graphics/poppler-glib/Makefile index e5b77019cd97..13ebb1558f82 100644 --- a/graphics/poppler-glib/Makefile +++ b/graphics/poppler-glib/Makefile @@ -2,17 +2,11 @@ # $FreeBSD$ PORTREVISION= 0 -PKGNAMESUFFIX= -glib -MAINTAINER= gnome@FreeBSD.org COMMENT= GLib bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= glib +_SLAVE_PORT= glib PLIST= ${.CURDIR}/pkg-plist -pre-build: - @cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} libpoppler-cairo.la - .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-glib/pkg-plist b/graphics/poppler-glib/pkg-plist index f8a58e3af591..5b5c10e69f89 100644 --- a/graphics/poppler-glib/pkg-plist +++ b/graphics/poppler-glib/pkg-plist @@ -7,6 +7,7 @@ include/poppler/glib/poppler-enums.h include/poppler/glib/poppler-features.h include/poppler/glib/poppler-form-field.h include/poppler/glib/poppler-layer.h +include/poppler/glib/poppler-macros.h include/poppler/glib/poppler-media.h include/poppler/glib/poppler-movie.h include/poppler/glib/poppler-page.h @@ -15,6 +16,6 @@ include/poppler/glib/poppler.h lib/girepository-1.0/Poppler-0.18.typelib lib/libpoppler-glib.so lib/libpoppler-glib.so.8 -lib/libpoppler-glib.so.8.9.0 +lib/libpoppler-glib.so.8.11.0 libdata/pkgconfig/poppler-glib.pc share/gir-1.0/Poppler-0.18.gir diff --git a/graphics/poppler-qt4/Makefile b/graphics/poppler-qt4/Makefile deleted file mode 100644 index 26eec1038873..000000000000 --- a/graphics/poppler-qt4/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# Created by: Michael Johnson <ahze@FreeBSD.org> -# $FreeBSD$ - -PORTREVISION= 1 -PKGNAMESUFFIX= -qt4 - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Qt 4 bindings to poppler - -MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= qt4 -PLIST= ${.CURDIR}/pkg-plist - -.include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-qt4/pkg-plist b/graphics/poppler-qt4/pkg-plist deleted file mode 100644 index 7bafd91fc6af..000000000000 --- a/graphics/poppler-qt4/pkg-plist +++ /dev/null @@ -1,13 +0,0 @@ -include/poppler/qt4/poppler-annotation.h -include/poppler/qt4/poppler-export.h -include/poppler/qt4/poppler-form.h -include/poppler/qt4/poppler-link.h -include/poppler/qt4/poppler-link-private.h -include/poppler/qt4/poppler-media.h -include/poppler/qt4/poppler-optcontent.h -include/poppler/qt4/poppler-page-transition.h -include/poppler/qt4/poppler-qt4.h -lib/libpoppler-qt4.so -lib/libpoppler-qt4.so.4 -lib/libpoppler-qt4.so.4.11.0 -libdata/pkgconfig/poppler-qt4.pc diff --git a/graphics/poppler-qt5/Makefile b/graphics/poppler-qt5/Makefile index 955526808ec2..686ee8cf48b0 100644 --- a/graphics/poppler-qt5/Makefile +++ b/graphics/poppler-qt5/Makefile @@ -1,13 +1,12 @@ # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -qt5 -MAINTAINER= gnome@FreeBSD.org COMMENT= Qt 5 bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= qt5 +_SLAVE_PORT= qt5 PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler-qt5/pkg-plist b/graphics/poppler-qt5/pkg-plist index 262e5ecc2a70..ca6e9a5c6ab5 100644 --- a/graphics/poppler-qt5/pkg-plist +++ b/graphics/poppler-qt5/pkg-plist @@ -2,12 +2,11 @@ include/poppler/qt5/poppler-annotation.h include/poppler/qt5/poppler-export.h include/poppler/qt5/poppler-form.h include/poppler/qt5/poppler-link.h -include/poppler/qt5/poppler-link-private.h include/poppler/qt5/poppler-media.h include/poppler/qt5/poppler-optcontent.h include/poppler/qt5/poppler-page-transition.h include/poppler/qt5/poppler-qt5.h lib/libpoppler-qt5.so lib/libpoppler-qt5.so.1 -lib/libpoppler-qt5.so.1.10.0 +lib/libpoppler-qt5.so.1.17.0 libdata/pkgconfig/poppler-qt5.pc diff --git a/graphics/poppler-utils/Makefile b/graphics/poppler-utils/Makefile index 6a400af6346e..67fa87041131 100644 --- a/graphics/poppler-utils/Makefile +++ b/graphics/poppler-utils/Makefile @@ -1,14 +1,12 @@ # Created by: Michael Nottebrock <lofi@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 1 -PKGNAMESUFFIX= -utils +PORTREVISION= 0 -MAINTAINER= gnome@FreeBSD.org -COMMENT= Poppler's xpdf-workalike command line utilities +COMMENT= Poppler's xpdf-workalike command line utilities # ' MASTERDIR= ${.CURDIR}/../../graphics/poppler -SLAVEPORT= utils +_SLAVE_PORT= utils PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 56c41478b7a3..62cd431e4f29 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= poppler -PORTVERSION= 0.57.0 -PORTREVISION= 2 +DISTVERSION= 0.72.0 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ @@ -13,136 +12,87 @@ COMMENT?= PDF rendering library LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libpng.so:graphics/png \ - libtiff.so:graphics/tiff \ - libfontconfig.so:x11-fonts/fontconfig \ +LIB_DEPENDS= libnspr4.so:devel/nspr \ liblcms2.so:graphics/lcms2 \ + libpng.so:graphics/png \ + libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ - libnspr4.so:devel/nspr + libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= poppler-data>0:graphics/poppler-data -USES= compiler:c++11-lang cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz +USES= compiler:c++11-lang cpe cmake gnome jpeg libtool \ + localbase pathfix pkgconfig tar:xz CPE_VENDOR= freedesktop -USE_GNOME= libxml2 -GNU_CONFIGURE= yes +USE_GNOME= cairo libxml2 USE_LDCONFIG= yes -CONFIGURE_ARGS= --enable-zlib \ - --enable-xpdf-headers \ - --disable-libnss \ - --disable-gtk-test \ - --without-html-dir \ - --disable-static \ - --enable-libnss +CMAKE_ON= ENABLE_LIBJPEG \ + ENABLE_LIBPNG \ + ENABLE_LIBTIFF \ + ENABLE_XPDF_HEADERS \ + ENABLE_ZLIB \ + ENABLE_NSS \ + ENABLE_SPLASH -INSTALL_TARGET= install-strip -.if !defined(SLAVEPORT) -PORTSCOUT= limitw:1,even +# Slave ports. +_POPPLER_SLAVES= library glib qt5 utils +_SLAVE_PORT?= library -OPTIONS_DEFINE= CAIRO CURL OPENJPEG -OPTIONS_DEFAULT=CAIRO OPENJPEG +# Activate the wanted module, and deactivate the others. +CMAKE_ON+= ENABLE_${_SLAVE_PORT:tu} +CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/} +.if ${_SLAVE_PORT} == library +PORTSCOUT= limitw:1,even USES+= iconv -.endif - -.include <bsd.port.options.mk> +CMAKE_ON+= ENABLE_CPP -.if defined(SLAVEPORT) -PORTSCOUT= ignore:1 -LIB_DEPENDS+= libpoppler.so:graphics/poppler - -.if ${SLAVEPORT}==glib -CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes -USE_GNOME+= cairo glib20 introspection:build -BUILD_WRKSRC= ${WRKSRC}/glib -INSTALL_WRKSRC= ${WRKSRC}/glib +OPTIONS_DEFINE= CURL OPENJPEG +OPTIONS_DEFAULT= OPENJPEG +OPTIONS_SUB= yes .else -CONFIGURE_ARGS+=--disable-poppler-glib -.endif +PORTSCOUT= ignore:1 -.if ${SLAVEPORT}==qt4 DEPRECATED= Qt4 has been EOL since december 2015 EXPIRATION_DATE= 2019-03-15 -CONFIGURE_ARGS+=--enable-poppler-qt4 -CONFIGURE_ENV+= MOCQT4=${MOC} -USES+= qt:4 -USE_QT= gui corelib xml qtestlib moc_build -BUILD_WRKSRC= ${WRKSRC}/qt4 -INSTALL_WRKSRC= ${WRKSRC}/qt4 -.else -CONFIGURE_ARGS+=--disable-poppler-qt4 -.endif +LIB_DEPENDS+= libpoppler.so:graphics/poppler +PKGNAMESUFFIX= -${_SLAVE_PORT} -.if ${SLAVEPORT}==qt5 -CONFIGURE_ARGS+=--enable-poppler-qt5 -CONFIGURE_ENV+= MOCQT5=${MOC} -USES+= qt:5 -USE_QT= core gui widgets xml buildtools_build testlib_build -# Qt from 5.7.0 on requires c++11. -USE_CXXSTD= c++11 -BUILD_WRKSRC= ${WRKSRC}/qt5 -INSTALL_WRKSRC= ${WRKSRC}/qt5 -.else -CONFIGURE_ARGS+=--disable-poppler-qt5 -.endif +BUILD_WRKSRC= ${WRKSRC}/${_SLAVE_PORT} +INSTALL_WRKSRC= ${WRKSRC}/${_SLAVE_PORT} -.if ${SLAVEPORT}==utils -LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib -CONFIGURE_ARGS+=--enable-utils -BUILD_WRKSRC= ${WRKSRC}/utils -INSTALL_WRKSRC= ${WRKSRC}/utils -.else -CONFIGURE_ARGS+=--disable-utils -.endif +CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING="none" \ + -DENABLE_LIBCURL:BOOL=FALSE -.else # ! SLAVE options below -CONFIGURE_ARGS+=--disable-poppler-glib \ - --disable-poppler-qt4 \ - --disable-poppler-qt5 \ - --disable-utils - -.if ${PORT_OPTIONS:MCAIRO} -LIB_DEPENDS+= libcairo.so:graphics/cairo -PLIST_SUB+= CAIRO="" -.else -CONFIGURE_ARGS+=--disable-cairo-output -PLIST_SUB+= CAIRO="@comment " -.endif +. if ${_SLAVE_PORT} == glib +USE_GNOME+= glib20 introspection:Build +. elif ${_SLAVE_PORT} == qt5 +USES+= qt:5 +USE_QT= core gui widgets xml \ + buildtools_build qmake_build testlib_build +. elif ${_SLAVE_PORT} == utils +LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib +USES+= gnome +. endif -.if ${PORT_OPTIONS:MCURL} -LIB_DEPENDS+= libcurl.so:ftp/curl -CONFIGURE_ARGS+=--enable-libcurl -PLIST_SUB+= CURL="" -.else -CONFIGURE_ARGS+=--disable-libcurl -PLIST_SUB+= CURL="@comment " .endif -.if ${PORT_OPTIONS:MOPENJPEG} -CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2 -LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg -.else -CONFIGURE_ARGS+=--enable-libopenjpeg=none -.endif -.endif # end of options +CURL_CMAKE_BOOL= ENABLE_LIBCURL +CURL_LIB_DEPENDS= libcurl.so:ftp/curl -post-patch: - @${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure +OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg +OPENJPEG_CMAKE_ON= -DENABLE_LIBOPENJPEG:STRING="openjpeg2" +OPENJPEG_CMAKE_OFF= -DENABLE_LIBOPENJPEG:STRING="none" post-install: -.if defined(SLAVEPORT) -. if ${SLAVEPORT}==glib +.if ${_SLAVE_PORT} == glib ${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig -. elif ${SLAVEPORT}==qt4 - ${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc \ - ${STAGEDIR}${PREFIX}/libdata/pkgconfig -. elif ${SLAVEPORT}==qt5 +.elif ${_SLAVE_PORT} == qt5 ${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig -. endif .endif .include <bsd.port.mk> diff --git a/graphics/poppler/distinfo b/graphics/poppler/distinfo index 4ca00cb472e0..5d53e8e19678 100644 --- a/graphics/poppler/distinfo +++ b/graphics/poppler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1503426409 -SHA256 (poppler-0.57.0.tar.xz) = 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 -SIZE (poppler-0.57.0.tar.xz) = 1703300 +TIMESTAMP = 1544313959 +SHA256 (poppler-0.72.0.tar.xz) = c1747eb8f26e9e753c4001ed951db2896edc1021b6d0f547a0bd2a27c30ada51 +SIZE (poppler-0.72.0.tar.xz) = 1492912 diff --git a/graphics/poppler/files/patch-CMakeLists.txt b/graphics/poppler/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..33521f482a64 --- /dev/null +++ b/graphics/poppler/files/patch-CMakeLists.txt @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2018-10-07 08:06:59 UTC ++++ CMakeLists.txt +@@ -263,6 +263,7 @@ endif() + + if (NSS3_FOUND) + add_definitions(${NSS3_CFLAGS}) ++ link_directories(${NSS3_LIBRARY_DIRS}) + set(ENABLE_NSS3 ON) + endif() + if(JPEG_FOUND) diff --git a/graphics/poppler/files/patch-configure b/graphics/poppler/files/patch-configure deleted file mode 100644 index 97b51246cc25..000000000000 --- a/graphics/poppler/files/patch-configure +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.orig 2016-07-24 22:14:28 UTC -+++ configure -@@ -20556,7 +20556,7 @@ fi - - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_CXXFLAGS="$CXXFLAGS" --ac_save_LIBS="$LDFLAGS" -+ac_save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS" - CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS" - LIBS="$LIBS $LIBTIFF_LIBS" -@@ -21387,7 +21387,7 @@ if ${ac_cv_lib_jpeg_6b+:} false; then : - else - - ac_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm" -+LIBS="$LIBS $USER_LDFLAGS -ljpeg6b -lm" - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -21438,7 +21438,7 @@ if ${ac_cv_lib_jpeg_normal+:} false; the - else - - ac_save_LIBS="$LIBS" --LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm" -+LIBS="$LIBS $USER_LDFLAGS -ljpeg -lm" - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext diff --git a/graphics/poppler/files/patch-glib_Makefile.in b/graphics/poppler/files/patch-glib_Makefile.in deleted file mode 100644 index a661d044c989..000000000000 --- a/graphics/poppler/files/patch-glib_Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ ---- glib/Makefile.in.orig 2015-01-19 11:51:06.175898921 +0100 -+++ glib/Makefile.in 2015-01-19 11:51:27.026898915 +0100 -@@ -134,7 +134,6 @@ - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_glib_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la \ - $(top_builddir)/poppler/libpoppler-cairo.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) - am__objects_1 = libpoppler_glib_la-poppler-enums.lo -@@ -553,7 +552,7 @@ - $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES) - - libpoppler_glib_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(top_builddir)/poppler/libpoppler-cairo.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) -@@ -576,7 +575,7 @@ - @HAVE_INTROSPECTION_TRUE@introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS) - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0 - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir) --@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la -+@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files) - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h - @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib diff --git a/graphics/poppler/files/patch-glib_demo_Makefile.in b/graphics/poppler/files/patch-glib_demo_Makefile.in deleted file mode 100644 index 9e5537da8083..000000000000 --- a/graphics/poppler/files/patch-glib_demo_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- glib/demo/Makefile.in.orig 2012-06-13 13:31:37.000000000 +0200 -+++ glib/demo/Makefile.in 2012-06-13 13:32:45.000000000 +0200 -@@ -66,7 +66,7 @@ - am__DEPENDENCIES_1 = - poppler_glib_demo_DEPENDENCIES = \ - $(top_builddir)/glib/libpoppler-glib.la \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - AM_V_lt = $(am__v_lt_@AM_V@) - am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) - am__v_lt_0 = --silent -@@ -365,7 +365,7 @@ - - LDADD = \ - $(top_builddir)/glib/libpoppler-glib.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(GTK_TEST_LIBS) - - all: all-am diff --git a/graphics/poppler/files/patch-qt4_Makefile.in b/graphics/poppler/files/patch-qt4_Makefile.in deleted file mode 100644 index ffb4777b4074..000000000000 --- a/graphics/poppler/files/patch-qt4_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- qt4/Makefile.in.orig 2008-03-24 08:30:49.000000000 -0400 -+++ qt4/Makefile.in 2008-03-24 08:30:34.000000000 -0400 -@@ -223,7 +223,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - win32_libs = @win32_libs@ --SUBDIRS = src tests demos -+SUBDIRS = src - all: all-recursive - - .SUFFIXES: diff --git a/graphics/poppler/files/patch-qt4_src_Makefile.in b/graphics/poppler/files/patch-qt4_src_Makefile.in deleted file mode 100644 index 116cad640328..000000000000 --- a/graphics/poppler/files/patch-qt4_src_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- qt4/src/Makefile.in.orig 2013-12-02 18:58:51.000000000 +0100 -+++ qt4/src/Makefile.in 2013-12-02 18:59:39.000000000 +0100 -@@ -129,7 +129,7 @@ - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_qt4_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \ - libpoppler_qt4_la-poppler-page.lo \ - libpoppler_qt4_la-poppler-fontinfo.lo \ -@@ -505,7 +505,7 @@ - -Dpoppler_qt4_EXPORTS - - libpoppler_qt4_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT4_LIBS) - - libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@ diff --git a/graphics/poppler/files/patch-qt5_Makefile.in b/graphics/poppler/files/patch-qt5_Makefile.in deleted file mode 100644 index f0b38d172a29..000000000000 --- a/graphics/poppler/files/patch-qt5_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- qt5/Makefile.in.orig 2014-11-25 11:49:19 UTC -+++ qt5/Makefile.in -@@ -384,7 +384,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - win32_libs = @win32_libs@ --SUBDIRS = src tests demos -+SUBDIRS = src - all: all-recursive - - .SUFFIXES: diff --git a/graphics/poppler/files/patch-qt5_src_Makefile.in b/graphics/poppler/files/patch-qt5_src_Makefile.in deleted file mode 100644 index 1b1fb04a1bb9..000000000000 --- a/graphics/poppler/files/patch-qt5_src_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- qt5/src/Makefile.in.orig 2014-11-25 11:49:19 UTC -+++ qt5/src/Makefile.in -@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - am__DEPENDENCIES_1 = - libpoppler_qt5_la_DEPENDENCIES = \ -- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \ - libpoppler_qt5_la-poppler-page.lo \ - libpoppler_qt5_la-poppler-fontinfo.lo \ -@@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \ - -Dpoppler_qt5_EXPORTS -fPIC - - libpoppler_qt5_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT5_LIBS) - - libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@ diff --git a/graphics/poppler/files/patch-qt5_src_poppler-form.h b/graphics/poppler/files/patch-qt5_src_poppler-form.h deleted file mode 100644 index 71faedaadd99..000000000000 --- a/graphics/poppler/files/patch-qt5_src_poppler-form.h +++ /dev/null @@ -1,10 +0,0 @@ ---- qt5/src/poppler-form.h.orig 2017-07-02 21:00:50 UTC -+++ qt5/src/poppler-form.h -@@ -26,6 +26,7 @@ - #include <QtCore/QStringList> - #include <QtCore/QSharedPointer> - #include "poppler-export.h" -+#include <ctime> // time_t - - class Page; - class FormWidget; diff --git a/graphics/poppler/files/patch-utils_Makefile.in b/graphics/poppler/files/patch-utils_Makefile.in deleted file mode 100644 index e67242f6cf99..000000000000 --- a/graphics/poppler/files/patch-utils_Makefile.in +++ /dev/null @@ -1,111 +0,0 @@ ---- utils/Makefile.in.orig 2016-03-16 22:22:14 UTC -+++ utils/Makefile.in -@@ -136,45 +136,38 @@ PROGRAMS = $(bin_PROGRAMS) - am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT) - pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS) - pdfdetach_LDADD = $(LDADD) --pdfdetach_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfdetach_DEPENDENCIES = libparseargs.la - am_pdffonts_OBJECTS = pdffonts.$(OBJEXT) - pdffonts_OBJECTS = $(am_pdffonts_OBJECTS) - pdffonts_LDADD = $(LDADD) --pdffonts_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdffonts_DEPENDENCIES = libparseargs.la - am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \ - JSInfo.$(OBJEXT) - pdfimages_OBJECTS = $(am_pdfimages_OBJECTS) - pdfimages_LDADD = $(LDADD) --pdfimages_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfimages_DEPENDENCIES = libparseargs.la - am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \ - JSInfo.$(OBJEXT) - pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS) - pdfinfo_LDADD = $(LDADD) --pdfinfo_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfinfo_DEPENDENCIES = libparseargs.la - am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT) - pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS) - pdfseparate_LDADD = $(LDADD) --pdfseparate_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfseparate_DEPENDENCIES = libparseargs.la - am_pdfsig_OBJECTS = pdfsig.$(OBJEXT) - pdfsig_OBJECTS = $(am_pdfsig_OBJECTS) - pdfsig_LDADD = $(LDADD) --pdfsig_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfsig_DEPENDENCIES = libparseargs.la - am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \ - pdftocairo-pdftocairo-win32.$(OBJEXT) - pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS) --am__DEPENDENCIES_1 = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+am__DEPENDENCIES_1 = libparseargs.la - am__DEPENDENCIES_2 = - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \ - @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2) - am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3) --pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \ -+pdftocairo_DEPENDENCIES = \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \ - $(am__DEPENDENCIES_2) - am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \ -@@ -182,31 +175,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht - pdftohtml-HtmlOutputDev.$(OBJEXT) - pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS) - pdftohtml_LDADD = $(LDADD) --pdftohtml_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdftohtml_DEPENDENCIES = libparseargs.la - pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \ - $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT) - pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS) - pdftoppm_LDADD = $(LDADD) --pdftoppm_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdftoppm_DEPENDENCIES = libparseargs.la - am_pdftops_OBJECTS = pdftops.$(OBJEXT) - pdftops_OBJECTS = $(am_pdftops_OBJECTS) - pdftops_LDADD = $(LDADD) --pdftops_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdftops_DEPENDENCIES = libparseargs.la - am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT) - pdftotext_OBJECTS = $(am_pdftotext_OBJECTS) - pdftotext_LDADD = $(LDADD) --pdftotext_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdftotext_DEPENDENCIES = libparseargs.la - am_pdfunite_OBJECTS = pdfunite.$(OBJEXT) - pdfunite_OBJECTS = $(am_pdfunite_OBJECTS) - pdfunite_LDADD = $(LDADD) --pdfunite_DEPENDENCIES = libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la -+pdfunite_DEPENDENCIES = libparseargs.la - AM_V_P = $(am__v_P_@AM_V@) - am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) - am__v_P_0 = false -@@ -549,7 +537,7 @@ AM_CPPFLAGS = \ - - LDADD = \ - libparseargs.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(UTILS_LIBS) - - @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \ -@@ -615,7 +603,7 @@ pdftocairo_SOURCES = \ - pdftocairo-win32.h - - pdftocairo_LDADD = \ -- $(top_builddir)/poppler/libpoppler-cairo.la \ -+ -lpoppler-glib \ - $(LDADD) \ - $(PDFTOCAIRO_LIBS) \ - $(PTHREAD_LIBS) diff --git a/graphics/poppler/pkg-plist b/graphics/poppler/pkg-plist index 40d12d009c50..59763fc86b7a 100644 --- a/graphics/poppler/pkg-plist +++ b/graphics/poppler/pkg-plist @@ -28,6 +28,8 @@ include/poppler/GlobalParams.h include/poppler/Hints.h include/poppler/JArithmeticDecoder.h include/poppler/JBIG2Stream.h +%%OPENJPEG%%include/poppler/JPEG2000Stream.h +%%NO_OPENJPEG%%include/poppler/JPXStream.h include/poppler/Lexer.h include/poppler/Linearization.h include/poppler/Link.h @@ -54,8 +56,6 @@ include/poppler/PreScanOutputDev.h include/poppler/ProfileData.h include/poppler/Rendition.h include/poppler/SecurityHandler.h -include/poppler/SignatureHandler.h -include/poppler/SignatureInfo.h include/poppler/Sound.h include/poppler/SplashOutputDev.h include/poppler/StdinCachedFile.h @@ -66,16 +66,15 @@ include/poppler/StructElement.h include/poppler/StructTreeRoot.h include/poppler/TextOutputDev.h include/poppler/UTF.h -include/poppler/UTF8.h include/poppler/UnicodeCClassTables.h include/poppler/UnicodeCompTables.h include/poppler/UnicodeDecompTables.h include/poppler/UnicodeMap.h +include/poppler/UnicodeMapFuncs.h include/poppler/UnicodeMapTables.h include/poppler/UnicodeTypeTable.h include/poppler/ViewerPreferences.h include/poppler/XRef.h -include/poppler/XpdfPluginAPI.h include/poppler/cpp/poppler-document.h include/poppler/cpp/poppler-embedded-file.h include/poppler/cpp/poppler-font.h @@ -94,17 +93,16 @@ include/poppler/fofi/FoFiTrueType.h include/poppler/fofi/FoFiType1.h include/poppler/fofi/FoFiType1C.h include/poppler/goo/FixedPoint.h -include/poppler/goo/GooHash.h +include/poppler/goo/GooCheckedOps.h include/poppler/goo/GooLikely.h include/poppler/goo/GooList.h -include/poppler/goo/GooMutex.h include/poppler/goo/GooString.h include/poppler/goo/GooTimer.h include/poppler/goo/ImgWriter.h include/poppler/goo/JpegWriter.h -include/poppler/goo/NetPBMWriter.h include/poppler/goo/PNGWriter.h include/poppler/goo/TiffWriter.h +include/poppler/goo/gdir.h include/poppler/goo/gfile.h include/poppler/goo/gmem.h include/poppler/goo/grandom.h @@ -128,19 +126,16 @@ include/poppler/splash/SplashPath.h include/poppler/splash/SplashPattern.h include/poppler/splash/SplashScreen.h include/poppler/splash/SplashState.h -include/poppler/splash/SplashT1Font.h -include/poppler/splash/SplashT1FontEngine.h -include/poppler/splash/SplashT1FontFile.h include/poppler/splash/SplashTypes.h include/poppler/splash/SplashXPath.h include/poppler/splash/SplashXPathScanner.h lib/libpoppler-cpp.so lib/libpoppler-cpp.so.0 -lib/libpoppler-cpp.so.0.3.0 +lib/libpoppler-cpp.so.0.5.0 lib/libpoppler.so -lib/libpoppler.so.68 -lib/libpoppler.so.68.0.0 -%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc +lib/libpoppler.so.83 +lib/libpoppler.so.83.0.0 +libdata/pkgconfig/poppler-cairo.pc libdata/pkgconfig/poppler-cpp.pc libdata/pkgconfig/poppler-splash.pc libdata/pkgconfig/poppler.pc diff --git a/graphics/py-poppler-qt4/Makefile b/graphics/py-poppler-qt4/Makefile deleted file mode 100644 index da367ed2955d..000000000000 --- a/graphics/py-poppler-qt4/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# $FreeBSD$ - -PORTNAME= poppler-qt4 -PORTVERSION= 0.18.1 -PORTREVISION= 12 -CATEGORIES= graphics python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= python-${PORTNAME}-${PORTVERSION} - -MAINTAINER= martin.dieringer@gmx.de -COMMENT= Python bindings for the Poppler-Qt4 PDF rendering library - -LICENSE= LGPL21 LGPL3 -LICENSE_COMB= dual - -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 - -USES= compiler:c++11-lang pkgconfig pyqt:4 python -USE_PYQT= gui xml sip_build -USE_PYTHON= distutils autoplist - -.include <bsd.port.mk> diff --git a/graphics/py-poppler-qt4/distinfo b/graphics/py-poppler-qt4/distinfo deleted file mode 100644 index 8bc8799edbae..000000000000 --- a/graphics/py-poppler-qt4/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (python-poppler-qt4-0.18.1.tar.gz) = 00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c -SIZE (python-poppler-qt4-0.18.1.tar.gz) = 15523 diff --git a/graphics/py-poppler-qt4/files/patch-types.sip b/graphics/py-poppler-qt4/files/patch-types.sip deleted file mode 100644 index 8ce1d17660a3..000000000000 --- a/graphics/py-poppler-qt4/files/patch-types.sip +++ /dev/null @@ -1,16 +0,0 @@ -PyList_SET_ITEM() is supposed to be void, but as a macro it's an -expression and has a pointer value. Clang 4.0 trips on the bogus -pointer comparison; given the comparison, it should be PyList_SetItem() -which returns -1 on failure. - ---- types.sip.orig 2017-01-21 07:19:29 UTC -+++ types.sip -@@ -27,7 +27,7 @@ - foreach (Poppler::Document::RenderBackend value, set) - { - PyObject *obj = PyLong_FromLong ((long) value); -- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) -+ if (obj == NULL || PyList_SetItem (l, i, obj) < 0) - { - Py_DECREF(l); - diff --git a/graphics/py-poppler-qt4/pkg-descr b/graphics/py-poppler-qt4/pkg-descr deleted file mode 100644 index 55f6ca4757de..000000000000 --- a/graphics/py-poppler-qt4/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Python bindings for graphics/poppler-qt4. - -WWW: https://pypi.org/project/python-poppler-qt4/ diff --git a/graphics/py-poppler/Makefile b/graphics/py-poppler/Makefile index 7ef131dd4bcf..3a4f8bb47abd 100644 --- a/graphics/py-poppler/Makefile +++ b/graphics/py-poppler/Makefile @@ -3,7 +3,7 @@ PORTNAME= poppler PORTVERSION= 0.12.1 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics python MASTER_SITES= https://launchpad.net/poppler-python/trunk/development/+download/ \ http://launchpadlibrarian.net/30270080/ \ diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile index 0f821775e15f..49756a30b7d4 100644 --- a/misc/tellico-kde4/Makefile +++ b/misc/tellico-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= tellico PORTVERSION= 2.3.12 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc kde MASTER_SITES= http://tellico-project.org/files/ @@ -18,7 +18,6 @@ EXPIRATION_DATE= 2018-12-31 LIB_DEPENDS= libexempi.so:textproc/exempi \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ - libpoppler-qt4.so:graphics/poppler-qt4 \ libqjson.so:devel/qjson@qt4 \ libtag.so:audio/taglib \ libyaz.so:net/yaz diff --git a/net/kitinerary/Makefile b/net/kitinerary/Makefile index cc5d2f37a20d..d77bf7c4fdd7 100644 --- a/net/kitinerary/Makefile +++ b/net/kitinerary/Makefile @@ -2,6 +2,7 @@ PORTNAME= kitinerary DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/print/Makefile b/print/Makefile index 2130359be809..f62d76f01857 100644 --- a/print/Makefile +++ b/print/Makefile @@ -60,7 +60,6 @@ SUBDIR += fpdf SUBDIR += freetype SUBDIR += freetype2 - SUBDIR += frescobaldi SUBDIR += ft2demos SUBDIR += ghostscript7-base SUBDIR += ghostscript7-commfont diff --git a/print/frescobaldi/Makefile b/print/frescobaldi/Makefile deleted file mode 100644 index 8dad5cc30497..000000000000 --- a/print/frescobaldi/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Created by: martin.dieringer@gmx.de -# $FreeBSD$ - -PORTNAME= frescobaldi -DISTVERSIONPREFIX= v -DISTVERSION= 2.20.0 -PORTREVISION= 3 -CATEGORIES= print kde - -MAINTAINER= martin.dieringer@gmx.de -COMMENT= Music score editor for lilypond - -LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= KDE4 is end-of-life, upgrade this port to version 3.0.0 -EXPIRATION_DATE=2018-12-31 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR} - -USES= gettext kde:4 python:2.7 desktop-file-utils -USE_GITHUB= yes -GH_ACCOUNT= wbsoft -USE_KDE= kdelibs pykde4_build pykde4_run -USE_PYTHON= distutils autoplist optsuffix - -INSTALLS_ICONS= yes -NO_ARCH= yes - -OPTIONS_DEFINE= LILYPOND - -LILYPOND_DESC= Use unstable LilyPond (lilypond-devel) - -LILYPOND_RUN_DEPENDS= lilypond:print/lilypond-devel -LILYPOND_RUN_DEPENDS_OFF= lilypond:print/lilypond - -post-patch: - @${REINPLACE_CMD} -e 's|'share/man/man1'|'man/man1'|' \ - ${WRKSRC}/setup.py - -.include <bsd.port.mk> diff --git a/print/frescobaldi/distinfo b/print/frescobaldi/distinfo deleted file mode 100644 index 193b976cf7e7..000000000000 --- a/print/frescobaldi/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1487410650 -SHA256 (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 4e0bc5f371724b6c409fe5b8cbd61d05c7ca0c740c608806f09a245dae336de6 -SIZE (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 7379468 diff --git a/print/frescobaldi/pkg-descr b/print/frescobaldi/pkg-descr deleted file mode 100644 index c016bbcdae2e..000000000000 --- a/print/frescobaldi/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Frescobaldi is a LilyPond sheet music text editor for KDE4. It aims to be -powerful, yet lightweight and easy to use. Frescobaldi is Free Software, -available under the GNU General Public License (version 2 or later). - -WWW: http://www.frescobaldi.org/ diff --git a/print/pdf-tools/Makefile b/print/pdf-tools/Makefile index d13a2885a736..7d6b04c8b798 100644 --- a/print/pdf-tools/Makefile +++ b/print/pdf-tools/Makefile @@ -4,6 +4,7 @@ PORTNAME= pdf-tools DISTVERSIONPREFIX= v DISTVERSION= 0.80-133 DISTVERSIONSUFFIX= -gb6c0e4f +PORTREVISION= 1 CATEGORIES= print elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/print/pdf-tools/files/patch-server_poppler-hack.cc b/print/pdf-tools/files/patch-server_poppler-hack.cc new file mode 100644 index 000000000000..dde0d3f4a525 --- /dev/null +++ b/print/pdf-tools/files/patch-server_poppler-hack.cc @@ -0,0 +1,11 @@ +--- server/poppler-hack.cc.orig 2018-12-09 09:39:37 UTC ++++ server/poppler-hack.cc +@@ -62,7 +62,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONS + return NULL; + + if (s->hasUnicodeMarker()) { +- result = g_convert (s->getCString () + 2, ++ result = g_convert (s->c_str () + 2, + s->getLength () - 2, + "UTF-8", "UTF-16BE", NULL, NULL, NULL); + } else { diff --git a/print/qpdfview/Makefile b/print/qpdfview/Makefile index 4a7bea5ca8f1..b9a28af8d716 100644 --- a/print/qpdfview/Makefile +++ b/print/qpdfview/Makefile @@ -3,7 +3,7 @@ PORTNAME= qpdfview DISTVERSION= 0.4.17beta1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= https://launchpadlibrarian.net/294276875/ \ https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION}/+download/ @@ -14,19 +14,20 @@ COMMENT= Tabbed DjVu/PDF/PS document viewer LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake +LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 + +USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake qt:5 USE_LDCONFIG= yes +USE_QT= buildtools_build concurrent imageformats linguisttools printsupport sql sql-sqlite3 svg xml QMAKE_SOURCE_PATH= ${PORTNAME}.pro DATADIR= ${PREFIX}/share/${PORTNAME} -OPTIONS_SINGLE= TOOLKITS -OPTIONS_SINGLE_TOOLKITS= QT4 QT5 OPTIONS_DEFINE= CUPS OPTIONS_MULTI= BACKEND OPTIONS_MULTI_BACKEND= DJVU PS BACKEND_DESC= Additional documents support -OPTIONS_DEFAULT= QT5 CUPS PS +OPTIONS_DEFAULT= CUPS PS OPTIONS_SUB= yes CUPS_QMAKE_OFF= "CONFIG+=without_cups" @@ -35,14 +36,6 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre DJVU_QMAKE_OFF= "CONFIG+=without_djvu" -QT4_USES= qt:4 -QT4_USE= qt=dbus,gui,imageformats,linguisttools,moc_build,rcc_build,sql,sql-sqlite3,svg,xml -QT4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 - -QT5_USES= qt:5 -QT5_USE= qt=buildtools_build,concurrent,imageformats,linguisttools,printsupport,sql,sql-sqlite3,svg,xml -QT5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5 - PS_LIB_DEPENDS= libspectre.so:print/libspectre PS_QMAKE_OFF= "CONFIG+=without_ps" diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index e46133f7a960..a1493c8e0a11 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= scribus PORTVERSION= 1.5.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print editors MASTER_SITES= SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -36,17 +36,21 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libharfbuzz.so:print/harfbuzz \ libicuuc.so:devel/icu -USES= cmake:outsource desktop-file-utils jpeg pkgconfig python qt:5 shared-mime-info ssl tar:xz +USES= cmake:outsource desktop-file-utils dos2unix jpeg pkgconfig python qt:5 shared-mime-info ssl tar:xz USE_QT= buildtools_build core declarative gui linguisttools_build network opengl \ printsupport qmake_build widgets xml USE_GNOME= libxml2 INSTALLS_ICONS= yes USE_LDCONFIG= yes -CMAKE_ARGS+= -DWANT_HUNSPELL=YES -Wno-ferror-limit +CMAKE_ARGS+= -DWANT_HUNSPELL=YES -Wno-ferror-limit -DCMAKE_COLOR_MAKEFILE:BOOL=ON OPTIONS_DEFINE= DOCS +DOS2UNIX_FILE= scribus/plugins/import/pdf/importpdf.cpp \ + scribus/plugins/import/pdf/slaoutput.cpp \ + scribus/plugins/import/pdf/slaoutput.h + post-install: ${LN} -sf ../share/icons/1_5_1/scribus.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp new file mode 100644 index 000000000000..943d3b6cfed8 --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp @@ -0,0 +1,150 @@ +--- scribus/plugins/import/pdf/importpdf.cpp.orig 2018-12-11 12:42:54 UTC ++++ scribus/plugins/import/pdf/importpdf.cpp +@@ -87,7 +87,7 @@ QImage PdfPlug::readThumbnail(QString fName) + #else + GooString *fname = new GooString(QFile::encodeName(pdfFile).data()); + #endif +- globalParams->setErrQuiet(gTrue); ++ globalParams->setErrQuiet(true); + PDFDoc *pdfDoc = new PDFDoc(fname, NULL, NULL, NULL); + if (pdfDoc) + { +@@ -108,11 +108,11 @@ QImage PdfPlug::readThumbnail(QString fName) + bgColor[0] = 255; + bgColor[1] = 255; + bgColor[2] = 255; +- SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, gFalse, bgColor, gTrue); +- dev->setVectorAntialias(gTrue); +- dev->setFreeTypeHinting(gTrue, gFalse); ++ SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, false, bgColor, true); ++ dev->setVectorAntialias(true); ++ dev->setFreeTypeHinting(true, false); + dev->startDoc(pdfDoc); +- pdfDoc->displayPage(dev, 1, hDPI, vDPI, 0, gTrue, gFalse, gFalse); ++ pdfDoc->displayPage(dev, 1, hDPI, vDPI, 0, true, false, false); + SplashBitmap *bitmap = dev->getBitmap(); + int bw = bitmap->getWidth(); + int bh = bitmap->getHeight(); +@@ -410,10 +410,10 @@ bool PdfPlug::convert(const QString& fn) + #else + GooString *fname = new GooString(QFile::encodeName(fn).data()); + #endif +- globalParams->setErrQuiet(gTrue); +- GBool hasOcg = gFalse; ++ globalParams->setErrQuiet(true); ++ bool hasOcg = false; + QList<OptionalContentGroup*> ocgGroups; +-// globalParams->setPrintCommands(gTrue); ++// globalParams->setPrintCommands(true); + PDFDoc *pdfDoc = new PDFDoc(fname, NULL, NULL, NULL); + if (pdfDoc) + { +@@ -458,10 +458,10 @@ bool PdfPlug::convert(const QString& fn) + double vDPI = 72.0; + int firstPage = 1; + int lastPage = pdfDoc->getNumPages(); +- GBool useMediaBox = gTrue; +- GBool crop = gTrue; +- GBool printing = gFalse; +- PDFRectangle *mediaBox = pdfDoc->getPage(1)->getMediaBox(); ++ bool useMediaBox = true; ++ bool crop = true; ++ bool printing = false; ++ const PDFRectangle *mediaBox = pdfDoc->getPage(1)->getMediaBox(); + QRectF mediaRect = QRectF(QPointF(mediaBox->x1, mediaBox->y1), QPointF(mediaBox->x2, mediaBox->y2)).normalized(); + bool boxesAreDifferent = false; + if (getCBox(Crop_Box, 1) != mediaRect) +@@ -497,7 +497,7 @@ bool PdfPlug::convert(const QString& fn) + if (!cropped) + crop = cropped; + if (contentRect != Media_Box) +- useMediaBox = gFalse; ++ useMediaBox = false; + /* if (cb > Media_Box) + { + cropped = true; +@@ -556,12 +556,10 @@ bool PdfPlug::convert(const QString& fn) + } + else + { +- GooList *ocgs; +- int i; +- ocgs = ocg->getOCGs (); +- for (i = 0; i < ocgs->getLength (); ++i) ++ const auto& ocgs = ocg->getOCGs (); ++ for (const auto& ocg : ocgs) + { +- OptionalContentGroup *oc = (OptionalContentGroup *)ocgs->get(i); ++ OptionalContentGroup *oc = ocg.second.get(); + QString ocgName = UnicodeParsedString(oc->getName()); + if (!ocgNames.contains(ocgName)) + { +@@ -574,12 +572,10 @@ bool PdfPlug::convert(const QString& fn) + } + else + { +- GooList *ocgs; +- int i; +- ocgs = ocg->getOCGs (); +- for (i = 0; i < ocgs->getLength (); ++i) ++ const auto& ocgs = ocg->getOCGs (); ++ for (const auto& ocg : ocgs) + { +- OptionalContentGroup *oc = (OptionalContentGroup *)ocgs->get(i); ++ OptionalContentGroup *oc = ocg.second.get(); + QString ocgName = UnicodeParsedString(oc->getName()); + if (!ocgNames.contains(ocgName)) + { +@@ -1018,11 +1014,11 @@ QImage PdfPlug::readPreview(int pgNum, int width, int + bgColor[0] = 255; + bgColor[1] = 255; + bgColor[2] = 255; +- SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, gFalse, bgColor, gTrue); +- dev->setVectorAntialias(gTrue); +- dev->setFreeTypeHinting(gTrue, gFalse); ++ SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, false, bgColor, true); ++ dev->setVectorAntialias(true); ++ dev->setFreeTypeHinting(true, false); + dev->startDoc(m_pdfDoc); +- m_pdfDoc->displayPage(dev, pgNum, hDPI, vDPI, 0, gTrue, gFalse, gFalse); ++ m_pdfDoc->displayPage(dev, pgNum, hDPI, vDPI, 0, true, false, false); + SplashBitmap *bitmap = dev->getBitmap(); + int bw = bitmap->getWidth(); + int bh = bitmap->getHeight(); +@@ -1066,7 +1062,7 @@ QImage PdfPlug::readPreview(int pgNum, int width, int + + QRectF PdfPlug::getCBox(int box, int pgNum) + { +- PDFRectangle *cBox = NULL; ++ const PDFRectangle *cBox = NULL; + if (box == Media_Box) + cBox = m_pdfDoc->getPage(pgNum)->getMediaBox(); + else if (box == Bleed_Box) +@@ -1081,23 +1077,23 @@ QRectF PdfPlug::getCBox(int box, int pgNum) + return cRect; + } + +-QString PdfPlug::UnicodeParsedString(GooString *s1) ++QString PdfPlug::UnicodeParsedString(const GooString *s1) + { + if ( !s1 || s1->getLength() == 0 ) + return QString(); +- GBool isUnicode; ++ bool isUnicode; + int i; + Unicode u; + QString result; + if ((s1->getChar(0) & 0xff) == 0xfe && (s1->getLength() > 1 && (s1->getChar(1) & 0xff) == 0xff)) + { +- isUnicode = gTrue; ++ isUnicode = true; + i = 2; + result.reserve((s1->getLength() - 2) / 2); + } + else + { +- isUnicode = gFalse; ++ isUnicode = false; + i = 0; + result.reserve(s1->getLength()); + } diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.h b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.h new file mode 100644 index 000000000000..13639019aaeb --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.h @@ -0,0 +1,11 @@ +--- scribus/plugins/import/pdf/importpdf.h.orig 2018-12-11 12:48:12 UTC ++++ scribus/plugins/import/pdf/importpdf.h +@@ -81,7 +81,7 @@ class PdfPlug : public QObject (public) + private: + bool convert(const QString& fn); + QRectF getCBox(int box, int pgNum); +- QString UnicodeParsedString(GooString *s1); ++ QString UnicodeParsedString(const GooString *s1); + + QList<PageItem*> Elements; + double baseX, baseY; diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp new file mode 100644 index 000000000000..f7762cbca03a --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp @@ -0,0 +1,823 @@ +--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2018-12-11 13:04:07 UTC ++++ scribus/plugins/import/pdf/slaoutput.cpp +@@ -44,7 +44,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj) + { + if (obj3.isName()) + { +- char *name = obj3.getName(); ++ const char *name = obj3.getName(); + if (!strcmp(name, "URL")) + { + obj2 = obj1.dictLookup("F"); +@@ -179,7 +179,7 @@ void AnoOutputDev::stroke(GfxState *state) + CurrColorStroke = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &shade); + } + +-void AnoOutputDev::drawString(GfxState *state, GooString *s) ++void AnoOutputDev::drawString(GfxState *state, const GooString *s) + { + int shade = 100; + CurrColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade); +@@ -189,7 +189,7 @@ void AnoOutputDev::drawString(GfxState *state, GooStri + m_itemText = s->copy(); + } + +-QString AnoOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int *shade) ++QString AnoOutputDev::getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade) + { + QString fNam; + QString namPrefix = "FromPDF"; +@@ -229,7 +229,7 @@ QString AnoOutputDev::getColor(GfxColorSpace *color_sp + else if (color_space->getMode() == csSeparation) + { + GfxCMYK cmyk; +- QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->getCString()); ++ QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->c_str()); + double Cc, Mc, Yc, Kc; + bool isRegistrationColor = (name == "All"); + if (!isRegistrationColor) +@@ -410,7 +410,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const + return linkAction; + } + +-GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data) ++bool SlaOutputDev::annotations_callback(Annot *annota, void *user_data) + { + SlaOutputDev *dev = (SlaOutputDev*)user_data; + PDFRectangle *box = annota->getRect(); +@@ -509,7 +509,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub + if (act->getKind() == actionGoTo) + { + LinkGoTo *gto = (LinkGoTo*)act; +- LinkDest *dst = gto->getDest(); ++ const LinkDest *dst = gto->getDest(); + if (dst) + { + if (dst->getKind() == destXYZ) +@@ -528,10 +528,10 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub + } + else + { +- GooString *ndst = gto->getNamedDest(); ++ const GooString *ndst = gto->getNamedDest(); + if (ndst) + { +- LinkDest *dstn = pdfDoc->findDest(ndst); ++ const LinkDest *dstn = pdfDoc->findDest(ndst); + if (dstn) + { + if (dstn->getKind() == destXYZ) +@@ -555,7 +555,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub + { + LinkGoToR *gto = (LinkGoToR*)act; + fileName = UnicodeParsedString(gto->getFileName()); +- LinkDest *dst = gto->getDest(); ++ const LinkDest *dst = gto->getDest(); + if (dst) + { + if (dst->getKind() == destXYZ) +@@ -568,10 +568,10 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub + } + else + { +- GooString *ndst = gto->getNamedDest(); ++ const GooString *ndst = gto->getNamedDest(); + if (ndst) + { +- LinkDest *dstn = pdfDoc->findDest(ndst); ++ const LinkDest *dstn = pdfDoc->findDest(ndst); + if (dstn) + { + if (dstn->getKind() == destXYZ) +@@ -709,7 +709,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, do + bool bgFound = false; + if (achar) + { +- AnnotColor *bgCol = achar->getBackColor(); ++ const AnnotColor *bgCol = achar->getBackColor(); + if (bgCol) + { + bgFound = true; +@@ -717,7 +717,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, do + } + else + CurrColorFill = CommonStrings::None; +- AnnotColor *fgCol = achar->getBorderColor(); ++ const AnnotColor *fgCol = achar->getBorderColor(); + if (fgCol) + { + fgFound = true; +@@ -1054,7 +1054,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW + int xco = 0; + int yco = 0; + LinkGoTo *gto = (LinkGoTo*)Lact; +- LinkDest *dst = gto->getDest(); ++ const LinkDest *dst = gto->getDest(); + if (dst) + { + if (dst->getKind() == destXYZ) +@@ -1075,10 +1075,10 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW + } + else + { +- GooString *ndst = gto->getNamedDest(); ++ const GooString *ndst = gto->getNamedDest(); + if (ndst) + { +- LinkDest *dstn = pdfDoc->findDest(ndst); ++ const LinkDest *dstn = pdfDoc->findDest(ndst); + if (dstn) + { + if (dstn->getKind() == destXYZ) +@@ -1107,7 +1107,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW + int yco = 0; + LinkGoToR *gto = (LinkGoToR*)Lact; + QString fileName = UnicodeParsedString(gto->getFileName()); +- LinkDest *dst = gto->getDest(); ++ const LinkDest *dst = gto->getDest(); + if (dst) + { + if (dst->getKind() == destXYZ) +@@ -1123,10 +1123,10 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW + } + else + { +- GooString *ndst = gto->getNamedDest(); ++ const GooString *ndst = gto->getNamedDest(); + if (ndst) + { +- LinkDest *dstn = pdfDoc->findDest(ndst); ++ const LinkDest *dstn = pdfDoc->findDest(ndst); + if (dstn) + { + if (dstn->getKind() == destXYZ) +@@ -1462,7 +1462,7 @@ void SlaOutputDev::restoreState(GfxState *state) + m_currentClipPath = m_clipPaths.pop(); + } + +-void SlaOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, GBool isolated, GBool knockout, GBool forSoftMask) ++void SlaOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, bool isolated, bool knockout, bool forSoftMask) + { + pushGroup("", forSoftMask); + m_groupStack.top().isolated = isolated; +@@ -1562,7 +1562,7 @@ void SlaOutputDev::endTransparencyGroup(GfxState *stat + } + } + +-void SlaOutputDev::setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool alpha, Function *transferFunc, GfxColor * /*backdropColor*/) ++void SlaOutputDev::setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool alpha, Function *transferFunc, GfxColor * /*backdropColor*/) + { + if (m_groupStack.count() != 0) + { +@@ -1604,8 +1604,7 @@ void SlaOutputDev::updateStrokeColor(GfxState *state) + void SlaOutputDev::clip(GfxState *state) + { + // qDebug() << "Clip"; +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + QString output = convertPath(state->getPath()); + FPointArray out; +@@ -1641,8 +1640,7 @@ void SlaOutputDev::clip(GfxState *state) + void SlaOutputDev::eoClip(GfxState *state) + { + // qDebug() << "EoClip"; +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + QString output = convertPath(state->getPath()); + FPointArray out; +@@ -1678,7 +1676,7 @@ void SlaOutputDev::eoClip(GfxState *state) + void SlaOutputDev::stroke(GfxState *state) + { + // qDebug() << "Stroke"; +- double *ctm; ++ const double *ctm; + ctm = state->getCTM(); + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); +@@ -1770,7 +1768,7 @@ void SlaOutputDev::stroke(GfxState *state) + void SlaOutputDev::fill(GfxState *state) + { + // qDebug() << "Fill"; +- double *ctm; ++ const double *ctm; + ctm = state->getCTM(); + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); +@@ -1815,7 +1813,7 @@ void SlaOutputDev::fill(GfxState *state) + void SlaOutputDev::eoFill(GfxState *state) + { + // qDebug() << "EoFill"; +- double *ctm; ++ const double *ctm; + ctm = state->getCTM(); + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); +@@ -1857,21 +1855,21 @@ void SlaOutputDev::eoFill(GfxState *state) + } + } + +-GBool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) ++bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) + { + double GrStartX; + double GrStartY; + double GrEndX; + double GrEndY; + int shade = 100; +- Function *func = shading->getFunc(0); ++ const Function *func = shading->getFunc(0); + VGradient FillGradient = VGradient(VGradient::linear); + FillGradient.clearStops(); + GfxColorSpace *color_space = shading->getColorSpace(); + if (func->getType() == 3) + { + StitchingFunction *stitchingFunc = (StitchingFunction*)func; +- double *bounds = stitchingFunc->getBounds(); ++ const double *bounds = stitchingFunc->getBounds(); + int num_funcs = stitchingFunc->getNumFuncs(); + // Add stops from all the stitched functions + for ( int i = 0 ; i < num_funcs ; i++ ) +@@ -1905,8 +1903,7 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, G + state->getClipBBox(&xmin, &ymin, &xmax, &ymax); + QRectF crect = QRectF(QPointF(xmin, ymin), QPointF(xmax, ymax)); + crect = crect.normalized(); +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + FPointArray gr; + gr.addPoint(GrStartX, GrStartY); +@@ -1965,24 +1962,24 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, G + m_groupStack.top().Items.append(ite); + applyMask(ite); + } +- return gTrue; ++ return true; + } + +-GBool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) ++bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax) + { + double GrStartX; + double GrStartY; + double GrEndX; + double GrEndY; + int shade = 100; +- Function *func = shading->getFunc(0); ++ const Function *func = shading->getFunc(0); + VGradient FillGradient = VGradient(VGradient::linear); + FillGradient.clearStops(); + GfxColorSpace *color_space = shading->getColorSpace(); + if (func->getType() == 3) + { + StitchingFunction *stitchingFunc = (StitchingFunction*)func; +- double *bounds = stitchingFunc->getBounds(); ++ const double *bounds = stitchingFunc->getBounds(); + int num_funcs = stitchingFunc->getNumFuncs(); + // Add stops from all the stitched functions + for ( int i = 0 ; i < num_funcs ; i++ ) +@@ -2021,8 +2018,7 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, + double GrFocalY = y1; + GrEndX = GrFocalX + r1; + GrEndY = GrFocalY; +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + FPointArray gr; + gr.addPoint(GrStartX, GrStartY); +@@ -2084,10 +2080,10 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, + m_groupStack.top().Items.append(ite); + applyMask(ite); + } +- return gTrue; ++ return true; + } + +-GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) ++bool SlaOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading) + { + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); +@@ -2104,8 +2100,7 @@ GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState + output += QString("Z"); + pathIsClosed = true; + Coords = output; +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None); + PageItem* ite = m_doc->Items->at(z); +@@ -2164,10 +2159,10 @@ GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState + ite->meshGradientPatches.append(patchM); + } + ite->GrType = 12; +- return gTrue; ++ return true; + } + +-GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) ++bool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading) + { + // qDebug() << "mesh shaded fill"; + double xCoor = m_doc->currentPage()->xOffset(); +@@ -2185,8 +2180,7 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat + output += QString("Z"); + pathIsClosed = true; + Coords = output; +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None); + PageItem* ite = m_doc->Items->at(z); +@@ -2211,7 +2205,7 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat + for (int i = 0; i < shading->getNPatches(); i++) + { + int shade = 100; +- GfxPatch *patch = shading->getPatch(i); ++ const GfxPatch *patch = shading->getPatch(i); + GfxColor color; + meshGradientPatch patchM; + int u, v; +@@ -2314,18 +2308,18 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat + ite->meshGradientPatches.append(patchM); + } + ite->GrType = 12; +- return gTrue; ++ return true; + } + +-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) ++bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) + { + PDFRectangle box; + Gfx *gfx; + QString id; + PageItem *ite; + groupEntry gElements; +- gElements.forSoftMask = gFalse; +- gElements.alpha = gFalse; ++ gElements.forSoftMask = false; ++ gElements.alpha = false; + gElements.inverted = false; + gElements.maskName = ""; + gElements.Items.clear(); +@@ -2334,13 +2328,12 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, + width = bbox[2] - bbox[0]; + height = bbox[3] - bbox[1]; + if (xStep != width || yStep != height) +- return gFalse; ++ return false; + box.x1 = bbox[0]; + box.y1 = bbox[1]; + box.x2 = bbox[2]; + box.y2 = bbox[3]; +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + QTransform mm = QTransform(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]); + QTransform mmx = mm * m_ctm; +@@ -2437,10 +2430,10 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, + applyMask(ite); + } + delete gfx; +- return gTrue; ++ return true; + } + +-void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) ++void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg) + { + // qDebug() << "Draw Image Mask"; + QImage * image = 0; +@@ -2512,8 +2505,7 @@ void SlaOutputDev::drawImageMask(GfxState *state, Obje + t++; + } + } +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); + QRectF crect = QRectF(0, 0, width, height); +@@ -2605,8 +2597,8 @@ void SlaOutputDev::drawImageMask(GfxState *state, Obje + delete image; + } + +-void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, Stream *maskStr, int maskWidth, int maskHeight, +- GfxImageColorMap *maskColorMap, GBool maskInterpolate) ++void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, ++ GfxImageColorMap *maskColorMap, bool maskInterpolate) + { + // qDebug() << "Masked Image Components" << colorMap->getNumPixelComps(); + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); +@@ -2658,8 +2650,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state + t++; + } + } +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); + QRectF crect = QRectF(0, 0, width, height); +@@ -2750,7 +2741,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state + delete[] mbuffer; + } + +-void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert, GBool maskInterpolate) ++void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); +@@ -2808,8 +2799,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob + t++; + } + } +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); + QRectF crect = QRectF(0, 0, width, height); +@@ -2900,7 +2890,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob + delete[] mbuffer; + } + +-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) ++void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; +@@ -2973,8 +2963,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object * + delete image; + return; + } +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); + QRectF crect = QRectF(0, 0, width, height); +@@ -3103,7 +3092,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object * + delete image; + } + +-void SlaOutputDev::beginMarkedContent(char *name, Object *dictRef) ++void SlaOutputDev::beginMarkedContent(const char *name, Object *dictRef) + { + mContent mSte; + mSte.name = QString(name); +@@ -3172,7 +3161,7 @@ void SlaOutputDev::beginMarkedContent(char *name, Obje + m_mcStack.push(mSte); + } + +-void SlaOutputDev::beginMarkedContent(char *name, Dict *properties) ++void SlaOutputDev::beginMarkedContent(const char *name, Dict *properties) + { + // qDebug() << "Begin Marked Content with Name " << QString(name); + QString nam = QString(name); +@@ -3190,13 +3179,13 @@ void SlaOutputDev::beginMarkedContent(char *name, Dict + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0) + Object obj = properties->lookup((char*) "Title"); + if (obj.isString()) +- lName = QString(obj.getString()->getCString()); ++ lName = QString(obj.getString()->c_str()); + #else + Object obj; + if (properties->lookup((char*)"Title", &obj)) + { + if (obj.isString()) +- lName = QString(obj.getString()->getCString()); ++ lName = QString(obj.getString()->c_str()); + obj.free(); + } + #endif +@@ -3299,12 +3288,12 @@ void SlaOutputDev::endMarkedContent(GfxState *state) + } + } + +-void SlaOutputDev::markPoint(char *name) ++void SlaOutputDev::markPoint(const char *name) + { + // qDebug() << "Begin Marked Point with Name " << QString(name); + } + +-void SlaOutputDev::markPoint(char *name, Dict *properties) ++void SlaOutputDev::markPoint(const char *name, Dict *properties) + { + // qDebug() << "Begin Marked Point with Name " << QString(name) << "and Properties"; + beginMarkedContent(name, properties); +@@ -3326,7 +3315,7 @@ void SlaOutputDev::updateFont(GfxState *state) + char *tmpBuf; + int tmpBufLen = 0; + int *codeToGID; +- double *textMat; ++ const double *textMat; + double m11, m12, m21, m22, fontSize; + SplashCoord mat[4]; + int n = 0; +@@ -3355,7 +3344,7 @@ void SlaOutputDev::updateFont(GfxState *state) + + if (!(fontLoc = gfxFont->locateFont(xref, 0))) { + error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() ++ gfxFont->getName() ? gfxFont->getName()->c_str() + : "(unnamed)"); + goto err2; + } +@@ -3375,9 +3364,9 @@ void SlaOutputDev::updateFont(GfxState *state) + + fontsrc = new SplashFontSrc; + if (fileName) +- fontsrc->setFile(fileName, gFalse); ++ fontsrc->setFile(fileName, false); + else +- fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue); ++ fontsrc->setBuf(tmpBuf, tmpBufLen, true); + + // load the font file + switch (fontType) { +@@ -3388,7 +3377,7 @@ void SlaOutputDev::updateFont(GfxState *state) + (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() ++ gfxFont->getName() ? gfxFont->getName()->c_str() + : "(unnamed)"); + goto err2; + } +@@ -3400,7 +3389,7 @@ void SlaOutputDev::updateFont(GfxState *state) + (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() ++ gfxFont->getName() ? gfxFont->getName()->c_str() + : "(unnamed)"); + goto err2; + } +@@ -3412,7 +3401,7 @@ void SlaOutputDev::updateFont(GfxState *state) + (const char **)((Gfx8BitFont *)gfxFont)->getEncoding()))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() ++ gfxFont->getName() ? gfxFont->getName()->c_str() + : "(unnamed)"); + goto err2; + } +@@ -3420,7 +3409,7 @@ void SlaOutputDev::updateFont(GfxState *state) + case fontTrueType: + case fontTrueTypeOT: + if (fileName) +- ff = FoFiTrueType::load(fileName->getCString()); ++ ff = FoFiTrueType::load(fileName->c_str()); + else + ff = FoFiTrueType::make(tmpBuf, tmpBufLen); + if (ff) { +@@ -3437,7 +3426,7 @@ void SlaOutputDev::updateFont(GfxState *state) + codeToGID, n))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() ++ gfxFont->getName() ? gfxFont->getName()->c_str() + : "(unnamed)"); + goto err2; + } +@@ -3449,7 +3438,7 @@ void SlaOutputDev::updateFont(GfxState *state) + fontsrc))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() ++ gfxFont->getName() ? gfxFont->getName()->c_str() + : "(unnamed)"); + goto err2; + } +@@ -3470,7 +3459,7 @@ void SlaOutputDev::updateFont(GfxState *state) + codeToGID, n))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() ++ gfxFont->getName() ? gfxFont->getName()->c_str() + : "(unnamed)"); + goto err2; + } +@@ -3488,7 +3477,7 @@ void SlaOutputDev::updateFont(GfxState *state) + } + } else { + if (fileName) +- ff = FoFiTrueType::load(fileName->getCString()); ++ ff = FoFiTrueType::load(fileName->c_str()); + else + ff = FoFiTrueType::make(tmpBuf, tmpBufLen); + if (! ff) +@@ -3502,7 +3491,7 @@ void SlaOutputDev::updateFont(GfxState *state) + codeToGID, n, faceIndex))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +- gfxFont->getName() ? gfxFont->getName()->getCString() ++ gfxFont->getName() ? gfxFont->getName()->c_str() + : "(unnamed)"); + goto err2; + } +@@ -3604,7 +3593,7 @@ void SlaOutputDev::updateFont(GfxState *state) + } + if (!dfp) + { +- // error(-1, "Couldn't find a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ // error(-1, "Couldn't find a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + switch (dfp->kind) +@@ -3622,37 +3611,37 @@ void SlaOutputDev::updateFont(GfxState *state) + } + fontsrc = new SplashFontSrc; + if (fileName) +- fontsrc->setFile(fileName, gFalse); ++ fontsrc->setFile(fileName, false); + else +- fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue); ++ fontsrc->setBuf(tmpBuf, tmpBufLen, true); + // load the font file + switch (fontType) + { + case fontType1: + if (!(fontFile = m_fontEngine->loadType1Font( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding()))) + { +- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + break; + case fontType1C: + if (!(fontFile = m_fontEngine->loadType1CFont( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding()))) + { +- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + break; + case fontType1COT: + if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding()))) + { +- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + break; + case fontTrueType: + case fontTrueTypeOT: + if (fileName) +- ff = FoFiTrueType::load(fileName->getCString()); ++ ff = FoFiTrueType::load(fileName->c_str()); + else + ff = FoFiTrueType::make(tmpBuf, tmpBufLen); + if (ff) +@@ -3668,7 +3657,7 @@ void SlaOutputDev::updateFont(GfxState *state) + } + if (!(fontFile = m_fontEngine->loadTrueTypeFont( id, fontsrc, codeToGID, n))) + { +- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + break; +@@ -3676,14 +3665,14 @@ void SlaOutputDev::updateFont(GfxState *state) + case fontCIDType0C: + if (!(fontFile = m_fontEngine->loadCIDFont( id, fontsrc))) + { +- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + break; + case fontCIDType0COT: + if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont( id, fontsrc))) + { +- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + break; +@@ -3703,7 +3692,7 @@ void SlaOutputDev::updateFont(GfxState *state) + else + { + if (fileName) +- ff = FoFiTrueType::load(fileName->getCString()); ++ ff = FoFiTrueType::load(fileName->c_str()); + else + ff = FoFiTrueType::make(tmpBuf, tmpBufLen); + if (!ff) +@@ -3713,7 +3702,7 @@ void SlaOutputDev::updateFont(GfxState *state) + } + if (!(fontFile = m_fontEngine->loadTrueTypeFont( id, fontsrc, codeToGID, n, faceIndex))) + { +- // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)"); ++ // error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); + goto err2; + } + break; +@@ -3793,8 +3782,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, + if (f & splashPathLast) + qPath.closeSubpath(); + } +- double *ctm; +- ctm = state->getCTM(); ++ const double *ctm = state->getCTM(); + m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); + double xCoor = m_doc->currentPage()->xOffset(); + double yCoor = m_doc->currentPage()->yOffset(); +@@ -3842,19 +3830,19 @@ void SlaOutputDev::drawChar(GfxState *state, double x, + } + } + +-GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) ++bool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) + { + // qDebug() << "beginType3Char"; + GfxFont *gfxFont; + if (!(gfxFont = state->getFont())) +- return gTrue; ++ return true; + if (gfxFont->getType() != fontType3) +- return gTrue; ++ return true; + F3Entry f3e; + f3e.colored = false; + m_F3Stack.push(f3e); + pushGroup(); +- return gFalse; ++ return false; + } + + void SlaOutputDev::endType3Char(GfxState *state) +@@ -3948,7 +3936,7 @@ void SlaOutputDev::endTextObject(GfxState *state) + } + } + +-QString SlaOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int *shade) ++QString SlaOutputDev::getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade) + { + QString fNam; + QString namPrefix = "FromPDF"; +@@ -3993,7 +3981,7 @@ QString SlaOutputDev::getColor(GfxColorSpace *color_sp + else if (color_space->getMode() == csSeparation) + { + GfxCMYK cmyk; +- QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->getCString()); ++ QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->c_str()); + double Cc, Mc, Yc, Kc; + bool isRegistrationColor = (name == "All"); + if (!isRegistrationColor) +@@ -4032,7 +4020,7 @@ QString SlaOutputDev::getColor(GfxColorSpace *color_sp + return fNam; + } + +-QString SlaOutputDev::getAnnotationColor(AnnotColor *color) ++QString SlaOutputDev::getAnnotationColor(const AnnotColor *color) + { + QString fNam; + QString namPrefix = "FromPDF"; +@@ -4242,7 +4230,7 @@ void SlaOutputDev::applyMask(PageItem *ite) + } + } + +-void SlaOutputDev::pushGroup(QString maskName, GBool forSoftMask, GBool alpha, bool inverted) ++void SlaOutputDev::pushGroup(QString maskName, bool forSoftMask, bool alpha, bool inverted) + { + groupEntry gElements; + gElements.forSoftMask = forSoftMask; +@@ -4252,23 +4240,23 @@ void SlaOutputDev::pushGroup(QString maskName, GBool f + m_groupStack.push(gElements); + } + +-QString SlaOutputDev::UnicodeParsedString(GooString *s1) ++QString SlaOutputDev::UnicodeParsedString(const GooString *s1) + { + if ( !s1 || s1->getLength() == 0 ) + return QString(); +- GBool isUnicode; ++ bool isUnicode; + int i; + Unicode u; + QString result; + if ((s1->getChar(0) & 0xff) == 0xfe && (s1->getLength() > 1 && (s1->getChar(1) & 0xff) == 0xff)) + { +- isUnicode = gTrue; ++ isUnicode = true; + i = 2; + result.reserve((s1->getLength() - 2) / 2); + } + else + { +- isUnicode = gFalse; ++ isUnicode = false; + i = 0; + result.reserve(s1->getLength()); + } diff --git a/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h new file mode 100644 index 000000000000..fce11994c7e5 --- /dev/null +++ b/print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h @@ -0,0 +1,240 @@ +--- scribus/plugins/import/pdf/slaoutput.h.orig 2018-12-11 13:04:07 UTC ++++ scribus/plugins/import/pdf/slaoutput.h +@@ -61,9 +61,9 @@ class LinkSubmitForm: public LinkAction (public) + // Destructor. + virtual ~LinkSubmitForm(); + // Was the LinkImportData created successfully? +- virtual GBool isOk() { return fileName != NULL; } ++ virtual bool isOk() const { return fileName != NULL; } + // Accessors. +- virtual LinkActionKind getKind() { return actionUnknown; } ++ virtual LinkActionKind getKind() const { return actionUnknown; } + GooString *getFileName() { return fileName; } + int getFlags() { return m_flags; } + private: +@@ -83,9 +83,9 @@ class LinkImportData: public LinkAction (public) + // Destructor. + virtual ~LinkImportData(); + // Was the LinkImportData created successfully? +- virtual GBool isOk() { return fileName != NULL; } ++ virtual bool isOk() const { return fileName != NULL; } + // Accessors. +- virtual LinkActionKind getKind() { return actionUnknown; } ++ virtual LinkActionKind getKind() const { return actionUnknown; } + GooString *getFileName() { return fileName; } + private: + GooString *fileName; // file name +@@ -98,9 +98,9 @@ class SplashOutFontFileID: public SplashFontFileID + { + public: + +- SplashOutFontFileID(Ref *rA) { r = *rA; } ++ SplashOutFontFileID(const Ref *rA) { r = *rA; } + ~SplashOutFontFileID() {} +- GBool matches(SplashFontFileID *id) ++ bool matches(SplashFontFileID *id) + { + return ((SplashOutFontFileID *)id)->r.num == r.num && ((SplashOutFontFileID *)id)->r.gen == r.gen; + } +@@ -115,18 +115,18 @@ class AnoOutputDev : public OutputDev + public: + AnoOutputDev(ScribusDoc* doc, QStringList *importedColors); + virtual ~AnoOutputDev(); +- GBool isOk() { return gTrue; } +- virtual GBool upsideDown() { return gTrue; } +- virtual GBool useDrawChar() { return gFalse; } +- virtual GBool interpretType3Chars() { return gFalse; } +- virtual GBool useTilingPatternFill() { return gFalse; } +- virtual GBool useShadedFills(int type) { return gFalse; } +- virtual GBool useFillColorStop() { return gFalse; } +- virtual GBool useDrawForm() { return gFalse; } ++ bool isOk() { return true; } ++ virtual bool upsideDown() { return true; } ++ virtual bool useDrawChar() { return false; } ++ virtual bool interpretType3Chars() { return false; } ++ virtual bool useTilingPatternFill() { return false; } ++ virtual bool useShadedFills(int type) { return false; } ++ virtual bool useFillColorStop() { return false; } ++ virtual bool useDrawForm() { return false; } + virtual void stroke(GfxState *state); + virtual void eoFill(GfxState *state); + virtual void fill(GfxState *state); +- virtual void drawString(GfxState *state, GooString *s); ++ virtual void drawString(GfxState *state, const GooString *s); + + QString CurrColorText; + QString CurrColorFill; +@@ -135,7 +135,7 @@ class AnoOutputDev : public OutputDev + GooString *m_fontName; + GooString *m_itemText; + private: +- QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade); ++ QString getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade); + ScribusDoc* m_doc; + QStringList *m_importedColors; + }; +@@ -148,7 +148,7 @@ class SlaOutputDev : public OutputDev (public) + virtual ~SlaOutputDev(); + LinkAction* SC_getAction(AnnotWidget *ano); + LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano); +- static GBool annotations_callback(Annot *annota, void *user_data); ++ static bool annotations_callback(Annot *annota, void *user_data); + bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double width, double height); + bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double width, double height); + bool handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, double width, double height); +@@ -156,15 +156,15 @@ class SlaOutputDev : public OutputDev (public) + void handleActions(PageItem* ite, AnnotWidget *ano); + void startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA); + +- GBool isOk() { return gTrue; } +- virtual GBool upsideDown() { return gTrue; } +- virtual GBool useDrawChar() { return gTrue; } +- virtual GBool interpretType3Chars() { return gTrue; } +- virtual GBool useTilingPatternFill() { return gTrue; } +- virtual GBool useShadedFills(int type) { return type <= 7; } +- virtual GBool useFillColorStop() { return gTrue; } +- virtual GBool useDrawForm() { return gFalse; } +-// virtual GBool needClipToCropBox() { return gTrue; } ++ bool isOk() { return true; } ++ virtual bool upsideDown() { return true; } ++ virtual bool useDrawChar() { return true; } ++ virtual bool interpretType3Chars() { return true; } ++ virtual bool useTilingPatternFill() { return true; } ++ virtual bool useShadedFills(int type) { return type <= 7; } ++ virtual bool useFillColorStop() { return true; } ++ virtual bool useDrawForm() { return false; } ++// virtual bool needClipToCropBox() { return true; } + virtual void startPage(int pageNum, GfxState *, XRef *); + virtual void endPage(); + // graphics state +@@ -175,30 +175,30 @@ class SlaOutputDev : public OutputDev (public) + virtual void stroke(GfxState *state); + virtual void fill(GfxState *state); + virtual void eoFill(GfxState *state); +- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep); +- virtual GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) { qDebug() << "Function Shaded Fill"; return gFalse; } +- virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax); +- virtual GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); } +- virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax); +- virtual GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); } +- virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading); +- virtual GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading); ++ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep); ++ virtual bool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) { qDebug() << "Function Shaded Fill"; return false; } ++ virtual bool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax); ++ virtual bool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); } ++ virtual bool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax); ++ virtual bool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); } ++ virtual bool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading); ++ virtual bool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading); + //----- path clipping + virtual void clip(GfxState *state); + virtual void eoClip(GfxState *state); + virtual void clipToStrokePath(GfxState * /*state*/) { qDebug() << "Clip to StrokePath"; } +- virtual GBool deviceHasTextClip(GfxState *state) { return gFalse; } ++ virtual bool deviceHasTextClip(GfxState *state) { return false; } + + // If current colorspace is pattern, + // does this device support text in pattern colorspace? +- virtual GBool supportTextCSPattern(GfxState *state) ++ virtual bool supportTextCSPattern(GfxState *state) + { + return state->getFillColorSpace()->getMode() == csPattern; + } + + // If current colorspace is pattern, + // need this device special handling for masks in pattern colorspace? +- virtual GBool fillMaskCSPattern(GfxState * state) ++ virtual bool fillMaskCSPattern(GfxState * state) + { + return state->getFillColorSpace()->getMode() == csPattern; + } +@@ -206,36 +206,36 @@ class SlaOutputDev : public OutputDev (public) + virtual void endMaskClip(GfxState *state) { qDebug() << "End Mask Clip"; } + + //----- grouping operators +- virtual void beginMarkedContent(char *name, Dict *properties); +- virtual void beginMarkedContent(char *name, Object *dictRef); ++ virtual void beginMarkedContent(const char *name, Dict *properties); ++ virtual void beginMarkedContent(const char *name, Object *dictRef); + virtual void endMarkedContent(GfxState *state); +- virtual void markPoint(char *name); +- virtual void markPoint(char *name, Dict *properties); ++ virtual void markPoint(const char *name); ++ virtual void markPoint(const char *name, Dict *properties); + //----- image drawing +- virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg); +- virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg); ++ virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg); ++ virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg); + virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, +- GBool interpolate, ++ bool interpolate, + Stream *maskStr, + int maskWidth, int maskHeight, + GfxImageColorMap *maskColorMap, +- GBool maskInterpolate); ++ bool maskInterpolate); + + virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, +- GBool interpolate, ++ bool interpolate, + Stream *maskStr, + int maskWidth, int maskHeight, +- GBool maskInvert, GBool maskInterpolate); // { qDebug() << "Draw Masked Image"; } ++ bool maskInvert, bool maskInterpolate); // { qDebug() << "Draw Masked Image"; } + + //----- transparency groups and soft masks +- virtual void beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, GBool /*isolated*/, GBool /*knockout*/, GBool /*forSoftMask*/); ++ virtual void beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/); + virtual void paintTransparencyGroup(GfxState *state, double *bbox); + virtual void endTransparencyGroup(GfxState *state); +- virtual void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/); ++ virtual void setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/); + virtual void clearSoftMask(GfxState * /*state*/); + + virtual void updateFillColor(GfxState *state); +@@ -245,7 +245,7 @@ class SlaOutputDev : public OutputDev (public) + virtual void beginTextObject(GfxState *state); + virtual void endTextObject(GfxState *state); + virtual void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/); +- virtual GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/); ++ virtual bool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/); + virtual void endType3Char(GfxState * /*state*/); + virtual void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/); + virtual void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/); +@@ -260,13 +260,13 @@ class SlaOutputDev : public OutputDev (public) + + private: + void getPenState(GfxState *state); +- QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade); +- QString getAnnotationColor(AnnotColor *color); ++ QString getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade); ++ QString getAnnotationColor(const AnnotColor *color); + QString convertPath(GfxPath *path); + int getBlendMode(GfxState *state); + void applyMask(PageItem *ite); +- void pushGroup(QString maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); +- QString UnicodeParsedString(GooString *s1); ++ void pushGroup(QString maskName = "", bool forSoftMask = false, bool alpha = false, bool inverted = false); ++ QString UnicodeParsedString(const GooString *s1); + bool checkClip(); + bool pathIsClosed; + QString CurrColorFill; +@@ -283,9 +283,9 @@ class SlaOutputDev : public OutputDev (public) + struct groupEntry + { + QList<PageItem*> Items; +- GBool forSoftMask; +- GBool isolated; +- GBool alpha; ++ bool forSoftMask; ++ bool isolated; ++ bool alpha; + QString maskName; + bool inverted; + }; diff --git a/sysutils/kfilemetadata-kde4/Makefile b/sysutils/kfilemetadata-kde4/Makefile index 6f2fbfb47aee..33a53e1ac36c 100644 --- a/sysutils/kfilemetadata-kde4/Makefile +++ b/sysutils/kfilemetadata-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kfilemetadata PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= sysutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org @@ -11,8 +11,7 @@ COMMENT= Library for extracting file metadata DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ - libtag.so:audio/taglib \ +LIB_DEPENDS= libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libswscale.so:multimedia/ffmpeg \ libepub.so:textproc/ebook-tools \ diff --git a/sysutils/kfilemetadata-kde4/pkg-plist b/sysutils/kfilemetadata-kde4/pkg-plist index 6cd18a21ca71..803de48a4796 100644 --- a/sysutils/kfilemetadata-kde4/pkg-plist +++ b/sysutils/kfilemetadata-kde4/pkg-plist @@ -17,7 +17,6 @@ lib/kde4/kfilemetadata_odfextractor.so lib/kde4/kfilemetadata_office2007extractor.so lib/kde4/kfilemetadata_officeextractor.so lib/kde4/kfilemetadata_plaintextextractor.so -lib/kde4/kfilemetadata_popplerextractor.so lib/kde4/kfilemetadata_taglibextractor.so lib/libkfilemetadata.so lib/libkfilemetadata.so.4 @@ -30,6 +29,5 @@ share/kde4/services/kfilemetadata_odfextractor.desktop share/kde4/services/kfilemetadata_office2007extractor.desktop share/kde4/services/kfilemetadata_officeextractor.desktop share/kde4/services/kfilemetadata_plaintextextractor.desktop -share/kde4/services/kfilemetadata_popplerextractor.desktop share/kde4/services/kfilemetadata_taglibextractor.desktop share/kde4/servicetypes/kfilemetadataextractor.desktop diff --git a/sysutils/nepomuk-core-kde4/Makefile b/sysutils/nepomuk-core-kde4/Makefile index 7af6923cfcc3..bf3776fcb59f 100644 --- a/sysutils/nepomuk-core-kde4/Makefile +++ b/sysutils/nepomuk-core-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= nepomuk-core PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= sysutils kde kde-kde4 MAINTAINER= kde@FreeBSD.org @@ -12,8 +12,7 @@ COMMENT= Core Nepomuk system libraries and services for KDE DEPRECATED= KDE4 is EOL upstream EXPIRATION_DATE= 2018-12-31 -LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \ - libtag.so:audio/taglib \ +LIB_DEPENDS= libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libswscale.so:multimedia/ffmpeg \ libepub.so:textproc/ebook-tools \ diff --git a/sysutils/nepomuk-core-kde4/pkg-plist b/sysutils/nepomuk-core-kde4/pkg-plist index a157ec08c388..34fb01c2a690 100644 --- a/sysutils/nepomuk-core-kde4/pkg-plist +++ b/sysutils/nepomuk-core-kde4/pkg-plist @@ -129,7 +129,6 @@ lib/kde4/nepomukodfextractor.so lib/kde4/nepomukoffice2007extractor.so lib/kde4/nepomukofficeextractor.so lib/kde4/nepomukplaintextextractor.so -lib/kde4/nepomukpopplerextractor.so lib/kde4/nepomuktaglibextractor.so lib/libkdeinit4_nepomukserver.so lib/libnepomukcleaner.so @@ -173,7 +172,6 @@ share/kde4/services/nepomukoffice2007extractor.desktop share/kde4/services/nepomukofficeextractor.desktop share/kde4/services/nepomukontologyloader.desktop share/kde4/services/nepomukplaintextextractor.desktop -share/kde4/services/nepomukpopplerextractor.desktop share/kde4/services/nepomukqueryservice.desktop share/kde4/services/nepomukremovablestorageservice.desktop share/kde4/services/nepomukstorage.desktop diff --git a/textproc/pdfgrep/Makefile b/textproc/pdfgrep/Makefile index a8497b027364..c2aeea7b9197 100644 --- a/textproc/pdfgrep/Makefile +++ b/textproc/pdfgrep/Makefile @@ -3,6 +3,7 @@ PORTNAME= pdfgrep PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= https://pdfgrep.org/download/ diff --git a/x11/leechcraft/Makefile b/x11/leechcraft/Makefile index 33d8ada7446d..f99cc3d8fc2f 100644 --- a/x11/leechcraft/Makefile +++ b/x11/leechcraft/Makefile @@ -3,7 +3,7 @@ PORTNAME= leechcraft PORTVERSION= 0.6.70 -PORTREVISION= 37 +PORTREVISION= 38 CATEGORIES= x11 MASTER_SITES= http://dist.leechcraft.org/LeechCraft/0.6.70/ @@ -28,9 +28,10 @@ USE_QT= corelib declarative gui network script sql sql-sqlite3_run \ webkit xml qmake_build moc_build rcc_build uic_build \ linguisttools_build USE_XORG= x11 -CMAKE_ARGS+= -DENABLE_LADS=OFF \ - -DENABLE_SYNCER=OFF \ - -DLEECHCRAFT_VERSION=${PORTVERSION} +CMAKE_OFF= ENABLE_LADS \ + ENABLE_SYNCER \ + ENABLE_MONOCLE +CMAKE_ARGS= -DLEECHCRAFT_VERSION=${PORTVERSION} WRKSRC_SUBDIR= src @@ -39,7 +40,7 @@ OPTIONS_DEFINE= AGGREGATOR ANHERO ANOTIFI AUSCRIE AZOTH BITTORRENT BLASQ BLOGIQU ELEEMINATOR FENET GACTS GLANCE GNOTIFI HARBINGER HISTORYHOLDER \ HOTSENSORS HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY KNOWHOW KRIGSTASK \ LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LEMON LHTR LIZNOO LMP MELLONETRAY \ - MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ + MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ NEWLIFE OORONEE OTLOZHU PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP \ ROSENTHAL SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER \ TABSLIST TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC \ @@ -225,12 +226,6 @@ MELLONETRAY_CMAKE_ON= -DENABLE_MELLONETRAY:BOOL=true MELLONETRAY_CMAKE_OFF= -DENABLE_MELLONETRAY:BOOL=false MELLONETRAY_USE= xorg=xdamage -MONOCLE_DESC= Monocle, the modular document viewer -MONOCLE_CMAKE_ON= -DENABLE_MONOCLE:BOOL=true -MONOCLE_CMAKE_OFF= -DENABLE_MONOCLE:BOOL=false -MONOCLE_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \ - libpoppler-qt4.so:graphics/poppler-qt4 - MUSICZOMBIE_DESC= MusicBrainz client plugin MUSICZOMBIE_CMAKE_ON= -DENABLE_MUSICZOMBIE:BOOL=true MUSICZOMBIE_CMAKE_OFF= -DENABLE_MUSICZOMBIE:BOOL=false @@ -363,7 +358,7 @@ OPTIONS_DEFAULT=AGGREGATOR ANHERO ANOTIFI AUSCRIE AZOTH BLASQ BLOGIQUE CERTMGR \ CPULOAD CSTP DBUSMANAGER DEADLYRICS DOLOZHEE FENET GACTS GLANCE GNOTIFI \ HARBINGER HISTORYHOLDER HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY \ KNOWHOW KRIGSTASK LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LHTR LIZNOO \ - LMP MELLONETRAY MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ + LMP MELLONETRAY MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \ NEWLIFE OORONEE PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP ROSENTHAL \ SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER TABSLIST \ TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC XPROXY XTAZY diff --git a/x11/leechcraft/pkg-plist b/x11/leechcraft/pkg-plist index 418801f60a53..f5b35e6cf74b 100644 --- a/x11/leechcraft/pkg-plist +++ b/x11/leechcraft/pkg-plist @@ -1722,19 +1722,6 @@ share/man/man1/leechcraft.1.gz %%MELLONETRAY%%%%DATADIR%%/qml/mellonetray/TrayQuark.qml.manifest %%MELLONETRAY%%%%DATADIR%%/translations/leechcraft_mellonetray_en.qm %%MELLONETRAY%%%%DATADIR%%/translations/leechcraft_mellonetray_ru_RU.qm -%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle.so -%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_dik.so -%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_fxb.so -%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_pdf.so -%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_postrus.so -%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_seen.so -%%MONOCLE%%share/applications/leechcraft-monocle-fxb.desktop -%%MONOCLE%%share/applications/leechcraft-monocle-pdf.desktop -%%MONOCLE%%share/applications/leechcraft-monocle-postrus.desktop -%%MONOCLE%%share/applications/leechcraft-monocle-seen.desktop -%%MONOCLE%%%%DATADIR%%/settings/monoclesettings.xml -%%MONOCLE%%%%DATADIR%%/translations/leechcraft_monocle_en.qm -%%MONOCLE%%%%DATADIR%%/translations/leechcraft_monocle_ru_RU.qm %%MUSICZOMBIE%%lib/leechcraft/plugins/libleechcraft_musiczombie.so %%MUSICZOMBIE%%%%DATADIR%%/translations/leechcraft_musiczombie_en.qm %%MUSICZOMBIE%%%%DATADIR%%/translations/leechcraft_musiczombie_ru_RU.qm |