From a661d17c4b4fd0015fc50f86e9b73c579e9ade57 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 22 Aug 2024 11:25:22 +0200 Subject: [PATCH 01/13] Rebuild for poppler 24.08.0 Backport of changes necessary to do the rebuild. --- scribus-1.6.1-c++20-warnings.patch | 30 +++++++++++++ scribus-1.6.1-c++20.patch | 27 +++++++++++ scribus-1.6.1-point-operator.patch | 42 ++++++++++++++++++ scribus-1.6.1-poppler-24.03.0-fix.patch | 32 ++++++++++++++ scribus-1.6.1-poppler-24.03.0.patch | 59 +++++++++++++++++++++++++ scribus.spec | 6 +++ 6 files changed, 196 insertions(+) create mode 100644 scribus-1.6.1-c++20-warnings.patch create mode 100644 scribus-1.6.1-c++20.patch create mode 100644 scribus-1.6.1-point-operator.patch create mode 100644 scribus-1.6.1-poppler-24.03.0-fix.patch create mode 100644 scribus-1.6.1-poppler-24.03.0.patch diff --git a/scribus-1.6.1-c++20-warnings.patch b/scribus-1.6.1-c++20-warnings.patch new file mode 100644 index 0000000..944055a --- /dev/null +++ b/scribus-1.6.1-c++20-warnings.patch @@ -0,0 +1,30 @@ +From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 31 Mar 2024 21:40:42 +0000 +Subject: Fix C++20 related warning "template-id is not allowed for constructor + in C++20" + +git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/third_party/lib2geom/rect.h b/scribus/third_party/lib2geom/rect.h +index c740d847f..ae1934782 100644 +--- a/scribus/third_party/lib2geom/rect.h ++++ b/scribus/third_party/lib2geom/rect.h +@@ -56,14 +56,14 @@ class D2 { + private: + Interval f[2]; + public: +- D2() { f[X] = f[Y] = Interval(0, 0); } ++ D2() { f[X] = f[Y] = Interval(0, 0); } + +- D2(Interval const &a, Interval const &b) { ++ D2(Interval const &a, Interval const &b) { + f[X] = a; + f[Y] = b; + } + +- D2(Point const & a, Point const & b) { ++ D2(Point const & a, Point const & b) { + f[X] = Interval(a[X], b[X]); + f[Y] = Interval(a[Y], b[Y]); + } diff --git a/scribus-1.6.1-c++20.patch b/scribus-1.6.1-c++20.patch new file mode 100644 index 0000000..5544598 --- /dev/null +++ b/scribus-1.6.1-c++20.patch @@ -0,0 +1,27 @@ +From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Thu, 2 May 2024 22:26:03 +0000 +Subject: Enforce C++20 when building with poppler >= 24.05.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake +index a19acfc23..33f827298 100644 +--- a/CMakeLists_Dependencies.cmake ++++ b/CMakeLists_Dependencies.cmake +@@ -28,7 +28,14 @@ if (poppler_FOUND) + message(STATUS "Found poppler") + message(STATUS "Found poppler libs: ${poppler_LIBRARY}") + message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}") +- if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) ++ if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0) ++ message(STATUS "Poppler Version:" ${poppler_VERSION}) ++ if (CMAKE_CXX_STANDARD LESS 20) ++ message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0") ++ message(STATUS "Enabling C++20 compiler features") ++ set(CMAKE_CXX_STANDARD 20) ++ endif() ++ elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) + message(STATUS "Poppler Version:" ${poppler_VERSION}) + if (CMAKE_CXX_STANDARD LESS 17) + message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0") diff --git a/scribus-1.6.1-point-operator.patch b/scribus-1.6.1-point-operator.patch new file mode 100644 index 0000000..030fc6d --- /dev/null +++ b/scribus-1.6.1-point-operator.patch @@ -0,0 +1,42 @@ +From 8beacae24242c683d60cd280fec14ba5db6d8090 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sat, 1 Jun 2024 22:03:54 +0000 +Subject: #17229: scribus fails to compile with boost 1.85.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26169 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/third_party/lib2geom/point.h b/scribus/third_party/lib2geom/point.h +index 9aa62461a..4e86740e1 100644 +--- a/scribus/third_party/lib2geom/point.h ++++ b/scribus/third_party/lib2geom/point.h +@@ -121,10 +121,14 @@ class Point { + + Point &operator*=(Matrix const &m); + +- inline int operator == (const Point &in_pnt) { ++ inline bool operator==(const Point &in_pnt) const { + return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y])); + } + ++ inline bool operator!=(const Point &in_pnt) const { ++ return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y])); ++ } ++ + friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt); + }; + +@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) { + return ret; + } + +-//IMPL: boost::EqualityComparableConcept +-inline bool operator==(Point const &a, Point const &b) { +- return (a[X] == b[X]) && (a[Y] == b[Y]); +-} +-inline bool operator!=(Point const &a, Point const &b) { +- return (a[X] != b[X]) || (a[Y] != b[Y]); +-} +- + /** This is a lexicographical ordering for points. It is remarkably useful for sweepline algorithms*/ + inline bool operator<=(Point const &a, Point const &b) { + return ( ( a[Y] < b[Y] ) || diff --git a/scribus-1.6.1-poppler-24.03.0-fix.patch b/scribus-1.6.1-poppler-24.03.0-fix.patch new file mode 100644 index 0000000..7c8968a --- /dev/null +++ b/scribus-1.6.1-poppler-24.03.0-fix.patch @@ -0,0 +1,32 @@ +From 53e715d2f65ffaf6b78833d9dd012a93dbaaca93 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 5 Mar 2024 16:42:40 +0000 +Subject: 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 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index f5297bba7..e69c4177c 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1758,7 +1758,7 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + } + } + #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 +@@ -1900,7 +1900,7 @@ bool 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 diff --git a/scribus-1.6.1-poppler-24.03.0.patch b/scribus-1.6.1-poppler-24.03.0.patch new file mode 100644 index 0000000..a188164 --- /dev/null +++ b/scribus-1.6.1-poppler-24.03.0.patch @@ -0,0 +1,59 @@ +From c57362c4f7bdef67904bf2f3d8126073792bdcf9 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 4 Mar 2024 20:39:54 +0000 +Subject: Fix build failure with poppler 24.03.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26042 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 4e31e4b6c..58f030503 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::Identity)) ++#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::Identity)) ++#else + else if ((func->getType() == 2) || (func->getType() == 0)) ++#endif + { + GfxColor stop1; + shading->getColor(0.0, &stop1); diff --git a/scribus.spec b/scribus.spec index 0824b95..8739f5c 100644 --- a/scribus.spec +++ b/scribus.spec @@ -14,6 +14,12 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc +# Enforce C++20 due to poppler +Patch0: scribus-1.6.1-c++20.patch +Patch1: scribus-1.6.1-c++20-warnings.patch +Patch2: scribus-1.6.1-point-operator.patch +Patch3: scribus-1.6.1-poppler-24.03.0.patch +Patch4: scribus-1.6.1-poppler-24.03.0-fix.patch BuildRequires: boost-devel BuildRequires: cmake From 1f13657293ac505c7b0166177d8e04f95a6b4b7a Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Thu, 22 Aug 2024 16:13:43 +0200 Subject: [PATCH 02/13] Rebuild for poppler 24.08.0 Backport of changes necessary to do the rebuild. --- scribus-1.6.1-c++20-warnings.patch | 30 +++++++++++++ scribus-1.6.1-c++20.patch | 27 +++++++++++ scribus-1.6.1-point-operator.patch | 42 ++++++++++++++++++ scribus-1.6.1-poppler-24.03.0-fix.patch | 32 ++++++++++++++ scribus-1.6.1-poppler-24.03.0.patch | 59 +++++++++++++++++++++++++ scribus.spec | 6 +++ 6 files changed, 196 insertions(+) create mode 100644 scribus-1.6.1-c++20-warnings.patch create mode 100644 scribus-1.6.1-c++20.patch create mode 100644 scribus-1.6.1-point-operator.patch create mode 100644 scribus-1.6.1-poppler-24.03.0-fix.patch create mode 100644 scribus-1.6.1-poppler-24.03.0.patch diff --git a/scribus-1.6.1-c++20-warnings.patch b/scribus-1.6.1-c++20-warnings.patch new file mode 100644 index 0000000..944055a --- /dev/null +++ b/scribus-1.6.1-c++20-warnings.patch @@ -0,0 +1,30 @@ +From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sun, 31 Mar 2024 21:40:42 +0000 +Subject: Fix C++20 related warning "template-id is not allowed for constructor + in C++20" + +git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/third_party/lib2geom/rect.h b/scribus/third_party/lib2geom/rect.h +index c740d847f..ae1934782 100644 +--- a/scribus/third_party/lib2geom/rect.h ++++ b/scribus/third_party/lib2geom/rect.h +@@ -56,14 +56,14 @@ class D2 { + private: + Interval f[2]; + public: +- D2() { f[X] = f[Y] = Interval(0, 0); } ++ D2() { f[X] = f[Y] = Interval(0, 0); } + +- D2(Interval const &a, Interval const &b) { ++ D2(Interval const &a, Interval const &b) { + f[X] = a; + f[Y] = b; + } + +- D2(Point const & a, Point const & b) { ++ D2(Point const & a, Point const & b) { + f[X] = Interval(a[X], b[X]); + f[Y] = Interval(a[Y], b[Y]); + } diff --git a/scribus-1.6.1-c++20.patch b/scribus-1.6.1-c++20.patch new file mode 100644 index 0000000..5544598 --- /dev/null +++ b/scribus-1.6.1-c++20.patch @@ -0,0 +1,27 @@ +From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Thu, 2 May 2024 22:26:03 +0000 +Subject: Enforce C++20 when building with poppler >= 24.05.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake +index a19acfc23..33f827298 100644 +--- a/CMakeLists_Dependencies.cmake ++++ b/CMakeLists_Dependencies.cmake +@@ -28,7 +28,14 @@ if (poppler_FOUND) + message(STATUS "Found poppler") + message(STATUS "Found poppler libs: ${poppler_LIBRARY}") + message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}") +- if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) ++ if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0) ++ message(STATUS "Poppler Version:" ${poppler_VERSION}) ++ if (CMAKE_CXX_STANDARD LESS 20) ++ message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0") ++ message(STATUS "Enabling C++20 compiler features") ++ set(CMAKE_CXX_STANDARD 20) ++ endif() ++ elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) + message(STATUS "Poppler Version:" ${poppler_VERSION}) + if (CMAKE_CXX_STANDARD LESS 17) + message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0") diff --git a/scribus-1.6.1-point-operator.patch b/scribus-1.6.1-point-operator.patch new file mode 100644 index 0000000..030fc6d --- /dev/null +++ b/scribus-1.6.1-point-operator.patch @@ -0,0 +1,42 @@ +From 8beacae24242c683d60cd280fec14ba5db6d8090 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Sat, 1 Jun 2024 22:03:54 +0000 +Subject: #17229: scribus fails to compile with boost 1.85.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26169 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/third_party/lib2geom/point.h b/scribus/third_party/lib2geom/point.h +index 9aa62461a..4e86740e1 100644 +--- a/scribus/third_party/lib2geom/point.h ++++ b/scribus/third_party/lib2geom/point.h +@@ -121,10 +121,14 @@ class Point { + + Point &operator*=(Matrix const &m); + +- inline int operator == (const Point &in_pnt) { ++ inline bool operator==(const Point &in_pnt) const { + return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y])); + } + ++ inline bool operator!=(const Point &in_pnt) const { ++ return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y])); ++ } ++ + friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt); + }; + +@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) { + return ret; + } + +-//IMPL: boost::EqualityComparableConcept +-inline bool operator==(Point const &a, Point const &b) { +- return (a[X] == b[X]) && (a[Y] == b[Y]); +-} +-inline bool operator!=(Point const &a, Point const &b) { +- return (a[X] != b[X]) || (a[Y] != b[Y]); +-} +- + /** This is a lexicographical ordering for points. It is remarkably useful for sweepline algorithms*/ + inline bool operator<=(Point const &a, Point const &b) { + return ( ( a[Y] < b[Y] ) || diff --git a/scribus-1.6.1-poppler-24.03.0-fix.patch b/scribus-1.6.1-poppler-24.03.0-fix.patch new file mode 100644 index 0000000..7c8968a --- /dev/null +++ b/scribus-1.6.1-poppler-24.03.0-fix.patch @@ -0,0 +1,32 @@ +From 53e715d2f65ffaf6b78833d9dd012a93dbaaca93 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 5 Mar 2024 16:42:40 +0000 +Subject: 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 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index f5297bba7..e69c4177c 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1758,7 +1758,7 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + } + } + #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 +@@ -1900,7 +1900,7 @@ bool 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 diff --git a/scribus-1.6.1-poppler-24.03.0.patch b/scribus-1.6.1-poppler-24.03.0.patch new file mode 100644 index 0000000..a188164 --- /dev/null +++ b/scribus-1.6.1-poppler-24.03.0.patch @@ -0,0 +1,59 @@ +From c57362c4f7bdef67904bf2f3d8126073792bdcf9 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Mon, 4 Mar 2024 20:39:54 +0000 +Subject: Fix build failure with poppler 24.03.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26042 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 4e31e4b6c..58f030503 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::Identity)) ++#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::Identity)) ++#else + else if ((func->getType() == 2) || (func->getType() == 0)) ++#endif + { + GfxColor stop1; + shading->getColor(0.0, &stop1); diff --git a/scribus.spec b/scribus.spec index 0824b95..8739f5c 100644 --- a/scribus.spec +++ b/scribus.spec @@ -14,6 +14,12 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc +# Enforce C++20 due to poppler +Patch0: scribus-1.6.1-c++20.patch +Patch1: scribus-1.6.1-c++20-warnings.patch +Patch2: scribus-1.6.1-point-operator.patch +Patch3: scribus-1.6.1-poppler-24.03.0.patch +Patch4: scribus-1.6.1-poppler-24.03.0-fix.patch BuildRequires: boost-devel BuildRequires: cmake From b8fd860cfe159227a1c9f73252967857ca503071 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Sun, 8 Dec 2024 22:45:00 +0000 Subject: [PATCH 03/13] Rebuild for ICU 76 From 1053ea0db310889c0f04c46028e0dd1dcedf475d Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Tue, 14 Jan 2025 22:14:41 +0000 Subject: [PATCH 04/13] Update to 1.6.3 (rhbz#2292539) --- .gitignore | 1 + scribus-1.6.1-c++20-warnings.patch | 30 ------------- scribus-1.6.1-c++20.patch | 27 ----------- scribus-1.6.1-point-operator.patch | 42 ------------------ scribus-1.6.1-poppler-24.03.0-fix.patch | 32 -------------- scribus-1.6.1-poppler-24.03.0.patch | 59 ------------------------- scribus.spec | 9 +--- sources | 2 +- 8 files changed, 3 insertions(+), 199 deletions(-) delete mode 100644 scribus-1.6.1-c++20-warnings.patch delete mode 100644 scribus-1.6.1-c++20.patch delete mode 100644 scribus-1.6.1-point-operator.patch delete mode 100644 scribus-1.6.1-poppler-24.03.0-fix.patch delete mode 100644 scribus-1.6.1-poppler-24.03.0.patch diff --git a/.gitignore b/.gitignore index affbe31..a0b1525 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ scribus-1.3.8.tar.bz2 /scribus-1.5.8-free.tar.xz /scribus-1.6.0-free.tar.xz /scribus-1.6.1-free.tar.xz +/scribus-1.6.3-free.tar.xz diff --git a/scribus-1.6.1-c++20-warnings.patch b/scribus-1.6.1-c++20-warnings.patch deleted file mode 100644 index 944055a..0000000 --- a/scribus-1.6.1-c++20-warnings.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Sun, 31 Mar 2024 21:40:42 +0000 -Subject: Fix C++20 related warning "template-id is not allowed for constructor - in C++20" - -git-svn-id: svn://scribus.net/trunk/Scribus@26079 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/third_party/lib2geom/rect.h b/scribus/third_party/lib2geom/rect.h -index c740d847f..ae1934782 100644 ---- a/scribus/third_party/lib2geom/rect.h -+++ b/scribus/third_party/lib2geom/rect.h -@@ -56,14 +56,14 @@ class D2 { - private: - Interval f[2]; - public: -- D2() { f[X] = f[Y] = Interval(0, 0); } -+ D2() { f[X] = f[Y] = Interval(0, 0); } - -- D2(Interval const &a, Interval const &b) { -+ D2(Interval const &a, Interval const &b) { - f[X] = a; - f[Y] = b; - } - -- D2(Point const & a, Point const & b) { -+ D2(Point const & a, Point const & b) { - f[X] = Interval(a[X], b[X]); - f[Y] = Interval(a[Y], b[Y]); - } diff --git a/scribus-1.6.1-c++20.patch b/scribus-1.6.1-c++20.patch deleted file mode 100644 index 5544598..0000000 --- a/scribus-1.6.1-c++20.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Thu, 2 May 2024 22:26:03 +0000 -Subject: Enforce C++20 when building with poppler >= 24.05.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/CMakeLists_Dependencies.cmake b/CMakeLists_Dependencies.cmake -index a19acfc23..33f827298 100644 ---- a/CMakeLists_Dependencies.cmake -+++ b/CMakeLists_Dependencies.cmake -@@ -28,7 +28,14 @@ if (poppler_FOUND) - message(STATUS "Found poppler") - message(STATUS "Found poppler libs: ${poppler_LIBRARY}") - message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}") -- if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) -+ if (poppler_VERSION VERSION_GREATER_EQUAL 24.05.0) -+ message(STATUS "Poppler Version:" ${poppler_VERSION}) -+ if (CMAKE_CXX_STANDARD LESS 20) -+ message(STATUS "C++20 is the minimum C++ standard since poppler 24.05.0") -+ message(STATUS "Enabling C++20 compiler features") -+ set(CMAKE_CXX_STANDARD 20) -+ endif() -+ elseif (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0) - message(STATUS "Poppler Version:" ${poppler_VERSION}) - if (CMAKE_CXX_STANDARD LESS 17) - message(STATUS "C++17 is the minimum C++ standard since poppler 22.01.0") diff --git a/scribus-1.6.1-point-operator.patch b/scribus-1.6.1-point-operator.patch deleted file mode 100644 index 030fc6d..0000000 --- a/scribus-1.6.1-point-operator.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 8beacae24242c683d60cd280fec14ba5db6d8090 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Sat, 1 Jun 2024 22:03:54 +0000 -Subject: #17229: scribus fails to compile with boost 1.85.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26169 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/third_party/lib2geom/point.h b/scribus/third_party/lib2geom/point.h -index 9aa62461a..4e86740e1 100644 ---- a/scribus/third_party/lib2geom/point.h -+++ b/scribus/third_party/lib2geom/point.h -@@ -121,10 +121,14 @@ class Point { - - Point &operator*=(Matrix const &m); - -- inline int operator == (const Point &in_pnt) { -+ inline bool operator==(const Point &in_pnt) const { - return ((_pt[X] == in_pnt[X]) && (_pt[Y] == in_pnt[Y])); - } - -+ inline bool operator!=(const Point &in_pnt) const { -+ return ((_pt[X] != in_pnt[X]) || (_pt[Y] != in_pnt[Y])); -+ } -+ - friend inline std::ostream &operator<< (std::ostream &out_file, const Geom::Point &in_pnt); - }; - -@@ -144,14 +148,6 @@ inline Point operator^(Point const &a, Point const &b) { - return ret; - } - --//IMPL: boost::EqualityComparableConcept --inline bool operator==(Point const &a, Point const &b) { -- return (a[X] == b[X]) && (a[Y] == b[Y]); --} --inline bool operator!=(Point const &a, Point const &b) { -- return (a[X] != b[X]) || (a[Y] != b[Y]); --} -- - /** This is a lexicographical ordering for points. It is remarkably useful for sweepline algorithms*/ - inline bool operator<=(Point const &a, Point const &b) { - return ( ( a[Y] < b[Y] ) || diff --git a/scribus-1.6.1-poppler-24.03.0-fix.patch b/scribus-1.6.1-poppler-24.03.0-fix.patch deleted file mode 100644 index 7c8968a..0000000 --- a/scribus-1.6.1-poppler-24.03.0-fix.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 53e715d2f65ffaf6b78833d9dd012a93dbaaca93 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Tue, 5 Mar 2024 16:42:40 +0000 -Subject: 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 - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index f5297bba7..e69c4177c 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -1758,7 +1758,7 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do - } - } - #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 -@@ -1900,7 +1900,7 @@ bool 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 diff --git a/scribus-1.6.1-poppler-24.03.0.patch b/scribus-1.6.1-poppler-24.03.0.patch deleted file mode 100644 index a188164..0000000 --- a/scribus-1.6.1-poppler-24.03.0.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c57362c4f7bdef67904bf2f3d8126073792bdcf9 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Mon, 4 Mar 2024 20:39:54 +0000 -Subject: Fix build failure with poppler 24.03.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26042 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 4e31e4b6c..58f030503 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::Identity)) -+#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::Identity)) -+#else - else if ((func->getType() == 2) || (func->getType() == 0)) -+#endif - { - GfxColor stop1; - shading->getColor(0.0, &stop1); diff --git a/scribus.spec b/scribus.spec index 8739f5c..32661f2 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.1 +Version: 1.6.3 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -14,13 +14,6 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc -# Enforce C++20 due to poppler -Patch0: scribus-1.6.1-c++20.patch -Patch1: scribus-1.6.1-c++20-warnings.patch -Patch2: scribus-1.6.1-point-operator.patch -Patch3: scribus-1.6.1-poppler-24.03.0.patch -Patch4: scribus-1.6.1-poppler-24.03.0-fix.patch - BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cups-devel diff --git a/sources b/sources index 6c6a50f..d97e813 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.1-free.tar.xz) = 690798ce9a94a9cf4cc8ad5eca03c287afe0986df213660152032e7a0d6a2e0e30cd1a9edd403eb9a162c5493c6dc8efde4fd3a4a38a021678fb3ee8e56d2267 +SHA512 (scribus-1.6.3-free.tar.xz) = 6bdd4509542481fb2ac720fe8116e044380b94450bf945e2d1fc1ee79bcb5752d8653c90280191fb2aa1dab11b063b2af286369874ce2578f5169d686ef220bb From 5b737e54a6d4392846db1fb0dd8e269bd0cda467 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:13:39 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 1d9e1e846d108a70929d522abed0d892c377bf06 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 18 Feb 2025 13:49:24 +0100 Subject: [PATCH 06/13] Rebuild for poppler 25.02.0 Modify patch from Jean Ghali so it apply. --- scribus-1.6.3-poppler-25.02.0.patch | 167 ++++++++++++++++++++++++++++ scribus.spec | 2 + 2 files changed, 169 insertions(+) create mode 100644 scribus-1.6.3-poppler-25.02.0.patch diff --git a/scribus-1.6.3-poppler-25.02.0.patch b/scribus-1.6.3-poppler-25.02.0.patch new file mode 100644 index 0000000..64af51e --- /dev/null +++ b/scribus-1.6.3-poppler-25.02.0.patch @@ -0,0 +1,167 @@ +From 188d030acd0cb71e89dbb57695fe52158b6a0959 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 4 Feb 2025 19:29:16 +0000 +Subject: #17405: Fix build error with poppler 25.02.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26666 11d20701-8431-0410-a711-e3c959e3b870 + +--- scribus-1.6.3/scribus/plugins/import/pdf/importpdfconfig.h ++++ scribus-1.6.3/scribus/plugins/import/pdf/importpdfconfig.h +@@ -27,4 +27,10 @@ for which a new license (GPL+exception) + #define POPPLER_CONST_083 + #endif + ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++#define POPPLER_CONST_25_02 const ++#else ++#define POPPLER_CONST_25_02 ++#endif ++ + #endif +--- scribus-1.6.3/scribus/plugins/import/pdf/importpdf.cpp ++++ scribus-1.6.3/scribus/plugins/import/pdf/importpdf.cpp +@@ -462,11 +462,11 @@ bool PdfPlug::convert(const QString& fn) + + if (dev->isOk()) + { +- OCGs* ocg = pdfDoc->getOptContentConfig(); ++ POPPLER_CONST_25_02 OCGs* ocg = pdfDoc->getOptContentConfig(); + if (ocg && ocg->hasOCGs()) + { + QStringList ocgNames; +- Array *order = ocg->getOrderArray(); ++ POPPLER_CONST_25_02 Array *order = ocg->getOrderArray(); + if (order) + { + for (int i = 0; i < order->getLength (); ++i) +--- scribus-1.6.3/scribus/plugins/import/pdf/slaoutput.cpp ++++ scribus-1.6.3/scribus/plugins/import/pdf/slaoutput.cpp +@@ -2932,7 +2932,7 @@ void SlaOutputDev::beginMarkedContent(co + { + if (dictRef->isNull()) + return; +- OCGs *contentConfig = m_catalog->getOptContentConfig(); ++ POPPLER_CONST_25_02 OCGs *contentConfig = m_catalog->getOptContentConfig(); + OptionalContentGroup *oc; + if (dictRef->isRef()) + { +@@ -3084,7 +3084,11 @@ void SlaOutputDev::updateFont(GfxState * + #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 4, 0) + int tmpBufLen = 0; + #endif ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ std::vector codeToGID; ++#else + int *codeToGID = nullptr; ++#endif + const double *textMat = nullptr; + double m11, m12, m21, m22, fontSize; + SplashCoord mat[4] = { 1.0, 0.0, 0.0, 1.0 }; +@@ -3244,10 +3248,20 @@ void SlaOutputDev::updateFont(GfxState * + } + else + { ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ codeToGID.clear(); ++#else + codeToGID = nullptr; ++#endif + n = 0; + } +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) + if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); +@@ -3278,6 +3292,18 @@ void SlaOutputDev::updateFont(GfxState * + #endif + break; + case fontCIDType0COT: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0) ++ { ++ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID(); ++ n = codeToGID.size(); ++ } ++ else ++ { ++ codeToGID.clear(); ++ n = 0; ++ } ++#else + if (((GfxCIDFont *) gfxFont)->getCIDToGID()) + { + n = ((GfxCIDFont *) gfxFont)->getCIDToGIDLen(); +@@ -3289,7 +3315,15 @@ void SlaOutputDev::updateFont(GfxState * + codeToGID = nullptr; + n = 0; + } +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#endif ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", ++ gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) + if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", +@@ -3307,6 +3341,15 @@ void SlaOutputDev::updateFont(GfxState * + break; + case fontCIDType2: + case fontCIDType2OT: ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ codeToGID.clear(); ++ n = 0; ++ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0) ++ { ++ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID(); ++ n = codeToGID.size(); ++ } ++#else + codeToGID = nullptr; + n = 0; + if (((GfxCIDFont *) gfxFont)->getCIDToGID()) +@@ -3318,6 +3361,7 @@ void SlaOutputDev::updateFont(GfxState * + memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID)); + } + } ++#endif + else + { + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) +@@ -3339,14 +3383,24 @@ void SlaOutputDev::updateFont(GfxState * + if (! ff) + goto err2; + #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get()); ++#else + codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); ++#endif + ff.reset(); + #else + codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n); + delete ff; + #endif + } +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) ++ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum))) ++ { ++ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); ++ goto err2; ++ } ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) + if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) + { + error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); diff --git a/scribus.spec b/scribus.spec index 32661f2..759ea5c 100644 --- a/scribus.spec +++ b/scribus.spec @@ -14,6 +14,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc +Patch0: scribus-1.6.3-poppler-25.02.0.patch + BuildRequires: boost-devel BuildRequires: cmake BuildRequires: cups-devel From 4098c8f1b70dda67615df8d2635431e958abef61 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 16:25:37 +0200 Subject: [PATCH 07/13] Rebuilt for Python 3.14 From bc14e4109e27a6812c5325bff2149a3f46646e25 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Tue, 22 Jul 2025 17:41:21 +0200 Subject: [PATCH 08/13] Rebuild for poppler 25.07.0 --- scribus-1.6.3-poppler-25.06.0.patch | 24 ++++++++++++++++++ scribus-1.6.3-poppler-25.07.0.patch | 39 +++++++++++++++++++++++++++++ scribus.spec | 2 ++ 3 files changed, 65 insertions(+) create mode 100644 scribus-1.6.3-poppler-25.06.0.patch create mode 100644 scribus-1.6.3-poppler-25.07.0.patch diff --git a/scribus-1.6.3-poppler-25.06.0.patch b/scribus-1.6.3-poppler-25.06.0.patch new file mode 100644 index 0000000..6427f66 --- /dev/null +++ b/scribus-1.6.3-poppler-25.06.0.patch @@ -0,0 +1,24 @@ +From 8dcf8d777bd85a0741c455961f2de382e3ed47ec Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Tue, 3 Jun 2025 22:50:26 +0000 +Subject: Fix build with poppler 25.06.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26919 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 0b878b6e2..63f28fa4f 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -580,7 +580,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, + FormWidget *fm = m_formWidgets->getWidget(i); + if (!fm) + continue; ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) ++ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); ++ AnnotWidget* ano = anoSharedPtr.get(); ++#else + AnnotWidget *ano = fm->getWidgetAnnotation(); ++#endif + if (!ano) + continue; + if (ano != (AnnotWidget*) annota) diff --git a/scribus-1.6.3-poppler-25.07.0.patch b/scribus-1.6.3-poppler-25.07.0.patch new file mode 100644 index 0000000..2f784b0 --- /dev/null +++ b/scribus-1.6.3-poppler-25.07.0.patch @@ -0,0 +1,39 @@ +From ff6c6abfa8683028e548a269dee6a859b6f63335 Mon Sep 17 00:00:00 2001 +From: Jean Ghali +Date: Fri, 4 Jul 2025 19:27:20 +0000 +Subject: Fix build with poppler 25.07.0 + +git-svn-id: svn://scribus.net/trunk/Scribus@26940 11d20701-8431-0410-a711-e3c959e3b870 + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 63f28fa4f..a575c91bb 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -3091,7 +3091,12 @@ void SlaOutputDev::updateFont(GfxState *state) + break; + case fontTrueType: + case fontTrueTypeOT: +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0) ++ if (!fileName.empty()) ++ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); ++ else ++ ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) + if (!fileName.empty()) + ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); + else +@@ -3226,7 +3231,12 @@ void SlaOutputDev::updateFont(GfxState *state) + #endif + else + { +-#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) ++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0) ++ if (!fileName.empty()) ++ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); ++ else ++ ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum); ++#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) + if (!fileName.empty()) + ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); + else diff --git a/scribus.spec b/scribus.spec index 759ea5c..f5d3e2d 100644 --- a/scribus.spec +++ b/scribus.spec @@ -15,6 +15,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc Patch0: scribus-1.6.3-poppler-25.02.0.patch +Patch1: scribus-1.6.3-poppler-25.06.0.patch +Patch2: scribus-1.6.3-poppler-25.07.0.patch BuildRequires: boost-devel BuildRequires: cmake From 0c13094e7d45220b29500ce4adcbc199e51d7f5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:03:12 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 00084463c02562950b6ec8f8316a0835c71e1cb6 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 4 Aug 2025 22:00:43 +0200 Subject: [PATCH 10/13] Rebuild against podofo0.10 --- scribus.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scribus.spec b/scribus.spec index f5d3e2d..9e3f450 100644 --- a/scribus.spec +++ b/scribus.spec @@ -42,7 +42,7 @@ BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libmspub-0.1) BuildRequires: pkgconfig(libpagemaker-0.0) BuildRequires: pkgconfig(libpng) -BuildRequires: pkgconfig(libpodofo) < 0.9.9 +BuildRequires: pkgconfig(libpodofo) < 1.0 BuildRequires: pkgconfig(libqxp-0.0) BuildRequires: pkgconfig(librevenge-0.0) BuildRequires: pkgconfig(libtiff-4) From a4481d588de4774f2ec090fa91e25de2354c6561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Wed, 6 Aug 2025 09:57:50 +0200 Subject: [PATCH 11/13] Rebuilt for icu 77.1 From 703ed9d00c16bd5ba158b31a91ec5c60e369b9b9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 13 Aug 2025 15:15:35 -0500 Subject: [PATCH 12/13] 1.6.4 --- .gitignore | 1 + scribus-1.6.3-poppler-25.02.0.patch | 167 ---------------------------- scribus.spec | 7 +- sources | 2 +- 4 files changed, 5 insertions(+), 172 deletions(-) delete mode 100644 scribus-1.6.3-poppler-25.02.0.patch diff --git a/.gitignore b/.gitignore index a0b1525..d85d151 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ scribus-1.3.8.tar.bz2 /scribus-1.6.0-free.tar.xz /scribus-1.6.1-free.tar.xz /scribus-1.6.3-free.tar.xz +/scribus-1.6.4-free.tar.xz diff --git a/scribus-1.6.3-poppler-25.02.0.patch b/scribus-1.6.3-poppler-25.02.0.patch deleted file mode 100644 index 64af51e..0000000 --- a/scribus-1.6.3-poppler-25.02.0.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 188d030acd0cb71e89dbb57695fe52158b6a0959 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Tue, 4 Feb 2025 19:29:16 +0000 -Subject: #17405: Fix build error with poppler 25.02.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26666 11d20701-8431-0410-a711-e3c959e3b870 - ---- scribus-1.6.3/scribus/plugins/import/pdf/importpdfconfig.h -+++ scribus-1.6.3/scribus/plugins/import/pdf/importpdfconfig.h -@@ -27,4 +27,10 @@ for which a new license (GPL+exception) - #define POPPLER_CONST_083 - #endif - -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+#define POPPLER_CONST_25_02 const -+#else -+#define POPPLER_CONST_25_02 -+#endif -+ - #endif ---- scribus-1.6.3/scribus/plugins/import/pdf/importpdf.cpp -+++ scribus-1.6.3/scribus/plugins/import/pdf/importpdf.cpp -@@ -462,11 +462,11 @@ bool PdfPlug::convert(const QString& fn) - - if (dev->isOk()) - { -- OCGs* ocg = pdfDoc->getOptContentConfig(); -+ POPPLER_CONST_25_02 OCGs* ocg = pdfDoc->getOptContentConfig(); - if (ocg && ocg->hasOCGs()) - { - QStringList ocgNames; -- Array *order = ocg->getOrderArray(); -+ POPPLER_CONST_25_02 Array *order = ocg->getOrderArray(); - if (order) - { - for (int i = 0; i < order->getLength (); ++i) ---- scribus-1.6.3/scribus/plugins/import/pdf/slaoutput.cpp -+++ scribus-1.6.3/scribus/plugins/import/pdf/slaoutput.cpp -@@ -2932,7 +2932,7 @@ void SlaOutputDev::beginMarkedContent(co - { - if (dictRef->isNull()) - return; -- OCGs *contentConfig = m_catalog->getOptContentConfig(); -+ POPPLER_CONST_25_02 OCGs *contentConfig = m_catalog->getOptContentConfig(); - OptionalContentGroup *oc; - if (dictRef->isRef()) - { -@@ -3084,7 +3084,11 @@ void SlaOutputDev::updateFont(GfxState * - #if POPPLER_ENCODED_VERSION < POPPLER_VERSION_ENCODE(22, 4, 0) - int tmpBufLen = 0; - #endif -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ std::vector codeToGID; -+#else - int *codeToGID = nullptr; -+#endif - const double *textMat = nullptr; - double m11, m12, m21, m22, fontSize; - SplashCoord mat[4] = { 1.0, 0.0, 0.0, 1.0 }; -@@ -3244,10 +3248,20 @@ void SlaOutputDev::updateFont(GfxState * - } - else - { -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ codeToGID.clear(); -+#else - codeToGID = nullptr; -+#endif - n = 0; - } --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum))) -+ { -+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); -+ goto err2; -+ } -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) - if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); -@@ -3278,6 +3292,18 @@ void SlaOutputDev::updateFont(GfxState * - #endif - break; - case fontCIDType0COT: -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0) -+ { -+ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID(); -+ n = codeToGID.size(); -+ } -+ else -+ { -+ codeToGID.clear(); -+ n = 0; -+ } -+#else - if (((GfxCIDFont *) gfxFont)->getCIDToGID()) - { - n = ((GfxCIDFont *) gfxFont)->getCIDToGIDLen(); -@@ -3289,7 +3315,15 @@ void SlaOutputDev::updateFont(GfxState * - codeToGID = nullptr; - n = 0; - } --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#endif -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum))) -+ { -+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -+ gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); -+ goto err2; -+ } -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) - if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", -@@ -3307,6 +3341,15 @@ void SlaOutputDev::updateFont(GfxState * - break; - case fontCIDType2: - case fontCIDType2OT: -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ codeToGID.clear(); -+ n = 0; -+ if (((GfxCIDFont*) gfxFont)->getCIDToGIDLen() > 0) -+ { -+ codeToGID = ((GfxCIDFont*) gfxFont)->getCIDToGID(); -+ n = codeToGID.size(); -+ } -+#else - codeToGID = nullptr; - n = 0; - if (((GfxCIDFont *) gfxFont)->getCIDToGID()) -@@ -3318,6 +3361,7 @@ void SlaOutputDev::updateFont(GfxState * - memcpy(codeToGID, ((GfxCIDFont *)gfxFont)->getCIDToGID(), n * sizeof(*codeToGID)); - } - } -+#endif - else - { - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -@@ -3339,14 +3383,24 @@ void SlaOutputDev::updateFont(GfxState * - if (! ff) - goto err2; - #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 2, 0) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get()); -+#else - codeToGID = ((GfxCIDFont*) gfxFont)->getCodeToGIDMap(ff.get(), &n); -+#endif - ff.reset(); - #else - codeToGID = ((GfxCIDFont *)gfxFont)->getCodeToGIDMap(ff, &n); - delete ff; - #endif - } --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 2, 0) -+ if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, std::move(codeToGID), fontLoc->fontNum))) -+ { -+ error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); -+ goto err2; -+ } -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) - if (!(fontFile = m_fontEngine->loadTrueTypeFont(std::move(id), fontsrc, codeToGID, n, fontLoc->fontNum))) - { - error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)"); diff --git a/scribus.spec b/scribus.spec index 9e3f450..5605d15 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.3 +Version: 1.6.4 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -14,9 +14,8 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc -Patch0: scribus-1.6.3-poppler-25.02.0.patch -Patch1: scribus-1.6.3-poppler-25.06.0.patch -Patch2: scribus-1.6.3-poppler-25.07.0.patch +Patch0: scribus-1.6.3-poppler-25.06.0.patch +Patch1: scribus-1.6.3-poppler-25.07.0.patch BuildRequires: boost-devel BuildRequires: cmake diff --git a/sources b/sources index d97e813..623b22e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.3-free.tar.xz) = 6bdd4509542481fb2ac720fe8116e044380b94450bf945e2d1fc1ee79bcb5752d8653c90280191fb2aa1dab11b063b2af286369874ce2578f5169d686ef220bb +SHA512 (scribus-1.6.4-free.tar.xz) = 5186b9244b27d2b3a5aaa2a1f21beacc9a2aa90add0d3111f8b83b1fa376544049e9b57caf9f6a4749a463398cc2f4aeb69fca6f2d153d4571cea02dce97b9d1 From bd8adf5a426f3554ed41203d05e4f091bdf63151 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 5 Jan 2026 09:23:11 -0600 Subject: [PATCH 13/13] 1.6.5 --- .gitignore | 1 + scribus-1.6.3-poppler-25.06.0.patch | 24 ------------------ scribus-1.6.3-poppler-25.07.0.patch | 39 ----------------------------- scribus.spec | 4 +-- sources | 2 +- 5 files changed, 3 insertions(+), 67 deletions(-) delete mode 100644 scribus-1.6.3-poppler-25.06.0.patch delete mode 100644 scribus-1.6.3-poppler-25.07.0.patch diff --git a/.gitignore b/.gitignore index d85d151..84085b0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ scribus-1.3.8.tar.bz2 /scribus-1.6.1-free.tar.xz /scribus-1.6.3-free.tar.xz /scribus-1.6.4-free.tar.xz +/scribus-1.6.5-free.tar.xz diff --git a/scribus-1.6.3-poppler-25.06.0.patch b/scribus-1.6.3-poppler-25.06.0.patch deleted file mode 100644 index 6427f66..0000000 --- a/scribus-1.6.3-poppler-25.06.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8dcf8d777bd85a0741c455961f2de382e3ed47ec Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Tue, 3 Jun 2025 22:50:26 +0000 -Subject: Fix build with poppler 25.06.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26919 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 0b878b6e2..63f28fa4f 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -580,7 +580,12 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, - FormWidget *fm = m_formWidgets->getWidget(i); - if (!fm) - continue; -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 06, 0) -+ std::shared_ptr anoSharedPtr = fm->getWidgetAnnotation(); -+ AnnotWidget* ano = anoSharedPtr.get(); -+#else - AnnotWidget *ano = fm->getWidgetAnnotation(); -+#endif - if (!ano) - continue; - if (ano != (AnnotWidget*) annota) diff --git a/scribus-1.6.3-poppler-25.07.0.patch b/scribus-1.6.3-poppler-25.07.0.patch deleted file mode 100644 index 2f784b0..0000000 --- a/scribus-1.6.3-poppler-25.07.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ff6c6abfa8683028e548a269dee6a859b6f63335 Mon Sep 17 00:00:00 2001 -From: Jean Ghali -Date: Fri, 4 Jul 2025 19:27:20 +0000 -Subject: Fix build with poppler 25.07.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26940 11d20701-8431-0410-a711-e3c959e3b870 - -diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp -index 63f28fa4f..a575c91bb 100644 ---- a/scribus/plugins/import/pdf/slaoutput.cpp -+++ b/scribus/plugins/import/pdf/slaoutput.cpp -@@ -3091,7 +3091,12 @@ void SlaOutputDev::updateFont(GfxState *state) - break; - case fontTrueType: - case fontTrueTypeOT: --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0) -+ if (!fileName.empty()) -+ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); -+ else -+ ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum); -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) - if (!fileName.empty()) - ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); - else -@@ -3226,7 +3231,12 @@ void SlaOutputDev::updateFont(GfxState *state) - #endif - else - { --#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) -+#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(25, 7, 0) -+ if (!fileName.empty()) -+ ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); -+ else -+ ff = FoFiTrueType::make(fontsrc->buf, fontLoc->fontNum); -+#elif POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 11, 0) - if (!fileName.empty()) - ff = FoFiTrueType::load(fileName.c_str(), fontLoc->fontNum); - else diff --git a/scribus.spec b/scribus.spec index 5605d15..3e913a6 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.4 +Version: 1.6.5 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -14,8 +14,6 @@ Source0: %{name}-%{version}-free.tar.xz #Source0: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz #Source1: http://downloads.sourceforge.net/%%{name}/%%{name}-%%{version}.tar.xz.asc -Patch0: scribus-1.6.3-poppler-25.06.0.patch -Patch1: scribus-1.6.3-poppler-25.07.0.patch BuildRequires: boost-devel BuildRequires: cmake diff --git a/sources b/sources index 623b22e..9563bfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.4-free.tar.xz) = 5186b9244b27d2b3a5aaa2a1f21beacc9a2aa90add0d3111f8b83b1fa376544049e9b57caf9f6a4749a463398cc2f4aeb69fca6f2d153d4571cea02dce97b9d1 +SHA512 (scribus-1.6.5-free.tar.xz) = f023b42e7c59447c52bc41adcb2b4800568d1cf8c88a5b3d6b155f78403a5c92b518ed95e74a20d671e043c206757b0a0e4724b1562ec814901422364f326dfe