- try with poppler-22.09.0 patch from Fedora; release 5

diff --git a/scribus-poppler-22.09.0.patch b/scribus-poppler-22.09.0.patch
new file mode 100644 (file)
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;\r
+       }\r
+       double lw = state->getLineWidth();\r
+-      double *dashPattern;\r
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)\r
++      const auto& dashPattern = state->getLineDash(&DashOffset);\r
++      QVector<double> pattern(dashPattern.size());\r
++      for (size_t i = 0; i < dashPattern.size(); ++i)\r
++              pattern[i] = dashPattern[i] / lw;\r
++      DashValues = pattern;\r
++#else\r
++      double* dashPattern;\r
+       int dashLength;\r
+       state->getLineDash(&dashPattern, &dashLength, &DashOffset);\r
+       QVector<double> pattern(dashLength);\r
+       for (int i = 0; i < dashLength; ++i)\r
+-      {\r
+               pattern[i] = dashPattern[i] / lw;\r
+-      }\r
+       DashValues = pattern;\r
++#endif\r
+ }\r
+ \r
+ int SlaOutputDev::getBlendMode(GfxState *state)\r

diff --git a/scribus.spec b/scribus.spec
index d46860948e8d12db3a2c1d2a1c3194bb596c2053..0b450702db33f5187509a1845da708f9a5f67b2e 100644 (file)
--- 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