Hello community, here is the log from the commit of package scribus for openSUSE:Factory checked in at 2020-04-08 19:56:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scribus (Old) and /work/SRC/openSUSE:Factory/.scribus.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scribus" Wed Apr 8 19:56:55 2020 rev:68 rq:792435 version:1.5.5 Changes: -------- --- /work/SRC/openSUSE:Factory/scribus/scribus.changes 2020-01-16 18:23:58.881065872 +0100 +++ /work/SRC/openSUSE:Factory/.scribus.new.3248/scribus.changes 2020-04-08 19:57:02.397139011 +0200 @@ -1,0 +2,12 @@ +Wed Apr 8 10:51:25 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch: + *0001-PDF-import-plugin-support-poppler-0.86.x.patch +- Update: + * Fix-failure-to-build-against-poppler-0.83.0.patch + * Fix-failure-to-build-with-poppler-0.84.0.patch + * Use-same-mechanism-as-with-previous-poppler-versions.patch + * Work-around-poppler-0.82-signature-changes.patch + * port-scripter-to-Python-3.patch + +------------------------------------------------------------------- New: ---- 0001-PDF-import-plugin-support-poppler-0.86.x.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scribus.spec ++++++ --- /var/tmp/diff_new_pack.jsnxF6/_old 2020-04-08 19:57:04.393140469 +0200 +++ /var/tmp/diff_new_pack.jsnxF6/_new 2020-04-08 19:57:04.397140472 +0200 @@ -40,6 +40,8 @@ Patch5: Fix-failure-to-build-with-poppler-0.84.0.patch # PATCH-FIX-UPSTREAM Patch6: Fails-to-build-with-python-3.8.patch +# PATCH-FIX-UPSTREAM +Patch7: 0001-PDF-import-plugin-support-poppler-0.86.x.patch BuildRequires: breeze5-icons BuildRequires: cmake BuildRequires: cups-devel @@ -117,11 +119,8 @@ %prep %setup -q # W: wrong-script-end-of-line-encoding -dos2unix scribus/plugins/scriptplugin/scripts/Ligatursatz.py -# necessary to be able to apply the patches -dos2unix scribus/plugins/scriptplugin/cmdannotations.cpp -dos2unix scribus/plugins/scriptplugin/cmddoc.cpp -dos2unix scribus/plugins/scriptplugin/cmdstyle.cpp +find . -type f -exec dos2unix {} \; + %autopatch -p1 %build ++++++ 0001-PDF-import-plugin-support-poppler-0.86.x.patch ++++++ >From 0413bebe7a8c08d75f6ea290d3ff54cb0df05a4e Mon Sep 17 00:00:00 2001 From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870> Date: Mon, 2 Mar 2020 14:45:59 +0000 Subject: [PATCH] PDF import plugin: support poppler 0.86.x git-svn-id: svn://scribus.net/trunk/Scribus@23478 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/plugins/import/pdf/importpdf.cpp | 53 ++++++- scribus/plugins/import/pdf/importpdf.h | 19 ++- scribus/plugins/import/pdf/slaoutput.cpp | 180 ++++++++++++++++++++--- scribus/plugins/import/pdf/slaoutput.h | 7 + 4 files changed, 226 insertions(+), 33 deletions(-) diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp index 822617a..2c1539a 100644 --- a/scribus/plugins/import/pdf/importpdf.cpp +++ b/scribus/plugins/import/pdf/importpdf.cpp @@ -856,11 +856,20 @@ bool PdfPlug::convert(const QString& fn) names = catDict.dictLookup("OpenAction"); if (names.isDict()) { - LinkAction *linkAction = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + std::unique_ptr<LinkAction> linkAction; linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()); +#else + LinkAction *linkAction = nullptr; + linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()); +#endif if (linkAction) { - LinkJavaScript *jsa = (LinkJavaScript*)linkAction; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) linkAction.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) linkAction; +#endif if (jsa->isOk()) { QString script = UnicodeParsedString(jsa->getScript()); @@ -1068,3 +1077,43 @@ QString PdfPlug::UnicodeParsedString(POPPLER_CONST GooString *s1) } return result; } + +QString PdfPlug::UnicodeParsedString(const std::string& s1) +{ + if (s1.length() == 0) + return QString(); + GBool isUnicode; + int i; + Unicode u; + QString result; + if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff)) + { + isUnicode = gTrue; + i = 2; + result.reserve((s1.length() - 2) / 2); + } + else + { + isUnicode = gFalse; + i = 0; + result.reserve(s1.length()); + } + while (i < s1.length()) + { + if (isUnicode) + { + u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff); + i += 2; + } + else + { + u = s1.at(i) & 0xff; + ++i; + } + // #15616: imagemagick may write unicode strings incorrectly in PDF + if (u == 0) + continue; + result += QChar( u ); + } + return result; +} diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h index 9dbfecc..72cae6b 100644 --- a/scribus/plugins/import/pdf/importpdf.h +++ b/scribus/plugins/import/pdf/importpdf.h @@ -7,19 +7,21 @@ for which a new license (GPL+exception) is in place. #ifndef IMPORTPDF_H #define IMPORTPDF_H +#include <QBrush> +#include <QBuffer> +#include <QColor> +#include <QImage> #include <QList> -#include <QTransform> #include <QMultiMap> -#include <QtGlobal> #include <QObject> +#include <QPen> +#include <QtGlobal> +#include <QSizeF> #include <QString> #include <QTextStream> -#include <QSizeF> -#include <QBuffer> -#include <QColor> -#include <QBrush> -#include <QPen> -#include <QImage> +#include <QTransform> + +#include <memory> #include "fpointarray.h" #include "importpdfconfig.h" @@ -82,6 +84,7 @@ private: bool convert(const QString& fn); QRectF getCBox(int box, int pgNum); QString UnicodeParsedString(POPPLER_CONST GooString *s1); + QString UnicodeParsedString(const std::string& s1); QList<PageItem*> Elements; double baseX, baseY; diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp index fa35f51..8d8e9d4 100644 --- a/scribus/plugins/import/pdf/slaoutput.cpp +++ b/scribus/plugins/import/pdf/slaoutput.cpp @@ -308,9 +308,15 @@ LinkAction* SlaOutputDev::SC_getAction(AnnotWidget *ano) } /* Replacement for the crippled Poppler function LinkAction* AnnotWidget::getAdditionalAction(AdditionalActionsType type) */ +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) +std::unique_ptr<LinkAction> SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano) +{ + std::unique_ptr<LinkAction> linkAction; +#else LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *ano) { LinkAction *linkAction = nullptr; +#endif Object obj; Ref refa = ano->getRef(); @@ -455,7 +461,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do POPPLER_CONST GooString *ndst = gto->getNamedDest(); if (ndst) { - LinkDest *dstn = pdfDoc->findDest(ndst); +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst); +#else + LinkDest *dstn = pdfDoc->findDest(ndst); +#endif if (dstn) { if (dstn->getKind() == destXYZ) @@ -499,7 +509,11 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do POPPLER_CONST GooString *ndst = gto->getNamedDest(); if (ndst) { - LinkDest *dstn = pdfDoc->findDest(ndst); +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst); +#else + LinkDest *dstn = pdfDoc->findDest(ndst); +#endif if (dstn) { if (dstn->getKind() == destXYZ) @@ -967,7 +981,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) POPPLER_CONST GooString *ndst = gto->getNamedDest(); if (ndst) { - LinkDest *dstn = pdfDoc->findDest(ndst); +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst); +#else + LinkDest *dstn = pdfDoc->findDest(ndst); +#endif if (dstn) { if (dstn->getKind() == destXYZ) @@ -1019,7 +1037,11 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) POPPLER_CONST GooString *ndst = gto->getNamedDest(); if (ndst) { - LinkDest *dstn = pdfDoc->findDest(ndst); +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + std::unique_ptr<LinkDest> dstn = pdfDoc->findDest(ndst); +#else + LinkDest *dstn = pdfDoc->findDest(ndst); +#endif if (dstn) { if (dstn->getKind() == destXYZ) @@ -1088,96 +1110,148 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) else qDebug() << "Found unsupported Action of type" << Lact->getKind(); } - LinkAction *Aact = SC_getAdditionalAction("D", ano); + auto Aact = SC_getAdditionalAction("D", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setD_act(UnicodeParsedString(jsa->getScript())); ite->annotation().setAAact(true); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } Aact = SC_getAdditionalAction("E", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setE_act(UnicodeParsedString(jsa->getScript())); ite->annotation().setAAact(true); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } Aact = SC_getAdditionalAction("X", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setX_act(UnicodeParsedString(jsa->getScript())); ite->annotation().setAAact(true); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } Aact = SC_getAdditionalAction("Fo", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript())); ite->annotation().setAAact(true); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } Aact = SC_getAdditionalAction("Bl", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript())); ite->annotation().setAAact(true); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } Aact = SC_getAdditionalAction("C", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setC_act(UnicodeParsedString(jsa->getScript())); ite->annotation().setAAact(true); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } Aact = SC_getAdditionalAction("F", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setF_act(UnicodeParsedString(jsa->getScript())); @@ -1185,14 +1259,22 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) ite->annotation().setFormat(5); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } Aact = SC_getAdditionalAction("K", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setK_act(UnicodeParsedString(jsa->getScript())); @@ -1200,21 +1282,33 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) ite->annotation().setFormat(5); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } Aact = SC_getAdditionalAction("V", ano); if (Aact) { if (Aact->getKind() == actionJavaScript) { - LinkJavaScript *jsa = (LinkJavaScript*)Aact; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + LinkJavaScript *jsa = (LinkJavaScript*) Aact.get(); +#else + LinkJavaScript *jsa = (LinkJavaScript*) Aact; +#endif if (jsa->isOk()) { ite->annotation().setV_act(UnicodeParsedString(jsa->getScript())); ite->annotation().setAAact(true); } } - Aact = nullptr; +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + Aact.reset(); +#else + Aact = nullptr; +#endif } } @@ -3928,6 +4022,46 @@ QString SlaOutputDev::UnicodeParsedString(POPPLER_CONST GooString *s1) return result; } +QString SlaOutputDev::UnicodeParsedString(const std::string& s1) +{ + if (s1.length() == 0) + return QString(); + GBool isUnicode; + int i; + Unicode u; + QString result; + if ((s1.at(0) & 0xff) == 0xfe && (s1.length() > 1 && (s1.at(1) & 0xff) == 0xff)) + { + isUnicode = gTrue; + i = 2; + result.reserve((s1.length() - 2) / 2); + } +else + { + isUnicode = gFalse; + i = 0; + result.reserve(s1.length()); + } + while (i < s1.length()) + { + if (isUnicode) + { + u = ((s1.at(i) & 0xff) << 8) | (s1.at(i+1) & 0xff); + i += 2; + } + else + { + u = s1.at(i) & 0xff; + ++i; + } + // #15616: imagemagick may write unicode strings incorrectly in PDF + if (u == 0) + continue; + result += QChar( u ); + } + return result; +} + bool SlaOutputDev::checkClip() { bool ret = false; diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h index ce73926..e42447c 100644 --- a/scribus/plugins/import/pdf/slaoutput.h +++ b/scribus/plugins/import/pdf/slaoutput.h @@ -20,6 +20,8 @@ for which a new license (GPL+exception) is in place. #include <QTextStream> #include <QTransform> +#include <memory> + #include "fpointarray.h" #include "importpdfconfig.h" #include "pageitem.h" @@ -159,7 +161,11 @@ public: virtual ~SlaOutputDev(); LinkAction* SC_getAction(AnnotWidget *ano); +#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 86, 0) + std::unique_ptr<LinkAction> SC_getAdditionalAction(const char *key, AnnotWidget *ano); +#else LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano); +#endif static GBool 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); @@ -287,6 +293,7 @@ private: void applyMask(PageItem *ite); void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); QString UnicodeParsedString(POPPLER_CONST GooString *s1); + QString UnicodeParsedString(const std::string& s1); bool checkClip(); bool pathIsClosed; QString CurrColorFill; -- 2.26.0 ++++++ Fix-failure-to-build-against-poppler-0.83.0.patch ++++++ --- /var/tmp/diff_new_pack.jsnxF6/_old 2020-04-08 19:57:04.429140495 +0200 +++ /var/tmp/diff_new_pack.jsnxF6/_new 2020-04-08 19:57:04.429140495 +0200 @@ -16,135 +16,135 @@ --- a/scribus/plugins/import/pdf/importpdf.cpp +++ b/scribus/plugins/import/pdf/importpdf.cpp @@ -74,7 +74,11 @@ PdfPlug::PdfPlug(ScribusDoc* doc, int flags) - QImage PdfPlug::readThumbnail(const QString& fName) - { - QString pdfFile = QDir::toNativeSeparators(fName); -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.reset(new GlobalParams()); -+#else - globalParams = new GlobalParams(); -+#endif - if (globalParams) - { - #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) + QImage PdfPlug::readThumbnail(const QString& fName) + { + QString pdfFile = QDir::toNativeSeparators(fName); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) ++ globalParams.reset(new GlobalParams()); ++#else + globalParams = new GlobalParams(); ++#endif + if (globalParams) + { + #if defined(Q_OS_WIN32) && POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 62, 0) @@ -89,7 +93,9 @@ QImage PdfPlug::readThumbnail(const QString& fName) - if (pdfDoc->getErrorCode() == errEncrypted) - { - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return QImage(); - } - if (pdfDoc->isOk()) + if (pdfDoc->getErrorCode() == errEncrypted) + { + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + return QImage(); + } + if (pdfDoc->isOk()) @@ -133,11 +139,15 @@ QImage PdfPlug::readThumbnail(const QString& fName) - image.setText("YSize", QString("%1").arg(h)); - delete dev; - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return image; - } - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - } - } - return QImage(); + image.setText("YSize", QString("%1").arg(h)); + delete dev; + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + return image; + } + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + } + } + return QImage(); @@ -343,7 +353,11 @@ bool PdfPlug::convert(const QString& fn) - qApp->processEvents(); - } - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.reset(new GlobalParams()); -+#else - globalParams = new GlobalParams(); -+#endif - GooString *userPW = nullptr; - if (globalParams) - { + qApp->processEvents(); + } + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) ++ globalParams.reset(new GlobalParams()); ++#else + globalParams = new GlobalParams(); ++#endif + GooString *userPW = nullptr; + if (globalParams) + { @@ -385,7 +399,9 @@ bool PdfPlug::convert(const QString& fn) - if (progressDialog) - progressDialog->close(); - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return false; - } - if (progressDialog) + if (progressDialog) + progressDialog->close(); + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + return false; + } + if (progressDialog) @@ -430,7 +446,9 @@ bool PdfPlug::convert(const QString& fn) - progressDialog->close(); - delete optImp; - delete pdfDoc; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) - delete globalParams; -+#endif - return false; - } - pageString = optImp->getPagesString(); + progressDialog->close(); + delete optImp; + delete pdfDoc; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 83, 0) + delete globalParams; ++#endif + return false; + } + pageString = optImp->getPagesString(); @@ -843,8 +861,12 @@ bool PdfPlug::convert(const QString& fn) - } - delete pdfDoc; - } -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+ globalParams.release(); -+#else - delete globalParams; - globalParams = nullptr; -+#endif - - // qDebug() << "converting finished"; - // qDebug() << "Imported" << Elements.count() << "Elements"; + } + delete pdfDoc; + } ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) ++ globalParams.release(); ++#else + delete globalParams; + globalParams = nullptr; ++#endif + + // qDebug() << "converting finished"; + // qDebug() << "Imported" << Elements.count() << "Elements"; diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h index 9913ee382c..5a7e0d2162 100644 --- a/scribus/plugins/import/pdf/importpdfconfig.h +++ b/scribus/plugins/import/pdf/importpdfconfig.h @@ -58,4 +58,10 @@ for which a new license (GPL+exception) is in place. - #define POPPLER_CONST_082 - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) -+#define POPPLER_CONST_083 const -+#else -+#define POPPLER_CONST_083 -+#endif -+ - #endif + #define POPPLER_CONST_082 + #endif + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 83, 0) ++#define POPPLER_CONST_083 const ++#else ++#define POPPLER_CONST_083 ++#endif ++ + #endif diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp index 5e4d32a551..ffcfa8450b 100644 --- a/scribus/plugins/import/pdf/slaoutput.cpp +++ b/scribus/plugins/import/pdf/slaoutput.cpp @@ -3678,7 +3678,7 @@ QString SlaOutputDev::getAnnotationColor(const AnnotColor *color) - return fNam; - } - --QString SlaOutputDev::convertPath(GfxPath *path) -+QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path) - { - if (! path) - return QString(); + return fNam; + } + +-QString SlaOutputDev::convertPath(GfxPath *path) ++QString SlaOutputDev::convertPath(POPPLER_CONST_083 GfxPath *path) + { + if (! path) + return QString(); @@ -3688,7 +3688,7 @@ QString SlaOutputDev::convertPath(GfxPath *path) - - for (int i = 0; i < path->getNumSubpaths(); ++i) - { -- GfxSubpath * subpath = path->getSubpath(i); -+ POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) - { - output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); + + for (int i = 0; i < path->getNumSubpaths(); ++i) + { +- GfxSubpath * subpath = path->getSubpath(i); ++ POPPLER_CONST_083 GfxSubpath * subpath = path->getSubpath(i); + if (subpath->getNumPoints() > 0) + { + output += QString("M %1 %2").arg(subpath->getX(0)).arg(subpath->getY(0)); diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h index 60fb900618..d928fada81 100644 --- a/scribus/plugins/import/pdf/slaoutput.h +++ b/scribus/plugins/import/pdf/slaoutput.h @@ -282,7 +282,7 @@ class SlaOutputDev : public OutputDev - void getPenState(GfxState *state); - QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade); - QString getAnnotationColor(const AnnotColor *color); -- QString convertPath(GfxPath *path); -+ QString convertPath(POPPLER_CONST_083 GfxPath *path); - int getBlendMode(GfxState *state); - void applyMask(PageItem *ite); - void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); + void getPenState(GfxState *state); + QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade); + QString getAnnotationColor(const AnnotColor *color); +- QString convertPath(GfxPath *path); ++ QString convertPath(POPPLER_CONST_083 GfxPath *path); + int getBlendMode(GfxState *state); + void applyMask(PageItem *ite); + void pushGroup(const QString& maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false); ++++++ Fix-failure-to-build-with-poppler-0.84.0.patch ++++++ --- /var/tmp/diff_new_pack.jsnxF6/_old 2020-04-08 19:57:04.441140504 +0200 +++ /var/tmp/diff_new_pack.jsnxF6/_new 2020-04-08 19:57:04.441140504 +0200 @@ -13,22 +13,22 @@ --- a/scribus/plugins/import/pdf/slaoutput.cpp +++ b/scribus/plugins/import/pdf/slaoutput.cpp @@ -1189,6 +1189,11 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) - catalog = catA; - pdfDoc = doc; - updateGUICounter = 0; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0) -+ m_fontEngine = new SplashFontEngine(true, true, true, true); -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0) -+ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true); -+#else - m_fontEngine = new SplashFontEngine( - #if HAVE_T1LIB_H - globalParams->getEnableT1lib(), + catalog = catA; + pdfDoc = doc; + updateGUICounter = 0; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 84, 0) ++ m_fontEngine = new SplashFontEngine(true, true, true, true); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 61, 0) ++ m_fontEngine = new SplashFontEngine(globalParams->getEnableFreeType(), true, true, true); ++#else + m_fontEngine = new SplashFontEngine( + #if HAVE_T1LIB_H + globalParams->getEnableT1lib(), @@ -1199,6 +1204,7 @@ void SlaOutputDev::startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA) - true, - #endif - true); -+#endif - } - - void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *) + true, + #endif + true); ++#endif + } + + void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *) ++++++ Use-same-mechanism-as-with-previous-poppler-versions.patch ++++++ --- /var/tmp/diff_new_pack.jsnxF6/_old 2020-04-08 19:57:04.453140513 +0200 +++ /var/tmp/diff_new_pack.jsnxF6/_new 2020-04-08 19:57:04.453140513 +0200 @@ -16,125 +16,125 @@ --- a/scribus/plugins/import/pdf/importpdfconfig.h +++ b/scribus/plugins/import/pdf/importpdfconfig.h @@ -52,4 +52,10 @@ for which a new license (GPL+exception) is in place. - #define POPPLER_REF - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0) -+#define POPPLER_CONST_082 const -+#else -+#define POPPLER_CONST_082 -+#endif -+ - #endif + #define POPPLER_REF + #endif + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0) ++#define POPPLER_CONST_082 const ++#else ++#define POPPLER_CONST_082 ++#endif ++ + #endif diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp index f3d6446880..bb7b184272 100644 --- a/scribus/plugins/import/pdf/slaoutput.cpp +++ b/scribus/plugins/import/pdf/slaoutput.cpp @@ -1606,7 +1606,7 @@ void SlaOutputDev::stroke(GfxState *state) - ite->PoLine = out.copy(); - ite->ClipEdited = true; - ite->FrameType = 3; -- ite->setWidthHeight(wh.x(),wh.y()); -+ ite->setWidthHeight(wh.x(), wh.y()); - m_doc->adjustItemSize(ite); - if (m_Elements->count() != 0) - { + ite->PoLine = out.copy(); + ite->ClipEdited = true; + ite->FrameType = 3; +- ite->setWidthHeight(wh.x(),wh.y()); ++ ite->setWidthHeight(wh.x(), wh.y()); + m_doc->adjustItemSize(ite); + if (m_Elements->count() != 0) + { @@ -2471,7 +2471,7 @@ void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int - out.translate(-ite->xPos(), -ite->yPos()); - ite->PoLine = out.copy(); - FPoint wh = getMaxClipF(&ite->PoLine); -- ite->setWidthHeight(wh.x(),wh.y()); -+ ite->setWidthHeight(wh.x(), wh.y()); - ite->setTextFlowMode(PageItem::TextFlowDisabled); - ite->ScaleType = true; - m_doc->adjustItemSize(ite); + out.translate(-ite->xPos(), -ite->yPos()); + ite->PoLine = out.copy(); + FPoint wh = getMaxClipF(&ite->PoLine); +- ite->setWidthHeight(wh.x(),wh.y()); ++ ite->setWidthHeight(wh.x(), wh.y()); + ite->setTextFlowMode(PageItem::TextFlowDisabled); + ite->ScaleType = true; + m_doc->adjustItemSize(ite); @@ -2613,7 +2613,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str - out.translate(-ite->xPos(), -ite->yPos()); - ite->PoLine = out.copy(); - FPoint wh = getMaxClipF(&ite->PoLine); -- ite->setWidthHeight(wh.x(),wh.y()); -+ ite->setWidthHeight(wh.x(), wh.y()); - ite->setTextFlowMode(PageItem::TextFlowDisabled); - ite->ScaleType = true; - m_doc->adjustItemSize(ite); + out.translate(-ite->xPos(), -ite->yPos()); + ite->PoLine = out.copy(); + FPoint wh = getMaxClipF(&ite->PoLine); +- ite->setWidthHeight(wh.x(),wh.y()); ++ ite->setWidthHeight(wh.x(), wh.y()); + ite->setTextFlowMode(PageItem::TextFlowDisabled); + ite->ScaleType = true; + m_doc->adjustItemSize(ite); @@ -2762,7 +2762,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, i - out.translate(-ite->xPos(), -ite->yPos()); - ite->PoLine = out.copy(); - FPoint wh = getMaxClipF(&ite->PoLine); -- ite->setWidthHeight(wh.x(),wh.y()); -+ ite->setWidthHeight(wh.x(), wh.y()); - ite->setTextFlowMode(PageItem::TextFlowDisabled); - ite->ScaleType = true; - m_doc->adjustItemSize(ite); + out.translate(-ite->xPos(), -ite->yPos()); + ite->PoLine = out.copy(); + FPoint wh = getMaxClipF(&ite->PoLine); +- ite->setWidthHeight(wh.x(),wh.y()); ++ ite->setWidthHeight(wh.x(), wh.y()); + ite->setTextFlowMode(PageItem::TextFlowDisabled); + ite->ScaleType = true; + m_doc->adjustItemSize(ite); @@ -2784,11 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, i - delete[] mbuffer; - } - --#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) --void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int* maskColors, GBool inlineImg) --#else --void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int* maskColors, GBool inlineImg) --#endif -+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int* maskColors, GBool inlineImg) - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; + delete[] mbuffer; + } + +-#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) +-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int* maskColors, GBool inlineImg) +-#else +-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int* maskColors, GBool inlineImg) +-#endif ++void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int* maskColors, GBool inlineImg) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; @@ -3369,11 +3365,7 @@ void SlaOutputDev::updateFont(GfxState *state) - fontsrc->unref(); - } - --#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) --void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen) --#else --void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) --#endif -+void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, POPPLER_CONST_082 Unicode *u, int uLen) - { - double x1, y1, x2, y2; - int render; + fontsrc->unref(); + } + +-#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) +-void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen) +-#else +-void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) +-#endif ++void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, POPPLER_CONST_082 Unicode *u, int uLen) + { + double x1, y1, x2, y2; + int render; @@ -3460,11 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub - } - } - --#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) --GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) --#else --GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen) --#endif -+GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen) - { - // qDebug() << "beginType3Char"; - GfxFont *gfxFont; + } + } + +-#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) +-GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) +-#else +-GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen) +-#endif ++GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen) + { + // qDebug() << "beginType3Char"; + GfxFont *gfxFont; diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h index b5905184e5..14a590d55e 100644 --- a/scribus/plugins/import/pdf/slaoutput.h +++ b/scribus/plugins/import/pdf/slaoutput.h @@ -229,11 +229,7 @@ class SlaOutputDev : public OutputDev - - //----- image drawing - void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override; --#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) -- void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override; --#else -- void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg) override; --#endif -+ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int *maskColors, GBool inlineImg) override; - void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, + + //----- image drawing + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override; +-#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) +- void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override; +-#else +- void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg) override; +-#endif ++ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int *maskColors, GBool inlineImg) override; + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, @@ -265,13 +261,8 @@ class SlaOutputDev : public OutputDev - //----- text drawing - void beginTextObject(GfxState *state) override; - void endTextObject(GfxState *state) override; --#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) -- void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override; -- GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override; --#else -- void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, const Unicode * /*u*/, int /*uLen*/) override; -- GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, const Unicode * /*u*/, int /*uLen*/) override; --#endif -+ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override; -+ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override; - void endType3Char(GfxState * /*state*/) override; - void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override; - void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override; + //----- text drawing + void beginTextObject(GfxState *state) override; + void endTextObject(GfxState *state) override; +-#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) +- void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override; +- GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override; +-#else +- void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, const Unicode * /*u*/, int /*uLen*/) override; +- GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, const Unicode * /*u*/, int /*uLen*/) override; +-#endif ++ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override; ++ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override; + void endType3Char(GfxState * /*state*/) override; + void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override; + void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override; ++++++ Work-around-poppler-0.82-signature-changes.patch ++++++ --- /var/tmp/diff_new_pack.jsnxF6/_old 2020-04-08 19:57:04.465140521 +0200 +++ /var/tmp/diff_new_pack.jsnxF6/_new 2020-04-08 19:57:04.465140521 +0200 @@ -14,69 +14,69 @@ --- a/scribus/plugins/import/pdf/slaoutput.cpp +++ b/scribus/plugins/import/pdf/slaoutput.cpp @@ -2784,7 +2784,11 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, i - delete[] mbuffer; - } - --void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) -+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int* maskColors, GBool inlineImg) -+#else -+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int* maskColors, GBool inlineImg) -+#endif - { - ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); - // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; + delete[] mbuffer; + } + +-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) ++void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int* maskColors, GBool inlineImg) ++#else ++void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int* maskColors, GBool inlineImg) ++#endif + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors; @@ -3365,7 +3369,11 @@ void SlaOutputDev::updateFont(GfxState *state) - fontsrc->unref(); - } - -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) - void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen) -+#else -+void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) -+#endif - { - double x1, y1, x2, y2; - int render; + fontsrc->unref(); + } + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) + void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen) ++#else ++void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, const Unicode *u, int uLen) ++#endif + { + double x1, y1, x2, y2; + int render; @@ -3452,7 +3460,11 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub - } - } - -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) - GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) -+#else -+GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen) -+#endif - { - // qDebug() << "beginType3Char"; - GfxFont *gfxFont; + } + } + ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) + GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen) ++#else ++GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, const Unicode *u, int uLen) ++#endif + { + // qDebug() << "beginType3Char"; + GfxFont *gfxFont; diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h index bc4350a034..b5905184e5 100644 --- a/scribus/plugins/import/pdf/slaoutput.h +++ b/scribus/plugins/import/pdf/slaoutput.h @@ -229,7 +229,11 @@ class SlaOutputDev : public OutputDev - - //----- image drawing - void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) - void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override; -+#else -+ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg) override; -+#endif - void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, + + //----- image drawing + void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) + void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override; ++#else ++ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, const int *maskColors, GBool inlineImg) override; ++#endif + void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, @@ -261,8 +265,13 @@ class SlaOutputDev : public OutputDev - //----- text drawing - void beginTextObject(GfxState *state) override; - void endTextObject(GfxState *state) override; -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) - void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override; - GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override; -+#else -+ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, const Unicode * /*u*/, int /*uLen*/) override; -+ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, const Unicode * /*u*/, int /*uLen*/) override; -+#endif - void endType3Char(GfxState * /*state*/) override; - void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override; - void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override; + //----- text drawing + void beginTextObject(GfxState *state) override; + void endTextObject(GfxState *state) override; ++#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 82, 0) + void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override; + GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override; ++#else ++ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, const Unicode * /*u*/, int /*uLen*/) override; ++ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, const Unicode * /*u*/, int /*uLen*/) override; ++#endif + void endType3Char(GfxState * /*state*/) override; + void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override; + void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override; ++++++ port-scripter-to-Python-3.patch ++++++ ++++ 1148 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/scribus/port-scripter-to-Python-3.patch ++++ and /work/SRC/openSUSE:Factory/.scribus.new.3248/port-scripter-to-Python-3.patch
