office/scribus: Updated for version 1.6.1.scribus

Patched for the newer poppler in current

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

3 files changed, 80 insertions, 7 deletions

diff --git a/office/scribus/scribus-1.6.1-poppler-24.03.patch b/office/scribus/scribus-1.6.1-poppler-24.03.patch
new file mode 100644
index 0000000000..076e48e14f
--- /dev/null
+++ b/office/scribus/scribus-1.6.1-poppler-24.03.patch
@@ -0,0 +1,70 @@
+From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 4 Mar 2024 17:35:11 +0100
+Subject: [PATCH] Fix build with >=poppler-24.03.0
+
+Fixes build errors caused by:
+
+"Use an enum for Function getType"
+Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ scribus/plugins/import/pdf/slaoutput.cpp | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp
+index 4e31e4b6c..3e4a768ec 100644
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do
+ 	VGradient FillGradient = VGradient(VGradient::linear);

+ 	FillGradient.clearStops();

+ 	GfxColorSpace *color_space = shading->getColorSpace();

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)

++	if (func->getType() == Function::Type::Stitching)

++#else

+ 	if (func->getType() == 3)

++#endif

+ 	{

+ 		StitchingFunction *stitchingFunc = (StitchingFunction*)func;

+ 		const double *bounds = stitchingFunc->getBounds();

+@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do
+ 			FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );

+ 		}

+ 	}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)

++	else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))

++#else

+ 	else if ((func->getType() == 2) || (func->getType() == 0))

++#endif

+ 	{

+ 		GfxColor stop1;

+ 		shading->getColor(0.0, &stop1);

+@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
+ 	VGradient FillGradient = VGradient(VGradient::linear);

+ 	FillGradient.clearStops();

+ 	GfxColorSpace *color_space = shading->getColorSpace();

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)

++	if (func->getType() == Function::Type::Stitching)

++#else

+ 	if (func->getType() == 3)

++#endif

+ 	{

+ 		StitchingFunction *stitchingFunc = (StitchingFunction*)func;

+ 		const double *bounds = stitchingFunc->getBounds();

+@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading,
+ 			FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );

+ 		}

+ 	}

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)

++	else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))

++#else

+ 	else if ((func->getType() == 2) || (func->getType() == 0))

++#endif

+ 	{

+ 		GfxColor stop1;

+ 		shading->getColor(0.0, &stop1);

+-- 
+2.44.0
+
diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild
index c7e17f62e8..c816bbf48f 100644
--- a/office/scribus/scribus.SlackBuild
+++ b/office/scribus/scribus.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware build script for scribus
 
 # Copyright 2006 Martin Lefebvre <dadexter@gmail.com>
-# Copyright 2008-2021 Heinz Wiesinger, Amsterdam, The Netherlands
+# Copyright 2008-2024 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,7 +29,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=scribus
-VERSION=${VERSION:-1.5.7}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -68,6 +68,8 @@ else
   LIBDIRSUFFIX=""
 fi
 
+if pkg-config --exists libpodofo ; then PODOFO="On" ; else PODOFO="Off" ; fi
+
 set -e
 
 rm -rf $PKG
@@ -83,13 +85,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# thanks archlinux!
-patch -p1 < $CWD/harfbuzz-3.0.0.patch
+patch -p1 < $CWD/scribus-1.6.1-poppler-24.03.patch
 
 cmake \
   -DCMAKE_C_FLAGS="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+  -DWANT_CPP17=1 \
+  -DWITH_PODOFO=$PODOFO \
   -DLIB_SUFFIX=${LIBDIRSUFFIX}
 
 make
diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info
index f1b56cd8de..d076f887a5 100644
--- a/office/scribus/scribus.info
+++ b/office/scribus/scribus.info
@@ -1,8 +1,8 @@
 PRGNAM="scribus"
-VERSION="1.5.7"
+VERSION="1.6.1"
 HOMEPAGE="https://www.scribus.net"
-DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.5.7.tar.xz"
-MD5SUM="4d0c63cfdade8a9abf225a4415e43694"
+DOWNLOAD="https://downloads.sourceforge.net/scribus/scribus-1.6.1.tar.xz"
+MD5SUM="3fa27801c225e5fdf6920af1d0a1a12d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""