Date: Wednesday, August 7, 2019 @ 15:05:04 Author: archange Revision: 498155
archrelease: copy trunk to community-x86_64 Added: scribus/repos/community-x86_64/PKGBUILD (from rev 498154, scribus/trunk/PKGBUILD) Deleted: scribus/repos/community-x86_64/PKGBUILD scribus/repos/community-x86_64/scribus-poppler-0.70.patch scribus/repos/community-x86_64/scribus-poppler-0.73.patch scribus/repos/community-x86_64/scribus-poppler-0.75.patch scribus/repos/community-x86_64/scribus-poppler-0.76.patch ----------------------------+ PKGBUILD | 165 ++++++++++--------------- scribus-poppler-0.70.patch | 277 ------------------------------------------- scribus-poppler-0.73.patch | 30 ---- scribus-poppler-0.75.patch | 40 ------ scribus-poppler-0.76.patch | 40 ------ 5 files changed, 66 insertions(+), 486 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-08-07 15:04:54 UTC (rev 498154) +++ PKGBUILD 2019-08-07 15:05:04 UTC (rev 498155) @@ -1,99 +0,0 @@ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Maintainer: Bruno Pagani <archa...@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: tobias <tob...@archlinux.org> -# Contributor: Ben <b...@benmazer.net> - -pkgname=scribus -pkgver=1.5.4 -pkgrel=13 -pkgdesc="Desktop publishing software" -arch=('x86_64') -url="https://www.scribus.net/" -license=('GPL') -depends=('qt5-base' 'harfbuzz-icu' 'poppler' 'python2' 'hunspell' 'podofo' 'openscenegraph' - 'libcdr' 'libfreehand' 'libmspub' 'libpagemaker' 'libqxp' 'libvisio' 'libzmf') # 'graphicsmagick' -makedepends=('cmake' 'boost' 'mesa' 'qt5-tools') -optdepends=('tk: scripts based on tkinter' - 'hyphen-lang: hyphenation patterns for desired languages') -source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc} - 'https://github.com/scribusproject/scribus/commit/d867ec3c386baaed1b8e076dd70b278863411480.patch' - 'https://github.com/scribusproject/scribus/commit/7d4ceeb5cac32287769e3c0238699e0b3e56c24d.patch' - 'https://github.com/scribusproject/scribus/commit/76561c1a55cd07c268f8f2b2fea888532933700b.patch' - 'https://github.com/scribusproject/scribus/commit/8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch' - 'scribus-poppler-0.70.patch' - 'scribus-poppler-0.73.patch' - 'scribus-poppler-0.75.patch' - 'scribus-poppler-0.76.patch') -sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03' - 'SKIP' - '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36' - 'b20bf0588b30d7777551ea6eb5744caf31ef31dd396b2b08cc4bddf9dd3a22cf' - '29b09c7cc95e8a5432010b39a6c0478cb106a1bbb425747fb383092465476106' - '824cbc38b02e15aa742b309a226549c3a6c4e3eb16059c239083145aa4ae6dab' - '199b5ea2831d749b91e206f50e3d30a7b787c5e2b85676120e1e4825478f8737' - 'f09488ff56177fd360d588bf70f2960adeba80cb34cec692d4d967dc081fe4ad' - '0e69817dc9b047852540dd76aaec39b54a4781c273e4d5fe2764c773b3160ed2' - '115ec3b46e303f648ecf55769ab5c6cfeefcf914822164ec187a0bcb22699305') -validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA' # Peter Linnell <plinn...@scribus.net> - '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team (www.scribus.net) <the_scribus_t...@scribus.net> - -prepare() { - cd ${pkgname}-${pkgver} - - # Poppler 0.64 - patch -p1 -i ../d867ec3c386baaed1b8e076dd70b278863411480.patch - patch -p1 -i ../7d4ceeb5cac32287769e3c0238699e0b3e56c24d.patch - patch -p1 -i ../76561c1a55cd07c268f8f2b2fea888532933700b.patch - # Poppler 0.70 - patch -p1 -i ../8e05d26c19097ac2ad5b4ebbf40a3771ee6faf9c.patch - patch -p1 -i ../scribus-poppler-0.70.patch - # Poppler 0.71 - sed -e 's|GBool|bool|g' -e 's|gTrue|true|g' -e 's|gFalse|false|g' -i scribus/plugins/import/pdf/* - # Poppler 0.72 - sed -e 's|getCString|c_str|g' -i scribus/plugins/import/pdf/* - # Poppler 0.73 - patch -p0 -i ../scribus-poppler-0.73.patch - # Poppler 0.75 - patch -p1 --binary -i ../scribus-poppler-0.75.patch - # Poppler 0.76 - patch -p1 -i ../scribus-poppler-0.76.patch - # Fix python name - sed \ - -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ - -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - -i scribus/plugins/scriptplugin/{samples,scripts}/* - - mkdir -p build -} - -build() { - cd ${pkgname}-${pkgver}/build - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_SKIP_RPATH=ON - # FS#59800 - #-DWANT_GRAPHICSMAGICK=1 - make -} - -package() { - cd ${pkgname}-${pkgver}/build - - make DESTDIR="${pkgdir}" install - - cd .. - - install -Dm644 scribus.desktop -t "${pkgdir}"/usr/share/applications - - for i in 16x16 32x32 128x128 256x256 512x512 1024x1024 - do - install -Dm644 resources/iconsets/artwork/icon_${i}.png "${pkgdir}"/usr/share/icons/hicolor/${i}/apps/scribus.png - done - - # Use system hyphen - rm -rf "${pkgdir}"/usr/share/scribus/dicts/hyph - ln -sf /usr/share/hyphen "${pkgdir}"/usr/share/scribus/dicts/hyph -} Copied: scribus/repos/community-x86_64/PKGBUILD (from rev 498154, scribus/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-08-07 15:05:04 UTC (rev 498155) @@ -0,0 +1,66 @@ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Maintainer: Bruno Pagani <archa...@archlinux.org> +# Contributor: Daniel J Griffiths <ghost1...@archlinux.us> +# Contributor: Ronald van Haren <ronald.archlinux.org> +# Contributor: tobias <tob...@archlinux.org> +# Contributor: Ben <b...@benmazer.net> + +pkgname=scribus +pkgver=1.5.5 +pkgrel=1 +pkgdesc="Desktop publishing software" +arch=(x86_64) +url="https://www.scribus.net/" +license=(GPL) +depends=(qt5-base harfbuzz-icu poppler python2 hunspell podofo openscenegraph + libcdr libfreehand libmspub libpagemaker libqxp libvisio libzmf) # graphicsmagick +makedepends=(cmake boost mesa qt5-tools) +optdepends=('tk: scripts based on tkinter' + 'hyphen-lang: hyphenation patterns for desired languages') +source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}) +sha256sums=(7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71 SKIP) +validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA # Peter Linnell <plinn...@scribus.net> + 757F5E9B13DD648887AD50092D47C099E782504E # The Scribus Team (www.scribus.net) <the_scribus_t...@scribus.net> + 6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney <cbrad...@zipworld.com.au> + +prepare() { + cd ${pkgname}-${pkgver} + + # Fix python name + sed \ + -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ + -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ + -i scribus/plugins/scriptplugin/{samples,scripts}/* + + mkdir -p build +} + +build() { + cd ${pkgname}-${pkgver}/build + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=None \ + -DCMAKE_SKIP_RPATH=ON + # FS#59800 + #-DWANT_GRAPHICSMAGICK=1 + make +} + +package() { + cd ${pkgname}-${pkgver}/build + + make DESTDIR="${pkgdir}" install + + cd .. + + install -Dm644 scribus.desktop -t "${pkgdir}"/usr/share/applications + + for i in 16x16 32x32 128x128 256x256 512x512 1024x1024 + do + install -Dm644 resources/iconsets/artwork/icon_${i}.png "${pkgdir}"/usr/share/icons/hicolor/${i}/apps/scribus.png + done + + # Use system hyphen + rm -rf "${pkgdir}"/usr/share/scribus/dicts/hyph + ln -sf /usr/share/hyphen "${pkgdir}"/usr/share/scribus/dicts/hyph +} Deleted: scribus-poppler-0.70.patch =================================================================== --- scribus-poppler-0.70.patch 2019-08-07 15:04:54 UTC (rev 498154) +++ scribus-poppler-0.70.patch 2019-08-07 15:05:04 UTC (rev 498155) @@ -1,277 +0,0 @@ -diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp -index 8351aca..05aea12 100644 ---- a/scribus/plugins/import/pdf/importpdf.cpp -+++ b/scribus/plugins/import/pdf/importpdf.cpp -@@ -449,7 +449,7 @@ bool PdfPlug::convert(const QString& fn) - GBool useMediaBox = gTrue; - GBool crop = gTrue; - GBool printing = gFalse; -- PDFRectangle *mediaBox = pdfDoc->getPage(1)->getMediaBox(); -+ 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) -@@ -991,7 +991,7 @@ QImage PdfPlug::readPreview(int pgNum, int width, int height, int box) - - 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) -diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h -index 769594b..60d299c 100644 ---- a/scribus/plugins/import/pdf/importpdfconfig.h -+++ b/scribus/plugins/import/pdf/importpdfconfig.h -@@ -21,4 +21,10 @@ for which a new license (GPL+exception) is in place. - #define POPPLER_CONST - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 70, 0) -+#define POPPLER_CONST_070 const -+#else -+#define POPPLER_CONST_070 -+#endif -+ - #endif -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index b51f357..6ef037b 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -183,7 +183,7 @@ void AnoOutputDev::drawString(GfxState *state, POPPLER_CONST GooString *s) - m_itemText = s->copy(); - } - --QString AnoOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int *shade) -+QString AnoOutputDev::getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade) - { - QString fNam; - QString namPrefix = "FromPDF"; -@@ -1598,7 +1598,7 @@ void SlaOutputDev::updateStrokeColor(GfxState *state) - void SlaOutputDev::clip(GfxState *state) - { - // qDebug() << "Clip"; -- double *ctm; -+ const double *ctm; - ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - QString output = convertPath(state->getPath()); -@@ -1635,7 +1635,7 @@ void SlaOutputDev::clip(GfxState *state) - void SlaOutputDev::eoClip(GfxState *state) - { - // qDebug() << "EoClip"; -- double *ctm; -+ const double *ctm; - ctm = state->getCTM(); - m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]); - QString output = convertPath(state->getPath()); -@@ -1672,7 +1672,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(); -@@ -1764,7 +1764,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(); -@@ -1809,7 +1809,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(); -@@ -1858,14 +1858,14 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, d - double GrEndX; - double GrEndY; - int shade = 100; -- Function *func = shading->getFunc(0); -+ POPPLER_CONST_070 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++ ) -@@ -1889,8 +1889,7 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, d - 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); -@@ -1969,14 +1968,14 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, - double GrEndX; - double GrEndY; - int shade = 100; -- Function *func = shading->getFunc(0); -+ POPPLER_CONST_070 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++ ) -@@ -2015,8 +2014,7 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, - 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); -@@ -2098,8 +2096,7 @@ GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangl - 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); -@@ -2179,8 +2176,7 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh - 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); -@@ -2205,7 +2201,7 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh - 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; -@@ -2330,7 +2326,6 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *c - 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; -@@ -2507,8 +2502,7 @@ void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int - 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); -@@ -2653,8 +2647,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str - 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); -@@ -2803,8 +2796,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, i - 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); -@@ -2968,8 +2960,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int widt - 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); -@@ -3329,7 +3320,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; -@@ -3796,8 +3787,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub - 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(); -@@ -3951,7 +3941,7 @@ void SlaOutputDev::endTextObject(GfxState *state) - } - } - --QString SlaOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int *shade) -+QString SlaOutputDev::getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade) - { - QString fNam; - QString namPrefix = "FromPDF"; -diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h -index 075595c..c46448b 100644 ---- a/scribus/plugins/import/pdf/slaoutput.h -+++ b/scribus/plugins/import/pdf/slaoutput.h -@@ -137,7 +137,7 @@ public: - GooString *m_fontName; - GooString *m_itemText; - private: -- QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade); -+ QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade); - ScribusDoc* m_doc; - QStringList *m_importedColors; - }; -@@ -263,7 +263,7 @@ public: - - private: - void getPenState(GfxState *state); -- QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade); -+ QString getColor(GfxColorSpace *color_space, POPPLER_CONST_070 GfxColor *color, int *shade); - QString getAnnotationColor(const AnnotColor *color); - QString convertPath(GfxPath *path); - int getBlendMode(GfxState *state); Deleted: scribus-poppler-0.73.patch =================================================================== --- scribus-poppler-0.73.patch 2019-08-07 15:04:54 UTC (rev 498154) +++ scribus-poppler-0.73.patch 2019-08-07 15:05:04 UTC (rev 498155) @@ -1,30 +0,0 @@ -Index: scribus/plugins/import/pdf/importpdfconfig.h -=================================================================== ---- scribus/plugins/import/pdf/importpdfconfig.h (revision 22797) -+++ scribus/plugins/import/pdf/importpdfconfig.h (revision 22798) -@@ -37,4 +37,11 @@ - #define getCString c_str - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 73, 0) -+#define Guchar unsigned char -+#define Gushort unsigned short -+#define Guint unsigned int -+#define Gulong unsigned long - #endif -+ -+#endif -Index: scribus/plugins/import/pdf/slaoutput.h -=================================================================== ---- scribus/plugins/import/pdf/slaoutput.h (revision 22805) -+++ scribus/plugins/import/pdf/slaoutput.h (revision 22806) -@@ -28,7 +28,9 @@ - #include "selection.h" - #include "vgradient.h" - -+#if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(0, 73, 0) - #include <poppler/goo/gtypes.h> -+#endif - #include <poppler/Object.h> - #include <poppler/OutputDev.h> - #include <poppler/Gfx.h> Deleted: scribus-poppler-0.75.patch =================================================================== --- scribus-poppler-0.75.patch 2019-08-07 15:04:54 UTC (rev 498154) +++ scribus-poppler-0.75.patch 2019-08-07 15:05:04 UTC (rev 498155) @@ -1,40 +0,0 @@ ---- scribus-1.5.4/scribus/plugins/import/pdf/importpdf.cpp.orig 2019-03-22 09:47:14.760191871 +0000 -+++ scribus-1.5.4/scribus/plugins/import/pdf/importpdf.cpp 2019-03-22 09:47:37.363809447 +0000 -@@ -535,7 +535,7 @@ - if (orderItem.isDict()) - { - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0) -- Object ref = order->getNF(i); -+ Object ref = order->getNF(i).copy(); - #else - Object ref; - order->getNF(i, &ref); ---- scribus-1.5.4/scribus/plugins/import/pdf/slaoutput.cpp.orig 2019-03-22 10:02:43.145371895 +0000 -+++ scribus-1.5.4/scribus/plugins/import/pdf/slaoutput.cpp 2019-03-22 10:07:03.085386627 +0000 -@@ -310,7 +310,7 @@ - if (obj.isDict()) - { - Dict* adic = obj.getDict(); -- additionalActions = adic->lookupNF("A"); -+ additionalActions = adic->lookupNF("A").copy(); - Object additionalActionsObject = additionalActions.fetch(pdfDoc->getXRef()); - if (additionalActionsObject.isDict()) - { -@@ -370,7 +370,7 @@ - if (obj.isDict()) - { - Dict* adic = obj.getDict(); -- additionalActions = adic->lookupNF("AA"); -+ additionalActions = adic->lookupNF("AA").copy(); - Object additionalActionsObject = additionalActions.fetch(pdfDoc->getXRef()); - if (additionalActionsObject.isDict()) - { -@@ -939,7 +939,7 @@ - QList<int> radList; - for (int i = 0; i < obj2.arrayGetLength(); i++) - { -- Object childRef = obj2.arrayGetNF(i); -+ Object childRef = obj2.arrayGetNF(i).copy(); - if (!childRef.isRef()) - continue; - Object childObj = obj2.arrayGet(i); Deleted: scribus-poppler-0.76.patch =================================================================== --- scribus-poppler-0.76.patch 2019-08-07 15:04:54 UTC (rev 498154) +++ scribus-poppler-0.76.patch 2019-08-07 15:05:04 UTC (rev 498155) @@ -1,40 +0,0 @@ -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index fe9794a65..2012d98d3 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -430,7 +430,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do - if (dst->isPageRef()) - { - Ref dstr = dst->getPageRef(); -- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); -+ pagNum = pdfDoc->findPage(dstr); - } - else - pagNum = dst->getPageNum(); -@@ -452,7 +452,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do - if (dstn->isPageRef()) - { - Ref dstr = dstn->getPageRef(); -- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); -+ pagNum = pdfDoc->findPage(dstr); - } - else - pagNum = dstn->getPageNum(); -@@ -932,7 +932,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) - if (dst->isPageRef()) - { - Ref dstr = dst->getPageRef(); -- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); -+ pagNum = pdfDoc->findPage(dstr); - } - else - pagNum = dst->getPageNum(); -@@ -956,7 +956,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) - if (dstn->isPageRef()) - { - Ref dstr = dstn->getPageRef(); -- pagNum = pdfDoc->findPage(dstr.num, dstr.gen); -+ pagNum = pdfDoc->findPage(dstr); - } - else - pagNum = dstn->getPageNum();