diff --git a/0001-Fix-build-failure-with-poppler-24.03.0.patch b/0001-Fix-build-failure-with-poppler-24.03.0.patch new file mode 100644 index 0000000..0d0300c --- /dev/null +++ b/0001-Fix-build-failure-with-poppler-24.03.0.patch @@ -0,0 +1,65 @@ +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 new file mode 100644 index 0000000..9f873a1 --- /dev/null +++ b/0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch @@ -0,0 +1,38 @@ +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/0001-Make-sure-information-displayed-on-the-about-window-.patch b/0001-Make-sure-information-displayed-on-the-about-window-.patch index 62f4d67..6e42c85 100644 --- a/0001-Make-sure-information-displayed-on-the-about-window-.patch +++ b/0001-Make-sure-information-displayed-on-the-about-window-.patch @@ -1,4 +1,4 @@ -From c8877881e4439325137b5209037e76835a09444d Mon Sep 17 00:00:00 2001 +From a07bf4a6a200df8d8fed4a643af7d43a21ac1da6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 5 Sep 2019 12:16:58 +0200 Subject: [PATCH] Make sure information displayed on the about window are @@ -13,10 +13,10 @@ We must ensure these files are always available (including on live CD). 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scribus/ui/about.cpp b/scribus/ui/about.cpp -index b70d1eb..d1a4f1b 100644 +index 394f766..1c996ee 100644 --- a/scribus/ui/about.cpp +++ b/scribus/ui/about.cpp -@@ -164,7 +164,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) +@@ -146,7 +146,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) tabLayout->setSpacing(6); tabLayout->setContentsMargins(9, 9, 9, 9); authorView = new QTextBrowser( tab_2 ); @@ -25,7 +25,7 @@ index b70d1eb..d1a4f1b 100644 tabLayout->addWidget( authorView ); tabWidget2->addTab( tab_2, tr("A&uthors")); -@@ -174,14 +174,14 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) +@@ -156,14 +156,14 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) tabLayout_2->setSpacing(6); tabLayout_2->setContentsMargins(9, 9, 9, 9); transView = new QTextBrowser( tab_3); @@ -42,7 +42,7 @@ index b70d1eb..d1a4f1b 100644 onlineView->setOpenExternalLinks(true); tabLayout_4 = new QHBoxLayout( tab_4 ); tabLayout_4->setSpacing(6); -@@ -210,7 +210,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) +@@ -192,7 +192,7 @@ About::About( QWidget* parent, AboutMode diaMode ) : QDialog( parent ) textViewLicence = new QTextBrowser( tab_Licence); licenceLayout->addWidget( textViewLicence ); @@ -52,5 +52,5 @@ index b70d1eb..d1a4f1b 100644 textViewLicence->setPlainText(tr("Unable to open licence file. Please check your install directory or the Scribus website for licencing information.") ); else -- -2.23.0 +2.44.0 diff --git a/scribus.changes b/scribus.changes index 1e214ef..4a1cb9b 100644 --- a/scribus.changes +++ b/scribus.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 8 09:33:29 UTC 2024 - Christophe Marin + +- Add patches to fix build with poppler 24.03: + * 0001-Fix-build-failure-with-poppler-24.03.0.patch + * 0001-Fix-incorrect-value-used-in-initial-build-fix-agains.patch + ------------------------------------------------------------------- Wed Feb 7 17:39:59 UTC 2024 - Christophe Marin diff --git a/scribus.spec b/scribus.spec index 6cb3932..d23295f 100644 --- a/scribus.spec +++ b/scribus.spec @@ -33,6 +33,9 @@ Source2: scribus.keyring %endif # 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 @@ -102,10 +105,13 @@ Summary: Documentation for Scribus This package provides the documentation for Scribus. %prep -%autosetup -p1 +# Convert line endings before patching +%setup -q # W: wrong-script-end-of-line-encoding find . -type f \( -iname \*.py -o -iname \*.cpp -o -iname \*.h \) -exec dos2unix {} \; +%autopatch -p1 + # Unused test file still using QQC1 rm scribus/ui/qml/qtq_test1.qml