Date: Saturday, August 25, 2018 @ 13:17:38 Author: archange Revision: 373994
upgpkg: scribus 1.5.4-1 Upgrade to the scribus-devel branch in order to switch to Qt5. Remove PKGBUILD.next that served this purpose. Added: scribus/trunk/fix-15289-2.patch scribus/trunk/fix-15289.patch Modified: scribus/trunk/PKGBUILD Deleted: scribus/trunk/PKGBUILD.next -------------------+ PKGBUILD | 85 +++++++++++------- PKGBUILD.next | 49 ---------- fix-15289-2.patch | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fix-15289.patch | 70 ++++++++++++++ 4 files changed, 368 insertions(+), 79 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-25 13:07:41 UTC (rev 373993) +++ PKGBUILD 2018-08-25 13:17:38 UTC (rev 373994) @@ -1,5 +1,6 @@ # $Id$ # Maintainer: Gaetan Bisson <[email protected]> +# Maintainer: Bruno Pagani <[email protected]> # Contributor: Daniel J Griffiths <[email protected]> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: tobias <[email protected]> @@ -6,44 +7,68 @@ # Contributor: Ben <[email protected]> pkgname=scribus -pkgver=1.4.7 +pkgver=1.5.4 pkgrel=1 -pkgdesc='Desktop publishing software' -url='http://www.scribus.net/' +pkgdesc="Desktop publishing software" +arch=('x86_64') +url="https://www.scribus.net/"; license=('GPL') -arch=('x86_64') -makedepends=('cmake' 'boost' 'mesa') -optdepends=('tk: scripts based on tkinter') -depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen' - 'ghostscript' 'python2' 'podofo' 'boost-libs' - 'desktop-file-utils' 'shared-mime-info') -validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA') -source=("https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"{,.asc}) -sha256sums=('42d335b4a59c26c8ae1e3f601676baa3c42b035b8cde326d195f7a30078e5fec' - 'SKIP') +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} + 'fix-15289.patch' + 'fix-15289-2.patch') +sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03' + 'SKIP' + '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36' + 'edb124793e1b838e60cff4c21c536e16c77e91322f9837eab75d9ff06439ad4f') +validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA' # Peter Linnell <[email protected]> + '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team (www.scribus.net) <[email protected]> prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - 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}/* - install -d build + cd ${pkgname}-${pkgver} + + patch -p1 -i ../fix-15289.patch + patch -p1 -i ../fix-15289-2.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 "${srcdir}/${pkgname}-${pkgver}/build" - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DLIB_SUFFIX="" - make + 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 "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - install -Dm644 ../scribus.desktop "${pkgdir}/usr/share/applications/scribus.desktop" - install -Dm644 ../resources/icons/AppIcon.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/scribus.png" + 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: PKGBUILD.next =================================================================== --- PKGBUILD.next 2018-08-25 13:07:41 UTC (rev 373993) +++ PKGBUILD.next 2018-08-25 13:17:38 UTC (rev 373994) @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 173822 2016-05-05 09:44:28Z bisson $ -# Maintainer: Gaetan Bisson <[email protected]> -# Contributor: Daniel J Griffiths <[email protected]> -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: tobias <[email protected]> -# Contributor: Ben <[email protected]> - -pkgname=scribus -pkgver=1.5.3 -pkgrel=1 -pkgdesc='Desktop publishing software' -url='http://www.scribus.net/' -license=('GPL') -arch=('x86_64') -makedepends=('cmake' 'boost') -optdepends=('tk: scripts based on tkinter') -depends=('qt5-quickcontrols' 'qt5-tools' 'boost-libs' 'cairo' 'lcms2' - 'libcups' 'libxml2' 'podofo' 'hunspell' 'harfbuzz-icu' - 'librevenge' 'python2' 'ghostscript' 'boost-libs' - 'graphicsmagick') -validpgpkeys=('757F5E9B13DD648887AD50092D47C099E782504E') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc}) -sha256sums=('73a30b4727e19f5d301a936d23a84275cc4f5613a92416cbd843f5167721d74f' - 'SKIP') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - 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}/* - install -d build -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DLIB_SUFFIX="" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - make DESTDIR="${pkgdir}" install - install -Dm644 ../scribus.desktop "${pkgdir}/usr/share/applications/scribus.desktop" -} Added: fix-15289-2.patch =================================================================== --- fix-15289-2.patch (rev 0) +++ fix-15289-2.patch 2018-08-25 13:17:38 UTC (rev 373994) @@ -0,0 +1,243 @@ +From 7d4ceeb5cac32287769e3c0238699e0b3e56c24d Mon Sep 17 00:00:00 2001 +From: Jean Ghali <[email protected]> +Date: Wed, 2 May 2018 14:22:50 +0000 +Subject: [PATCH] #15289: FTBFS when using poppler 0.64.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@22513 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 42 +++++++++++++++++--------------- + scribus/plugins/import/pdf/slaoutput.h | 26 +++++++++++++++----- + 2 files changed, 42 insertions(+), 26 deletions(-) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 257deb30c6..96847508ba 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -6,7 +6,7 @@ for which a new license (GPL+exception) is in place. + */ + + #include "slaoutput.h" +-#include <poppler/cpp/poppler-version.h> ++ + #include <poppler/GlobalParams.h> + #include <poppler/poppler-config.h> + #include <poppler/FileSpec.h> +@@ -20,12 +20,6 @@ for which a new license (GPL+exception) is in place. + #include "util_math.h" + #include <tiffio.h> + +-#define POPPLER_VERSION_ENCODE(major, minor, micro) ( \ +- ((major) * 10000) \ +- + ((minor) * 100) \ +- + ((micro) * 1)) +-#define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSION_MAJOR, POPPLER_VERSION_MINOR, POPPLER_VERSION_MICRO) +- + LinkSubmitForm::LinkSubmitForm(Object *actionObj) + { + Object obj1, obj2, obj3; +@@ -44,7 +38,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj) + { + if (obj3.isName()) + { +- char *name = obj3.getName(); ++ POPPLER_CONST char *name = obj3.getName(); + if (!strcmp(name, "URL")) + { + obj2 = obj1.dictLookup("F"); +@@ -508,8 +502,8 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do + QString fileName = ""; + if (act->getKind() == actionGoTo) + { +- LinkGoTo *gto = (LinkGoTo*)act; +- LinkDest *dst = gto->getDest(); ++ LinkGoTo *gto = (LinkGoTo*) act; ++ POPPLER_CONST LinkDest *dst = gto->getDest(); + if (dst) + { + if (dst->getKind() == destXYZ) +@@ -528,7 +522,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do + } + else + { +- GooString *ndst = gto->getNamedDest(); ++ POPPLER_CONST GooString *ndst = gto->getNamedDest(); + if (ndst) + { + LinkDest *dstn = pdfDoc->findDest(ndst); +@@ -555,7 +549,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do + { + LinkGoToR *gto = (LinkGoToR*)act; + fileName = UnicodeParsedString(gto->getFileName()); +- LinkDest *dst = gto->getDest(); ++ POPPLER_CONST LinkDest *dst = gto->getDest(); + if (dst) + { + if (dst->getKind() == destXYZ) +@@ -568,7 +562,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do + } + else + { +- GooString *ndst = gto->getNamedDest(); ++ POPPLER_CONST GooString *ndst = gto->getNamedDest(); + if (ndst) + { + LinkDest *dstn = pdfDoc->findDest(ndst); +@@ -709,7 +703,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, + bool bgFound = false; + if (achar) + { +- AnnotColor *bgCol = achar->getBackColor(); ++ POPPLER_CONST AnnotColor *bgCol = achar->getBackColor(); + if (bgCol) + { + bgFound = true; +@@ -717,7 +711,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, + } + else + CurrColorFill = CommonStrings::None; +- AnnotColor *fgCol = achar->getBorderColor(); ++ POPPLER_CONST AnnotColor *fgCol = achar->getBorderColor(); + if (fgCol) + { + fgFound = true; +@@ -1054,7 +1048,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + int xco = 0; + int yco = 0; + LinkGoTo *gto = (LinkGoTo*)Lact; +- LinkDest *dst = gto->getDest(); ++ POPPLER_CONST LinkDest *dst = gto->getDest(); + if (dst) + { + if (dst->getKind() == destXYZ) +@@ -1075,7 +1069,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + } + else + { +- GooString *ndst = gto->getNamedDest(); ++ POPPLER_CONST GooString *ndst = gto->getNamedDest(); + if (ndst) + { + LinkDest *dstn = pdfDoc->findDest(ndst); +@@ -1107,7 +1101,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + int yco = 0; + LinkGoToR *gto = (LinkGoToR*)Lact; + QString fileName = UnicodeParsedString(gto->getFileName()); +- LinkDest *dst = gto->getDest(); ++ POPPLER_CONST LinkDest *dst = gto->getDest(); + if (dst) + { + if (dst->getKind() == destXYZ) +@@ -1123,7 +1117,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano) + } + else + { +- GooString *ndst = gto->getNamedDest(); ++ POPPLER_CONST GooString *ndst = gto->getNamedDest(); + if (ndst) + { + LinkDest *dstn = pdfDoc->findDest(ndst); +@@ -3001,6 +2995,14 @@ void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int widt + if ((mm.type() == QTransform::TxShear) || (mm.type() == QTransform::TxRotate)) + { + ite->setImageRotation(-tline.angle()); ++ /*QTransform rotMat; ++ rotMat.rotate(tline.angle()); ++ QTransform imgMat = m_ctm * rotMat.inverted(); ++ double scaleX = sqrt(imgMat.m11() * imgMat.m11() + imgMat.m12() * imgMat.m12()); ++ double scaleY = sqrt(imgMat.m21() * imgMat.m21() + imgMat.m22() * imgMat.m22()); ++ imgMat.scale(1.0 / scaleX, 1.0 / scaleY); ++ if (!imgMat.isIdentity()) ++ img = img.transformed(imgMat);*/ + } + else + { +@@ -4031,7 +4033,7 @@ QString SlaOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int + return fNam; + } + +-QString SlaOutputDev::getAnnotationColor(AnnotColor *color) ++QString SlaOutputDev::getAnnotationColor(const AnnotColor *color) + { + QString fNam; + QString namPrefix = "FromPDF"; +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 6698c030e0..7317cae210 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -26,6 +26,7 @@ for which a new license (GPL+exception) is in place. + #include "selection.h" + #include "vgradient.h" + ++#include <poppler/cpp/poppler-version.h> + #include <poppler/goo/gtypes.h> + #include <poppler/Object.h> + #include <poppler/OutputDev.h> +@@ -49,6 +50,18 @@ for which a new license (GPL+exception) is in place. + #include <poppler/splash/SplashPath.h> + #include <poppler/splash/SplashGlyphBitmap.h> + ++#define POPPLER_VERSION_ENCODE(major, minor, micro) ( \ ++ ((major) * 10000) \ ++ + ((minor) * 100) \ ++ + ((micro) * 1)) ++#define POPPLER_ENCODED_VERSION POPPLER_VERSION_ENCODE(POPPLER_VERSION_MAJOR, POPPLER_VERSION_MINOR, POPPLER_VERSION_MICRO) ++ ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 64, 0) ++#define POPPLER_CONST const ++#else ++#define POPPLER_CONST ++#endif ++ + //------------------------------------------------------------------------ + // LinkSubmitData + //------------------------------------------------------------------------ +@@ -61,9 +74,9 @@ class LinkSubmitForm: public LinkAction + // Destructor. + virtual ~LinkSubmitForm(); + // Was the LinkImportData created successfully? +- virtual GBool isOk() { return fileName != NULL; } ++ virtual GBool isOk() POPPLER_CONST { return fileName != NULL; } + // Accessors. +- virtual LinkActionKind getKind() { return actionUnknown; } ++ virtual LinkActionKind getKind() POPPLER_CONST { return actionUnknown; } + GooString *getFileName() { return fileName; } + int getFlags() { return m_flags; } + private: +@@ -83,9 +96,9 @@ class LinkImportData: public LinkAction + // Destructor. + virtual ~LinkImportData(); + // Was the LinkImportData created successfully? +- virtual GBool isOk() { return fileName != NULL; } ++ virtual GBool isOk() POPPLER_CONST { return fileName != NULL; } + // Accessors. +- virtual LinkActionKind getKind() { return actionUnknown; } ++ virtual LinkActionKind getKind() POPPLER_CONST { return actionUnknown; } + GooString *getFileName() { return fileName; } + private: + GooString *fileName; // file name +@@ -98,7 +111,7 @@ class SplashOutFontFileID: public SplashFontFileID + { + public: + +- SplashOutFontFileID(Ref *rA) { r = *rA; } ++ SplashOutFontFileID(const Ref *rA) { r = *rA; } + ~SplashOutFontFileID() {} + GBool matches(SplashFontFileID *id) + { +@@ -146,6 +159,7 @@ class SlaOutputDev : public OutputDev + public: + SlaOutputDev(ScribusDoc* doc, QList<PageItem*> *Elements, QStringList *importedColors, int flags); + virtual ~SlaOutputDev(); ++ + LinkAction* SC_getAction(AnnotWidget *ano); + LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano); + static GBool annotations_callback(Annot *annota, void *user_data); +@@ -261,7 +275,7 @@ class SlaOutputDev : public OutputDev + private: + void getPenState(GfxState *state); + QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade); +- QString getAnnotationColor(AnnotColor *color); ++ QString getAnnotationColor(const AnnotColor *color); + QString convertPath(GfxPath *path); + int getBlendMode(GfxState *state); + void applyMask(PageItem *ite); Added: fix-15289.patch =================================================================== --- fix-15289.patch (rev 0) +++ fix-15289.patch 2018-08-25 13:17:38 UTC (rev 373994) @@ -0,0 +1,70 @@ +From d867ec3c386baaed1b8e076dd70b278863411480 Mon Sep 17 00:00:00 2001 +From: Jean Ghali <[email protected]> +Date: Mon, 30 Apr 2018 09:19:33 +0000 +Subject: [PATCH] =?UTF-8?q?#15289:=20FTBFS=201.5.4=20with=20error:=20inval?= + =?UTF-8?q?id=20conversion=20from=20=E2=80=98const=20GooString*=E2=80=99?= + =?UTF-8?q?=20to=20=E2=80=98GooString*=E2=80=99?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://scribus.net/trunk/Scribus@22498 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/importpdf.cpp | 2 +- + scribus/plugins/import/pdf/importpdf.h | 2 +- + scribus/plugins/import/pdf/slaoutput.cpp | 2 +- + scribus/plugins/import/pdf/slaoutput.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp +index c1802861aa..d4c5a9ba49 100644 +--- a/scribus/plugins/import/pdf/importpdf.cpp ++++ b/scribus/plugins/import/pdf/importpdf.cpp +@@ -1081,7 +1081,7 @@ 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(); +diff --git a/scribus/plugins/import/pdf/importpdf.h b/scribus/plugins/import/pdf/importpdf.h +index c8c5efcd0d..5249562692 100644 +--- a/scribus/plugins/import/pdf/importpdf.h ++++ b/scribus/plugins/import/pdf/importpdf.h +@@ -81,7 +81,7 @@ class PdfPlug : public QObject + 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/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index be1815dc29..17b6357246 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -4252,7 +4252,7 @@ void SlaOutputDev::pushGroup(QString maskName, GBool forSoftMask, GBool alpha, b + m_groupStack.push(gElements); + } + +-QString SlaOutputDev::UnicodeParsedString(GooString *s1) ++QString SlaOutputDev::UnicodeParsedString(const GooString *s1) + { + if ( !s1 || s1->getLength() == 0 ) + return QString(); +diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index 20e8b2d311..6698c030e0 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -266,7 +266,7 @@ class SlaOutputDev : public OutputDev + 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); ++ QString UnicodeParsedString(const GooString *s1); + bool checkClip(); + bool pathIsClosed; + QString CurrColorFill;
