diff --git a/recipes-graphics/scribus/scribus/0001-16734-Build-break-with-poppler-22.2.0.patch b/recipes-graphics/scribus/scribus/0001-Build-break-with-poppler-22.2.0.patch similarity index 100% rename from recipes-graphics/scribus/scribus/0001-16734-Build-break-with-poppler-22.2.0.patch rename to recipes-graphics/scribus/scribus/0001-Build-break-with-poppler-22.2.0.patch diff --git a/recipes-graphics/scribus/scribus/0002-16764-Build-break-with-poppler-22.03.0.patch b/recipes-graphics/scribus/scribus/0002-Build-break-with-poppler-22.03.0.patch similarity index 100% rename from recipes-graphics/scribus/scribus/0002-16764-Build-break-with-poppler-22.03.0.patch rename to recipes-graphics/scribus/scribus/0002-Build-break-with-poppler-22.03.0.patch diff --git a/recipes-graphics/scribus/scribus/0002-16764-Build-break-with-poppler-22.04.0.patch b/recipes-graphics/scribus/scribus/0003-Build-break-with-poppler-22.04.0.patch similarity index 100% rename from recipes-graphics/scribus/scribus/0002-16764-Build-break-with-poppler-22.04.0.patch rename to recipes-graphics/scribus/scribus/0003-Build-break-with-poppler-22.04.0.patch diff --git a/recipes-graphics/scribus/scribus/0004-Build-break-with-poppler-22.09.0.patch b/recipes-graphics/scribus/scribus/0004-Build-break-with-poppler-22.09.0.patch new file mode 100644 index 0000000..120ab53 --- /dev/null +++ b/recipes-graphics/scribus/scribus/0004-Build-break-with-poppler-22.09.0.patch @@ -0,0 +1,39 @@ +From 8acd29e97813b9132e3b51b2f05e8fac65819ed7 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Thu, 1 Sep 2022 12:12:45 +0000 +Subject: [PATCH] Fix build with poppler 22.09.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@25140 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/slaoutput.cpp | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 14a3e2f..c47840b 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3741,6 +3741,13 @@ void SlaOutputDev::getPenState(GfxState *state) + break; + } + double lw = state->getLineWidth(); ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0) ++ const auto& dashPattern = state->getLineDash(&DashOffset); ++ QVector pattern(dashPattern.size()); ++ for (size_t i = 0; i < dashPattern.size(); ++i) ++ pattern[i] = dashPattern[i]; ++ DashValues = pattern; ++#else + double *dashPattern; + int dashLength; + state->getLineDash(&dashPattern, &dashLength, &DashOffset); +@@ -3750,6 +3757,7 @@ void SlaOutputDev::getPenState(GfxState *state) + pattern[i] = dashPattern[i] / lw; + } + DashValues = pattern; ++#endif + } + + int SlaOutputDev::getBlendMode(GfxState *state) +-- +2.35.3 + diff --git a/recipes-graphics/scribus/scribus_1.5.8.bb b/recipes-graphics/scribus/scribus_1.5.8.bb index 28585c3..8a724d3 100644 --- a/recipes-graphics/scribus/scribus_1.5.8.bb +++ b/recipes-graphics/scribus/scribus_1.5.8.bb @@ -19,9 +19,10 @@ inherit dos2unix SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-devel/${PV}/${BPN}-${PV}.tar.xz \ - file://0001-16734-Build-break-with-poppler-22.2.0.patch \ - file://0002-16764-Build-break-with-poppler-22.03.0.patch \ - file://0002-16764-Build-break-with-poppler-22.04.0.patch \ + file://0001-Build-break-with-poppler-22.2.0.patch \ + file://0002-Build-break-with-poppler-22.03.0.patch \ + file://0003-Build-break-with-poppler-22.04.0.patch \ + file://0004-Build-break-with-poppler-22.09.0.patch \ " SRC_URI[sha256sum] = "47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74"