diff --git a/0001-Fix-build-failure-with-poppler-24.03.0.patch b/0001-Fix-build-failure-with-poppler-24.03.0.patch deleted file mode 100644 index 0d0300c..0000000 --- a/0001-Fix-build-failure-with-poppler-24.03.0.patch +++ /dev/null @@ -1,65 +0,0 @@ -From e0e7d7ce9d19d617f4eabc4472dc0c22a5b18c6a Mon Sep 17 00:00:00 2001 -From: jghali -Date: Mon, 4 Mar 2024 20:39:54 +0000 -Subject: [PATCH] Fix build failure with poppler 24.03.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26042 11d20701-8431-0410-a711-e3c959e3b870 ---- - 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 99dd487..2f4209e 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1845,7 +1845,11 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, d - 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(); -@@ -1867,7 +1871,11 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, d - 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::Identity)) -+#else - else if ((func->getType() == 2) || (func->getType() == 0)) -+#endif - { - GfxColor stop1; - shading->getColor(0.0, &stop1); -@@ -1979,7 +1987,11 @@ GBool 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(); -@@ -2001,7 +2013,11 @@ GBool 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::Identity)) -+#else - else if ((func->getType() == 2) || (func->getType() == 0)) -+#endif - { - GfxColor stop1; - shading->getColor(0.0, &stop1); --- -2.44.0 - diff --git a/0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch b/0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch deleted file mode 100644 index 9f873a1..0000000 --- a/0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 12586a9c2f02017cd55b98c36180e9ca2efb3135 Mon Sep 17 00:00:00 2001 -From: jghali -Date: Tue, 5 Mar 2024 16:42:40 +0000 -Subject: [PATCH] Fix incorrect value used in initial build fix against poppler - 24.03. See - https://gitlab.freedesktop.org/poppler/poppler/-/commit/6e3824d45d42cb806a28a2df84e4ab6bb3587083 - for details. - -git-svn-id: svn://scribus.net/trunk/Scribus@26047 11d20701-8431-0410-a711-e3c959e3b870 ---- - scribus/plugins/import/pdf/slaoutput.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 2f4209e..e879db6 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1872,7 +1872,7 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, d - } - } - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) -- else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) -+ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled)) - #else - else if ((func->getType() == 2) || (func->getType() == 0)) - #endif -@@ -2014,7 +2014,7 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, - } - } - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0) -- else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Identity)) -+ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled)) - #else - else if ((func->getType() == 2) || (func->getType() == 0)) - #endif --- -2.44.0 - diff --git a/scribus-1.6.1.tar.xz b/scribus-1.6.1.tar.xz deleted file mode 100644 index 8102b1e..0000000 --- a/scribus-1.6.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e09dd78e6db61d01b9321108fededbccd6ec0ab352dd5bafdb8b041f0ef79e99 -size 73266900 diff --git a/scribus-1.6.1.tar.xz.asc b/scribus-1.6.1.tar.xz.asc deleted file mode 100644 index a2055bb..0000000 --- a/scribus-1.6.1.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCZZrcsAAKCRCL6kgRiuvu -ZMHiAJ9ikkeBnrBwszyqOvt/hxzXW9+GmQCgmK/Q6WTC+8oBDLklmYmF+sIkeb4= -=jSAp ------END PGP SIGNATURE----- diff --git a/scribus-1.6.2.tar.xz b/scribus-1.6.2.tar.xz new file mode 100644 index 0000000..4a8e9b6 --- /dev/null +++ b/scribus-1.6.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7eff9b1f47e372e56bb369f1dbe18fe49101789b5e6bcfdb7890e0346b641383 +size 73129400 diff --git a/scribus-1.6.2.tar.xz.asc b/scribus-1.6.2.tar.xz.asc new file mode 100644 index 0000000..5734112 --- /dev/null +++ b/scribus-1.6.2.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCZm2mxQAKCRCL6kgRiuvu +ZArHAJ0Ru6M6nyTplBSK4zzmPb2q7eqHrACfYR3rpqPw7A2/Acw3CDJ/NL8St5U= +=hugY +-----END PGP SIGNATURE----- diff --git a/scribus.changes b/scribus.changes index 4a1cb9b..cb3d2f5 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jul 2 14:52:57 UTC 2024 - Christophe Marin + +- Update to 1.6.2 + * https://www.scribus.net/scribus-1-6-2-released/ +- Drop patch, merged upstream: + * 0001-Fix-build-failure-with-poppler-24.03.0.patch + * 0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch + ------------------------------------------------------------------- Fri Mar 8 09:33:29 UTC 2024 - Christophe Marin diff --git a/scribus.spec b/scribus.spec index d23295f..6e4d3a9 100644 --- a/scribus.spec +++ b/scribus.spec @@ -20,12 +20,12 @@ %bcond_without podofo %bcond_without released Name: scribus -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: Page Layout and Desktop Publishing (DTP) License: GPL-2.0-or-later URL: https://www.scribus.net/ -# https://sourceforge.net/projects/scribus/files/scribus/1.6.1/ +# https://sourceforge.net/projects/scribus/files/scribus/1.6.2/ Source0: %{name}-%{version}.tar.xz %if %{with released} Source1: %{name}-%{version}.tar.xz.asc @@ -34,8 +34,7 @@ Source2: scribus.keyring # PATCH-FIX-OPENSUSE Patch0: 0001-Make-sure-information-displayed-on-the-about-window-.patch # PATCH-FIX-UPSTREAM poppler... -Patch1: 0001-Fix-build-failure-with-poppler-24.03.0.patch -Patch2: 0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch + BuildRequires: cmake >= 3.14.0 BuildRequires: cups-devel BuildRequires: dos2unix