[arch-commits] Commit in scribus/repos (4 files)
Bruno Pagani
archange at archlinux.org
Sat Aug 25 13:17:52 UTC 2018
Date: Saturday, August 25, 2018 @ 13:17:52
Author: archange
Revision: 373995
archrelease: copy trunk to community-testing-x86_64
Added:
scribus/repos/community-testing-x86_64/
scribus/repos/community-testing-x86_64/PKGBUILD
(from rev 373994, scribus/trunk/PKGBUILD)
scribus/repos/community-testing-x86_64/fix-15289-2.patch
(from rev 373994, scribus/trunk/fix-15289-2.patch)
scribus/repos/community-testing-x86_64/fix-15289.patch
(from rev 373994, scribus/trunk/fix-15289.patch)
-------------------+
PKGBUILD | 74 +++++++++++++++
fix-15289-2.patch | 243 ++++++++++++++++++++++++++++++++++++++++++++++++++++
fix-15289.patch | 70 ++++++++++++++
3 files changed, 387 insertions(+)
Copied: scribus/repos/community-testing-x86_64/PKGBUILD (from rev 373994, scribus/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2018-08-25 13:17:52 UTC (rev 373995)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+# Contributor: Ronald van Haren <ronald.archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Ben <ben at benmazer.net>
+
+pkgname=scribus
+pkgver=1.5.4
+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}
+ 'fix-15289.patch'
+ 'fix-15289-2.patch')
+sha256sums=('6480925250b2bb07028e2f378c02b67fe3e33206743671e03c07c701cd05da03'
+ 'SKIP'
+ '0a782958360ad70145a588a5e1c0044d162344e96b4ff9b0aeb31388cc9b2e36'
+ 'edb124793e1b838e60cff4c21c536e16c77e91322f9837eab75d9ff06439ad4f')
+validpgpkeys=('5086B8D68E70FDDF4C40045AEF7B95E7F60166DA' # Peter Linnell <plinnell at scribus.net>
+ '757F5E9B13DD648887AD50092D47C099E782504E') # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
+
+prepare() {
+ 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 ${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-testing-x86_64/fix-15289-2.patch (from rev 373994, scribus/trunk/fix-15289-2.patch)
===================================================================
--- community-testing-x86_64/fix-15289-2.patch (rev 0)
+++ community-testing-x86_64/fix-15289-2.patch 2018-08-25 13:17:52 UTC (rev 373995)
@@ -0,0 +1,243 @@
+From 7d4ceeb5cac32287769e3c0238699e0b3e56c24d Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali at libertysurf.fr>
+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);
Copied: scribus/repos/community-testing-x86_64/fix-15289.patch (from rev 373994, scribus/trunk/fix-15289.patch)
===================================================================
--- community-testing-x86_64/fix-15289.patch (rev 0)
+++ community-testing-x86_64/fix-15289.patch 2018-08-25 13:17:52 UTC (rev 373995)
@@ -0,0 +1,70 @@
+From d867ec3c386baaed1b8e076dd70b278863411480 Mon Sep 17 00:00:00 2001
+From: Jean Ghali <jghali at libertysurf.fr>
+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;
More information about the arch-commits
mailing list