diff -Nru scribus-1.5.8+dfsg/debian/changelog scribus-1.5.8+dfsg/debian/changelog --- scribus-1.5.8+dfsg/debian/changelog 2022-08-11 10:59:53.000000000 -0300 +++ scribus-1.5.8+dfsg/debian/changelog 2022-12-13 09:57:33.000000000 -0300 @@ -1,3 +1,10 @@ +scribus (1.5.8+dfsg-3ubuntu1) lunar; urgency=medium + + * poppler-22-09-*.patch: Fix build against Poppler >= 22.09 + (LP: #1999524). + + -- Nathan Pratta Teodosio Tue, 13 Dec 2022 09:57:33 -0300 + scribus (1.5.8+dfsg-3build1) kinetic; urgency=medium * Rebuild against latest poppler diff -Nru scribus-1.5.8+dfsg/debian/control scribus-1.5.8+dfsg/debian/control --- scribus-1.5.8+dfsg/debian/control 2022-06-18 11:07:57.000000000 -0300 +++ scribus-1.5.8+dfsg/debian/control 2022-12-13 09:57:33.000000000 -0300 @@ -1,7 +1,8 @@ Source: scribus Section: graphics Priority: optional -Maintainer: Mattia Rizzolo +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Mattia Rizzolo Build-Depends: cmake (>= 3.14.0), debhelper-compat (= 13), diff -Nru scribus-1.5.8+dfsg/debian/patches/poppler-22-09-getLineDash.patch scribus-1.5.8+dfsg/debian/patches/poppler-22-09-getLineDash.patch --- scribus-1.5.8+dfsg/debian/patches/poppler-22-09-getLineDash.patch 1969-12-31 21:00:00.000000000 -0300 +++ scribus-1.5.8+dfsg/debian/patches/poppler-22-09-getLineDash.patch 2022-12-13 09:55:13.000000000 -0300 @@ -0,0 +1,29 @@ +From: Nathan Pratta Teodosio +Description: Fix build with Poppler >=22.9.0 +Origin: upstream, https://www.scribus.net/websvn/revision.php?repname=Scribus&rev=25139 +git-svn-id: svn://scribus.net/trunk/Scribus@25140 11d20701-8431-0410-a711-e3c959e3b870 + +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3628,16 +3628,11 @@ void SlaOutputDev::getPenState(GfxState *state) + m_lineJoin = Qt::BevelJoin; + break; + } +- double lw = state->getLineWidth(); +- double *dashPattern; +- int dashLength; +- state->getLineDash(&dashPattern, &dashLength, &DashOffset); +- QVector pattern(dashLength); +- for (int i = 0; i < dashLength; ++i) +- { +- pattern[i] = dashPattern[i] / lw; +- } +- DashValues = pattern; ++ 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; + } + + int SlaOutputDev::getBlendMode(GfxState *state) diff -Nru scribus-1.5.8+dfsg/debian/patches/series scribus-1.5.8+dfsg/debian/patches/series --- scribus-1.5.8+dfsg/debian/patches/series 2022-06-18 10:24:12.000000000 -0300 +++ scribus-1.5.8+dfsg/debian/patches/series 2022-12-13 09:47:34.000000000 -0300 @@ -3,6 +3,7 @@ 24886.patch 24981.patch 25073.patch +poppler-22-09-getLineDash.patch # to be upstreamed