[arch-commits] Commit in scribus/trunk (3 files)
Antonio Rojas
arojas at archlinux.org
Thu Jun 17 07:15:54 UTC 2021
Date: Thursday, June 17, 2021 @ 07:15:54
Author: arojas
Revision: 964564
Update to 1.5.7
Modified:
scribus/trunk/PKGBUILD
Deleted:
scribus/trunk/poppler-21.3.0.patch
scribus/trunk/poppler-21.4.0.patch
----------------------+
PKGBUILD | 23 +++----------
poppler-21.3.0.patch | 81 -------------------------------------------------
poppler-21.4.0.patch | 16 ---------
3 files changed, 5 insertions(+), 115 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-06-17 04:24:40 UTC (rev 964563)
+++ PKGBUILD 2021-06-17 07:15:54 UTC (rev 964564)
@@ -6,8 +6,8 @@
# Contributor: Ben <ben at benmazer.net>
pkgname=scribus
-pkgver=1.5.6.1
-pkgrel=14
+pkgver=1.5.7
+pkgrel=1
pkgdesc="Desktop publishing software"
arch=(x86_64)
url="https://www.scribus.net/"
@@ -19,26 +19,13 @@
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}
- poppler-21.3.0.patch
- poppler-21.4.0.patch
- scribus-podofo-0.9.7.patch::https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch)
-sha256sums=('d4257695539cfa40dead8abdaf04c51e34d4d74bcad5a2c934d08e6e9d43b7ab'
- 'SKIP'
- '5d3edce42d3931d786d1f9d59bafb3291c93fd590b2a047f1e4998ec7238f5de'
- '664a6a67d9cdf2ac583249c28252e1832bf1475408c9657c42559cfdfc435d34'
- 'ef40f58da30e024d85abc20384853b4d3e7ec02ec8db97f3470528c351119d99')
+source=("https://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.asc})
+sha256sums=('318316b2cfc7a76191d3e0d3f8c2265147daea0570162028e243c292d826f8ce'
+ 'SKIP')
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}
- patch -Np1 -i ../poppler-21.3.0.patch # https://bugs.scribus.net/view.php?id=16502
- patch -Np0 -i ../poppler-21.4.0.patch # https://bugs.scribus.net/view.php?id=16536
- patch -Np1 -i ../scribus-podofo-0.9.7.patch
-}
-
build() {
cmake -B build -S ${pkgname}-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
Deleted: poppler-21.3.0.patch
===================================================================
--- poppler-21.3.0.patch 2021-06-17 04:24:40 UTC (rev 964563)
+++ poppler-21.3.0.patch 2021-06-17 07:15:54 UTC (rev 964564)
@@ -1,81 +0,0 @@
-From 7ce0ac16fd42d61ef9082b27822c7d9d79c7fef7 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali at libertysurf.fr>
-Date: Mon, 1 Mar 2021 21:52:54 +0000
-Subject: [PATCH 1/2] Attempt to fix build of pdf import plugin with poppler
- 21.03.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24537 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 12 +++++++++++-
- scribus/plugins/import/pdf/slaoutput.h | 4 ++++
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index 7cbc73e..d1b37a0 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -2292,9 +2292,19 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *sh
- return gTrue;
- }
-
--GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep)
-+#else
-+GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int /*paintType*/, int /*tilingType*/, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
-+#endif
- {
- // qDebug() << "SlaOutputDev::tilingPatternFill";
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+ const double *bbox = tPat->getBBox();
-+ const double *pmat = tPat->getMatrix();
-+ Dict *resDict = tPat->getResDict();
-+#endif
-+
- PDFRectangle box;
- Gfx *gfx;
- QString id;
-diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h
-index 5149f19..66c3420 100644
---- a/scribus/plugins/import/pdf/slaoutput.h
-+++ b/scribus/plugins/import/pdf/slaoutput.h
-@@ -197,7 +197,11 @@ public:
- void stroke(GfxState *state) override;
- void fill(GfxState *state) override;
- void eoFill(GfxState *state) override;
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+ bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, GfxTilingPattern *tPat, const double *mat, int x0, int y0, int x1, int y1, double xStep, double yStep) override;
-+#else
- GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, POPPLER_CONST_070 double *pmat, int paintType, int tilingType, Dict *resDict, POPPLER_CONST_070 double *mat, POPPLER_CONST_070 double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep) override;
-+#endif
- GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) override { qDebug() << "Function Shaded Fill"; return gFalse; }
- GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax) override;
- GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) override { return (shading->getExtend0() == shading->getExtend1()); }
-
-From 6b9ff916959bcb941866f0bd86da639a421337f8 Mon Sep 17 00:00:00 2001
-From: Jean Ghali <jghali at libertysurf.fr>
-Date: Mon, 1 Mar 2021 22:00:02 +0000
-Subject: [PATCH 2/2] Attempt to fix build of pdf import plugin with poppler
- 21.03.0
-
-git-svn-id: svn://scribus.net/trunk/Scribus@24538 11d20701-8431-0410-a711-e3c959e3b870
----
- scribus/plugins/import/pdf/slaoutput.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
-index d1b37a0..de0a414 100644
---- a/scribus/plugins/import/pdf/slaoutput.cpp
-+++ b/scribus/plugins/import/pdf/slaoutput.cpp
-@@ -2336,7 +2336,11 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *c
- // Unset the clip path as it is unrelated to the pattern's coordinate space.
- QPainterPath savedClip = m_currentClipPath;
- m_currentClipPath = QPainterPath();
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 3, 0)
-+ gfx->display(tPat->getContentStream());
-+#else
- gfx->display(str);
-+#endif
- m_currentClipPath = savedClip;
- inPattern--;
- gElements = m_groupStack.pop();
Deleted: poppler-21.4.0.patch
===================================================================
--- poppler-21.4.0.patch 2021-06-17 04:24:40 UTC (rev 964563)
+++ poppler-21.4.0.patch 2021-06-17 07:15:54 UTC (rev 964564)
@@ -1,16 +0,0 @@
-Index: scribus/plugins/import/pdf/slaoutput.h
-===================================================================
---- scribus/plugins/import/pdf/slaoutput.h (revision 24598)
-+++ scribus/plugins/import/pdf/slaoutput.h (revision 24599)
-@@ -379,7 +379,11 @@
- Catalog *catalog {nullptr};
- SplashFontEngine *m_fontEngine {nullptr};
- SplashFont *m_font {nullptr};
-+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(21, 4, 0)
-+ std::unique_ptr<FormPageWidgets> m_formWidgets;
-+#else
- FormPageWidgets *m_formWidgets {nullptr};
-+#endif
- QHash<QString, QList<int> > m_radioMap;
- QHash<int, PageItem*> m_radioButtons;
- int m_actPage;
More information about the arch-commits
mailing list