[arch-commits] Commit in scribus/trunk (PKGBUILD scribus-1.5.8-poppler-22.09.0.patch)

[Andreas Radke]

    Date: Friday, September 2, 2022 @ 08:48:35
  Author: andyrtr
Revision: 1290848

upgpkg: scribus 1.5.8-9: poppler 22.09.0 rebuild

Added:
  scribus/trunk/scribus-1.5.8-poppler-22.09.0.patch
Modified:
  scribus/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |    9 ++++++---
 scribus-1.5.8-poppler-22.09.0.patch |   20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-02 08:48:24 UTC (rev 1290847)
+++ PKGBUILD	2022-09-02 08:48:35 UTC (rev 1290848)
@@ -8,7 +8,7 @@
 
 pkgname=scribus
 pkgver=1.5.8
-pkgrel=8
+pkgrel=9
 pkgdesc="Desktop publishing software"
 arch=(x86_64)
 url="https://www.scribus.net/"
@@ -25,13 +25,15 @@
         $pkgname-poppler-22.02.0.patch::https://github.com/scribusproject/scribus/commit/85c0dff3422f.patch
         $pkgname-poppler-22.02.0-fixup.patch::https://github.com/scribusproject/scribus/commit/f75c1613db67.patch
         $pkgname-poppler-22.03.0.patch::https://github.com/scribusproject/scribus/commit/f19410ac3b27.patch
-        $pkgname-poppler-22.04.0.patch::https://github.com/scribusproject/scribus/commit/f2237b8f0b5c.patch)
+        $pkgname-poppler-22.04.0.patch::https://github.com/scribusproject/scribus/commit/f2237b8f0b5c.patch
+	scribus-1.5.8-poppler-22.09.0.patch)
 sha256sums=('47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74'
             'SKIP'
             '718ae9c882889b56919ab9718185b915a75e75e193a028539722b537f528c3dd'
             '2b57c0c6dbc93037b83e392d4721523efbccd8af1fe6fc11a26f1d2933b14a85'
             '986717d7c99a418d765e6b3d8b37165067548e62b6febb9c31f8831689f3540e'
-            '1649ca7476fc2f548b64e72773aa94933a3993f3fd2cbb54a30486dc49575816')
+            '1649ca7476fc2f548b64e72773aa94933a3993f3fd2cbb54a30486dc49575816'
+            'd1712c200f7be2eb4f791cc046379747af39a1f9a262a090ae2de990b939b9b3')
 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>
@@ -42,6 +44,7 @@
   patch -Np1 -i ../$pkgname-poppler-22.02.0-fixup.patch
   patch -Np1 -i ../$pkgname-poppler-22.03.0.patch
   patch -Np1 -i ../$pkgname-poppler-22.04.0.patch
+  patch -Np1 -i ../scribus-1.5.8-poppler-22.09.0.patch
 }
 
 build() {

Added: scribus-1.5.8-poppler-22.09.0.patch
===================================================================
--- scribus-1.5.8-poppler-22.09.0.patch	                        (rev 0)
+++ scribus-1.5.8-poppler-22.09.0.patch	2022-09-02 08:48:35 UTC (rev 1290848)
@@ -0,0 +1,20 @@
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3741,9 +3741,16 @@ void SlaOutputDev::getPenState(GfxState *state)
+ 			break;
+ 	}
+ 	double lw = state->getLineWidth();
+-	double *dashPattern;
+ 	int dashLength;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)
++	const double *dashPattern;
++	const std::vector<double> &dash = state->getLineDash(&DashOffset);
++	dashPattern = dash.data();
++	dashLength = dash.size();
++#else
++	double *dashPattern;
+ 	state->getLineDash(&dashPattern, &dashLength, &DashOffset);
++#endif
+ 	QVector<double> pattern(dashLength);
+ 	for (int i = 0; i < dashLength; ++i)
+ 	{