rpms/scribus
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebuild for poppler-23.02.0

Browse source 
Backported handling of new API of getLineDash()
This commit is contained in:
Marek Kasik 2023-02-06 18:34:00 +01:00
commit b3133f72fa
2 changed files with 33 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

27
scribus-1.5.8-poppler-22.09.0.patch Normal file
View file

@ -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)

7
scribus.spec
View file

@ -1,6 +1,6 @@
Name: scribus
Version: 1.5.8
Release: 8%{?dist}
Release: 9%{?dist}
Summary: Desktop Publishing application written in Qt
# swatches bring in the fun licenses
License: GPLv2+ and OGL and CC0 and CC-BY and CC-BY-SA and Public Domain and ASL 2.0 and LGPLv2+
@ -15,6 +15,7 @@ Source0: %{name}-%{version}-free.tar.xz
#Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc
Patch0: scribus-1.5.8-poppler-22.08.0.patch
Patch1: scribus-1.5.8-poppler-22.09.0.patch
BuildRequires: boost-devel
BuildRequires: cmake
@ -139,6 +140,10 @@ appstream-util validate-relax --nonet \
%changelog
* Mon Feb 06 2023 Marek Kasik <mkasik@redhat.com> - 1.5.8-9
- Rebuild for poppler-23.02.0
- Backported handling of new API of getLineDash()
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild