From c19bec2109e5b6c901547f5f52a10fabdc5106e7 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 7 Mar 2023 21:58:58 +0100
Subject: [PATCH] - try with poppler-22.09.0 patch from Fedora; release 5

---
 scribus-poppler-22.09.0.patch | 27 +++++++++++++++++++++++++++
 scribus.spec                  | 11 +++++------
 2 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 scribus-poppler-22.09.0.patch

diff --git a/scribus-poppler-22.09.0.patch b/scribus-poppler-22.09.0.patch
new file mode 100644
index 0000000..b11cef0
--- /dev/null
+++ b/scribus-poppler-22.09.0.patch
@@ -0,0 +1,27 @@
+--- scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp
++++ scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3762,15 +3762,21 @@ void SlaOutputDev::getPenState(GfxState
+ 			break;
+ 	}
+ 	double lw = state->getLineWidth();
+-	double *dashPattern;
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)
++	const auto& dashPattern = state->getLineDash(&DashOffset);
++	QVector<double> pattern(dashPattern.size());
++	for (size_t i = 0; i < dashPattern.size(); ++i)
++		pattern[i] = dashPattern[i] / lw;
++	DashValues = pattern;
++#else
++	double* dashPattern;
+ 	int dashLength;
+ 	state->getLineDash(&dashPattern, &dashLength, &DashOffset);
+ 	QVector<double> pattern(dashLength);
+ 	for (int i = 0; i < dashLength; ++i)
+-	{
+ 		pattern[i] = dashPattern[i] / lw;
+-	}
+ 	DashValues = pattern;
++#endif
+ }
+ 
+ int SlaOutputDev::getBlendMode(GfxState *state)
diff --git a/scribus.spec b/scribus.spec
index d468609..0b45070 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -12,13 +12,14 @@ Summary:	Scribus - Open Source Desktop Publishing
 Summary(pl.UTF-8):	Scribus - DTP dla Wolnego Oprogramowania
 Name:		scribus
 Version:	1.5.8
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		X11/Applications/Publishing
 Source0:	https://downloads.sourceforge.net/scribus/%{name}-%{version}.tar.xz
 # Source0-md5:	ff9e966a2251a6c8800bb26fcb4b7c59
 Patch0:		%{name}-docs.patch
 Patch1:		%{name}-poppler.patch
+Patch2:		%{name}-poppler-22.09.0.patch
 URL:		https://www.scribus.net/
 BuildRequires:	GraphicsMagick-devel
 BuildRequires:	Qt5Core-devel >= %{qt_ver}
@@ -155,16 +156,14 @@ Domyślne szablony dokumentów dostarczane wraz ze Scribusem.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
-mkdir -p build
-cd build
-
-%cmake .. \
+%cmake -B build \
 	-DWANT_CPP17=ON \
 	-DWANT_GRAPHICSMAGICK:BOOL=ON
 
-%{__make}
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-- 
2.44.0