<pre style='margin:0'>
Ryan Carsten Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cf4741cb1d16783ffcf8013eedbec1f3510e0f14">https://github.com/macports/macports-ports/commit/cf4741cb1d16783ffcf8013eedbec1f3510e0f14</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit cf4741cb1d16783ffcf8013eedbec1f3510e0f14
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Fri Mar 8 01:56:01 2024 +0700
<span style='display:block; white-space:pre;color:#404040;'> scribus-devel: unbreak after poppler update
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/69460
</span>---
print/scribus-devel/Portfile | 2 +-
print/scribus-devel/files/poppler.patch | 74 ++++++++++++++++++++++++++++-----
2 files changed, 64 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/Portfile b/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ee3078d22f..e284d3bcc3e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ qt5.min_version 5.14.0
</span> name scribus-devel
epoch 1
version 1.5.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 8
</span> checksums rmd160 74aa3579efa5bc8733a95a47be6cf341b0bbdcec \
sha256 47816e8fcf6d05788ff16aa4499f97ff22431c777a7789149b0a88b451e16b74 \
size 74543476
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/scribus-devel/files/poppler.patch b/print/scribus-devel/files/poppler.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c7acc3c503e..d78ee5cfb07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/scribus-devel/files/poppler.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/scribus-devel/files/poppler.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,6 +20,10 @@ https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a
</span>
r25140: Fix build with poppler 22.09.0
https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fac65819ed7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+r26042: Fix build failure with poppler 24.03.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/scribusproject/scribus/commit/c57362c4f7bdef67904bf2f3d8126073792bdcf9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- cmake/modules/Findpoppler.cmake.orig 2022-01-23 10:16:42.000000000 -0600
+++ cmake/modules/Findpoppler.cmake 2023-06-30 03:49:11.000000000 -0500
@@ -1,8 +1,8 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,7 +219,7 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> // qDebug() << "converting finished";
// qDebug() << "Imported" << m_elements.count() << "Elements";
--- scribus/plugins/import/pdf/slaoutput.cpp.orig 2023-06-30 03:49:02.000000000 -0500
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scribus/plugins/import/pdf/slaoutput.cpp 2023-06-30 03:49:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scribus/plugins/import/pdf/slaoutput.cpp 2024-03-08 15:23:01
</span> @@ -7,6 +7,11 @@
#include "slaoutput.h"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -593,7 +597,55 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> }
void SlaOutputDev::startPage(int pageNum, GfxState *, XRef *)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3026,19 +2932,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1821,7 +1727,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VGradient FillGradient = VGradient(VGradient::linear);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FillGradient.clearStops();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxColorSpace *color_space = shading->getColorSpace();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (func->getType() == Function::Type::Stitching)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (func->getType() == 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double *bounds = stitchingFunc->getBounds();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1843,7 +1753,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if ((func->getType() == 2) || (func->getType() == 0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxColor stop1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shading->getColor(0.0, &stop1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1953,7 +1867,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VGradient FillGradient = VGradient(VGradient::linear);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FillGradient.clearStops();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxColorSpace *color_space = shading->getColorSpace();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (func->getType() == Function::Type::Stitching)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (func->getType() == 3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double *bounds = stitchingFunc->getBounds();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1975,7 +1893,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if ((func->getType() == 2) || (func->getType() == 0))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GfxColor stop1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shading->getColor(0.0, &stop1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3026,19 +2948,30 @@
</span>
void SlaOutputDev::updateFont(GfxState *state)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -631,7 +683,7 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> double m11, m12, m21, m22, fontSize;
SplashCoord mat[4];
int n = 0;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3046,11 +2963,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3046,11 +2979,12 @@
</span> SplashCoord matrix[6];
m_font = nullptr;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -648,7 +700,7 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> if (!gfxFont)
goto err1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3075,94 +2993,106 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3075,94 +3009,106 @@
</span> if (fontLoc->locType == gfxFontLocEmbedded)
{
// if there is an embedded font, read it to memory
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -668,11 +720,11 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> else
{ // gfxFontLocExternal
+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 4, 0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fileName = fontLoc->path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fileName = fontLoc->path;
</span> +#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0)
+ fileName = fontLoc->pathAsGooString();
+#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- fileName = fontLoc->path;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fileName = fontLoc->path;
</span> +#endif
fontType = fontLoc->fontType;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -786,7 +838,7 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> goto err2;
}
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3178,10 +3108,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3178,10 +3124,7 @@
</span> codeToGID = nullptr;
n = 0;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -798,7 +850,7 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> {
error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3203,22 +3130,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3203,22 +3146,30 @@
</span> }
else
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -835,7 +887,7 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> goto err2;
}
break;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3247,14 +3182,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3247,14 +3198,19 @@
</span> mat[3] = -m22;
m_font = m_fontEngine->getFont(fontFile, mat, matrix);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -855,7 +907,7 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> err1:
if (fontsrc && !fontsrc->isFile)
fontsrc->unref();
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3357,9 +3297,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3357,9 +3313,15 @@
</span> GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
{
// qDebug() << "beginType3Char";
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -871,7 +923,7 @@ https://github.com/scribusproject/scribus/commit/8acd29e97813b9132e3b51b2f05e8fa
</span> if (gfxFont->getType() != fontType3)
return gTrue;
F3Entry f3e;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3680,16 +3626,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3680,16 +3642,21 @@
</span> m_lineJoin = Qt::BevelJoin;
break;
}
</pre><pre style='margin:0'>
</pre>