forked from pool/scribus
Accepting request 1184895 from KDE:Extra
Update to 1.6.2 OBS-URL: https://build.opensuse.org/request/show/1184895 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/scribus?expand=0&rev=86
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
c09c07932e
@ -1,65 +0,0 @@
|
||||
From e0e7d7ce9d19d617f4eabc4472dc0c22a5b18c6a Mon Sep 17 00:00:00 2001
|
||||
From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
|
||||
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
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 12586a9c2f02017cd55b98c36180e9ca2efb3135 Mon Sep 17 00:00:00 2001
|
||||
From: jghali <jghali@11d20701-8431-0410-a711-e3c959e3b870>
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e09dd78e6db61d01b9321108fededbccd6ec0ab352dd5bafdb8b041f0ef79e99
|
||||
size 73266900
|
||||
@ -1,6 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCZZrcsAAKCRCL6kgRiuvu
|
||||
ZMHiAJ9ikkeBnrBwszyqOvt/hxzXW9+GmQCgmK/Q6WTC+8oBDLklmYmF+sIkeb4=
|
||||
=jSAp
|
||||
-----END PGP SIGNATURE-----
|
||||
3
scribus-1.6.2.tar.xz
Normal file
3
scribus-1.6.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7eff9b1f47e372e56bb369f1dbe18fe49101789b5e6bcfdb7890e0346b641383
|
||||
size 73129400
|
||||
6
scribus-1.6.2.tar.xz.asc
Normal file
6
scribus-1.6.2.tar.xz.asc
Normal file
@ -0,0 +1,6 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iF0EABECAB0WIQRlWL6E0nJzpDihURmL6kgRiuvuZAUCZm2mxQAKCRCL6kgRiuvu
|
||||
ZArHAJ0Ru6M6nyTplBSK4zzmPb2q7eqHrACfYR3rpqPw7A2/Acw3CDJ/NL8St5U=
|
||||
=hugY
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 2 14:52:57 UTC 2024 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- 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 <christophe@krop.fr>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user