diff --git a/.gitignore b/.gitignore index affbe31..84085b0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ 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 +/scribus-1.6.4-free.tar.xz +/scribus-1.6.5-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..3e913a6 100644 --- a/scribus.spec +++ b/scribus.spec @@ -1,5 +1,5 @@ Name: scribus -Version: 1.6.1 +Version: 1.6.5 Release: %autorelease Summary: Desktop Publishing application written in Qt # swatches bring in the fun licenses @@ -14,12 +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 @@ -45,7 +39,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) diff --git a/sources b/sources index 6c6a50f..9563bfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (scribus-1.6.1-free.tar.xz) = 690798ce9a94a9cf4cc8ad5eca03c287afe0986df213660152032e7a0d6a2e0e30cd1a9edd403eb9a162c5493c6dc8efde4fd3a4a38a021678fb3ee8e56d2267 +SHA512 (scribus-1.6.5-free.tar.xz) = f023b42e7c59447c52bc41adcb2b4800568d1cf8c88a5b3d6b155f78403a5c92b518ed95e74a20d671e043c206757b0a0e4724b1562ec814901422364f326dfe