[arch-commits] Commit in scribus/repos (4 files)
Felix Yan
felixonmars at archlinux.org
Mon Mar 30 10:54:36 UTC 2020
Date: Monday, March 30, 2020 @ 10:54:36
Author: felixonmars
Revision: 606741
archrelease: copy trunk to community-staging-x86_64
Added:
scribus/repos/community-staging-x86_64/
scribus/repos/community-staging-x86_64/PKGBUILD
(from rev 606740, scribus/trunk/PKGBUILD)
scribus/repos/community-staging-x86_64/scribus-boost-1.71.patch
(from rev 606740, scribus/trunk/scribus-boost-1.71.patch)
scribus/repos/community-staging-x86_64/scribus-poppler-0.86.patch
(from rev 606740, scribus/trunk/scribus-poppler-0.86.patch)
----------------------------+
PKGBUILD | 83 +++++++++++++++++++
scribus-boost-1.71.patch | 12 ++
scribus-poppler-0.86.patch | 186 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 281 insertions(+)
Copied: scribus/repos/community-staging-x86_64/PKGBUILD (from rev 606740, scribus/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2020-03-30 10:54:36 UTC (rev 606741)
@@ -0,0 +1,83 @@
+# 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.5
+pkgrel=9
+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}
+ scribus-boost-1.71.patch
+ scribus-poppler-0.82.patch::"https://github.com/scribusproject/scribus/commit/6db15ec1.patch"
+ scribus-poppler-0.83.patch::"https://github.com/scribusproject/scribus/commit/b51c2bab.patch"
+ scribus-poppler-0.84.patch::"https://github.com/scribusproject/scribus/commit/37425599.patch"
+ scribus-poppler-0.86.patch)
+sha256sums=('7908b21a6ce843269f58cedf5f8f791893257e6201cce5fbddc70daca2fe3f71'
+ 'SKIP'
+ '19e20b11c0bce2dce07a845e31adb9ff1b680746698fa150d4572776513b243e'
+ 'a948a5ee53842ffc8acc3f6720291819d55d2ff370c2b46ddffc1122cba07e7f'
+ '5631f5a19565cdbd1290c4e1a2c5a87e56ca0af17017c191dc0c00c97a456b3b'
+ '7c0c13abec2682398591ee66e9ab4547b9e0da66f135dd2357f8977589403694'
+ 'ac660067894effdde20e92c2f32095336707a7f6f3f277316498999096f65445')
+validpgpkeys=(5086B8D68E70FDDF4C40045AEF7B95E7F60166DA # Peter Linnell <plinnell at scribus.net>
+ 757F5E9B13DD648887AD50092D47C099E782504E # The Scribus Team (www.scribus.net) <the_scribus_team at scribus.net>
+ 6558BE84D27273A438A151198BEA48118AEBEE64) # Craig Bradney <cbradney at 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
+
+ patch -p1 -i ../scribus-boost-1.71.patch # Fix build with boost 1.71
+ patch -p1 -i ../scribus-poppler-0.82.patch # Fix build with poppler 0.82
+ patch -p1 -i ../scribus-poppler-0.83.patch # Fix build with poppler 0.83
+ patch -p1 -i ../scribus-poppler-0.84.patch # Fix build with poppler 0.84
+ patch -p1 -i ../scribus-poppler-0.86.patch # Fix build with poppler 0.86
+}
+
+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-staging-x86_64/scribus-boost-1.71.patch (from rev 606740, scribus/trunk/scribus-boost-1.71.patch)
===================================================================
--- community-staging-x86_64/scribus-boost-1.71.patch (rev 0)
+++ community-staging-x86_64/scribus-boost-1.71.patch 2020-03-30 10:54:36 UTC (rev 606741)
@@ -0,0 +1,12 @@
+diff --git a/scribus/plugins/tools/2geomtools/CMakeLists.txt b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+index 9b6683cbb..d2e1ee5ea 100644
+--- a/scribus/plugins/tools/2geomtools/CMakeLists.txt
++++ b/scribus/plugins/tools/2geomtools/CMakeLists.txt
+@@ -3,6 +3,6 @@ include_directories(
+ ${CMAKE_SOURCE_DIR}/scribus
+ )
+
+-include_directories( ${Boost_INCLUDE_DIR} )
++include_directories( ${Boost_INCLUDE_DIRS} )
+ add_subdirectory (meshdistortion)
+ add_subdirectory (pathalongpath)
Copied: scribus/repos/community-staging-x86_64/scribus-poppler-0.86.patch (from rev 606740, scribus/trunk/scribus-poppler-0.86.patch)
===================================================================
--- community-staging-x86_64/scribus-poppler-0.86.patch (rev 0)
+++ community-staging-x86_64/scribus-poppler-0.86.patch 2020-03-30 10:54:36 UTC (rev 606741)
@@ -0,0 +1,186 @@
+diff --git a/scribus/plugins/import/pdf/importpdf.cpp b/scribus/plugins/import/pdf/importpdf.cpp
+index 427cd66ef..7fe18d86b 100644
+--- a/scribus/plugins/import/pdf/importpdf.cpp
++++ b/scribus/plugins/import/pdf/importpdf.cpp
+@@ -792,13 +792,13 @@ bool PdfPlug::convert(const QString& fn)
+ if (names.isDict())
+ {
+ LinkAction *linkAction = nullptr;
+- linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI());
++ linkAction = LinkAction::parseAction(&names, pdfDoc->getCatalog()->getBaseURI()).get();
+ if (linkAction)
+ {
+ LinkJavaScript *jsa = (LinkJavaScript*)linkAction;
+ if (jsa->isOk())
+ {
+- QString script = UnicodeParsedString(jsa->getScript());
++ QString script = QString::fromStdString(jsa->getScript());
+ if (script.startsWith("this."))
+ {
+ script.remove(0, 5);
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 93ceb1e30..d14dfa1d9 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -289,7 +289,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const char *key, AnnotWidget *a
+ {
+ Object actionObject = additionalActionsObject.dictLookup(key);
+ if (actionObject.isDict())
+- linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI());
++ linkAction = LinkAction::parseAction(&actionObject, pdfDoc->getCatalog()->getBaseURI()).get();
+ }
+ }
+ return linkAction;
+@@ -420,7 +420,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ if (ndst)
+ {
+- LinkDest *dstn = pdfDoc->findDest(ndst);
++ LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ if (dstn)
+ {
+ if (dstn->getKind() == destXYZ)
+@@ -464,7 +464,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ if (ndst)
+ {
+- LinkDest *dstn = pdfDoc->findDest(ndst);
++ LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ if (dstn)
+ {
+ if (dstn->getKind() == destXYZ)
+@@ -482,7 +482,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, double xCoor, double yCoor, do
+ {
+ LinkURI *gto = (LinkURI*)act;
+ validLink = true;
+- fileName = UnicodeParsedString(gto->getURI());
++ fileName = QString::fromStdString(gto->getURI());
+ }
+ if (validLink)
+ {
+@@ -895,7 +895,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ if (jsa->isOk())
+ {
+ ite->annotation().setActionType(1);
+- ite->annotation().setAction(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setAction(QString::fromStdString(jsa->getScript()));
+ }
+ }
+ else if (Lact->getKind() == actionGoTo)
+@@ -932,7 +932,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ if (ndst)
+ {
+- LinkDest *dstn = pdfDoc->findDest(ndst);
++ LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ if (dstn)
+ {
+ if (dstn->getKind() == destXYZ)
+@@ -984,7 +984,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ POPPLER_CONST GooString *ndst = gto->getNamedDest();
+ if (ndst)
+ {
+- LinkDest *dstn = pdfDoc->findDest(ndst);
++ LinkDest *dstn = pdfDoc->findDest(ndst).get();
+ if (dstn)
+ {
+ if (dstn->getKind() == destXYZ)
+@@ -1004,7 +1004,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ else if (Lact->getKind() == actionUnknown)
+ {
+ LinkUnknown *uno = (LinkUnknown*)Lact;
+- QString actString = UnicodeParsedString(uno->getAction());
++ QString actString = QString::fromStdString(uno->getAction());
+ if (actString == "ResetForm")
+ {
+ ite->annotation().setActionType(4);
+@@ -1048,7 +1048,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ {
+ LinkNamed *uno = (LinkNamed*)Lact;
+ ite->annotation().setActionType(10);
+- ite->annotation().setAction(UnicodeParsedString(uno->getName()));
++ ite->annotation().setAction(QString::fromStdString(uno->getName()));
+ }
+ else
+ qDebug() << "Found unsupported Action of type" << Lact->getKind();
+@@ -1061,7 +1061,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setD_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setD_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ }
+ }
+@@ -1075,7 +1075,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setE_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setE_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ }
+ }
+@@ -1089,7 +1089,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setX_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setX_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ }
+ }
+@@ -1103,7 +1103,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setFo_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setFo_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ }
+ }
+@@ -1117,7 +1117,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setBl_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setBl_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ }
+ }
+@@ -1131,7 +1131,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setC_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setC_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ }
+ }
+@@ -1145,7 +1145,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setF_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setF_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ ite->annotation().setFormat(5);
+ }
+@@ -1160,7 +1160,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setK_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setK_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ ite->annotation().setFormat(5);
+ }
+@@ -1175,7 +1175,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotWidget *ano)
+ LinkJavaScript *jsa = (LinkJavaScript*)Aact;
+ if (jsa->isOk())
+ {
+- ite->annotation().setV_act(UnicodeParsedString(jsa->getScript()));
++ ite->annotation().setV_act(QString::fromStdString(jsa->getScript()));
+ ite->annotation().setAAact(true);
+ }
+ }
More information about the arch-commits
mailing list