From d345ad98f0d3aa7427a58443f3c1756923f12c89 Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Mon, 12 Dec 2022 18:32:06 +0100 Subject: [PATCH] scribus: rebuild for poppler-22.12.0 --- .../patches/0004-poppler-22.09.0-fix.patch | 22 +++++++++++++++++++ srcpkgs/scribus/template | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/scribus/patches/0004-poppler-22.09.0-fix.patch diff --git a/srcpkgs/scribus/patches/0004-poppler-22.09.0-fix.patch b/srcpkgs/scribus/patches/0004-poppler-22.09.0-fix.patch new file mode 100644 index 00000000000..11107fadfdd --- /dev/null +++ b/srcpkgs/scribus/patches/0004-poppler-22.09.0-fix.patch @@ -0,0 +1,22 @@ +Index: scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp +=================================================================== +--- scribus-1.5.8.orig/scribus/plugins/import/pdf/slaoutput.cpp ++++ scribus-1.5.8/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3741,9 +3741,16 @@ void SlaOutputDev::getPenState(GfxState + 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 &dash = state->getLineDash(&DashOffset); ++ dashPattern = dash.data(); ++ dashLength = dash.size(); ++#else ++ double *dashPattern; + state->getLineDash(&dashPattern, &dashLength, &DashOffset); ++#endif + QVector pattern(dashLength); + for (int i = 0; i < dashLength; ++i) + { diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template index e914a8e10ed..63cefeb7693 100644 --- a/srcpkgs/scribus/template +++ b/srcpkgs/scribus/template @@ -1,7 +1,7 @@ # Template file for 'scribus' pkgname=scribus version=1.5.8 -revision=4 +revision=5 build_style=cmake configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr -DWANT_GRAPHICSMAGICK=1 -DWANT_CPP17=ON"