diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-07-18 12:29:02 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-07-18 12:29:02 +0100 |
commit | f85858c81a721c7fc89c1ab8df19e3a213dc27cd (patch) | |
tree | 3f0aeb33e434ee50b99bcc8b54158bc6169a41f2 /app-office/scribus/files | |
parent | 16857b69f990738d17bc5842e3e49a6e82d1428d (diff) |
gentoo auto-resync : 18:07:2024 - 12:29:01next
Diffstat (limited to 'app-office/scribus/files')
4 files changed, 0 insertions, 154 deletions
diff --git a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch deleted file mode 100644 index 55bc9934964b..000000000000 --- a/app-office/scribus/files/scribus-1.6.1-boost-1.85-2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3116328e804c7366ec64c4224cbf20b0f14e52c8 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Sun, 31 Mar 2024 21:40:42 +0000 -Subject: [PATCH] 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 ---- a/scribus/third_party/lib2geom/rect.h -+++ b/scribus/third_party/lib2geom/rect.h -@@ -56,14 +56,14 @@ class D2<Interval> { - private: - Interval f[2]; - public: -- D2<Interval>() { f[X] = f[Y] = Interval(0, 0); } -+ D2() { f[X] = f[Y] = Interval(0, 0); } - -- D2<Interval>(Interval const &a, Interval const &b) { -+ D2(Interval const &a, Interval const &b) { - f[X] = a; - f[Y] = b; - } - -- D2<Interval>(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/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch b/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch deleted file mode 100644 index 9d5dc0868843..000000000000 --- a/app-office/scribus/files/scribus-1.6.1-boost-1.85.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 3e80b387a226f1abac2bcce6e4300467c189d264 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Sat, 1 Jun 2024 22:04:13 +0000 -Subject: [PATCH] #17229: scribus fails to compile with boost 1.85.0 - -git-svn-id: svn://scribus.net/branches/Version16x/Scribus@26170 11d20701-8431-0410-a711-e3c959e3b870 ---- 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/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch deleted file mode 100644 index 0a8d317b6109..000000000000 --- a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch +++ /dev/null @@ -1,64 +0,0 @@ -From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 4 Mar 2024 17:35:11 +0100 -Subject: [PATCH] Fix build with >=poppler-24.03.0 - -Fixes build errors caused by: - -"Use an enum for Function getType" -Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083 - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- 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::Sampled))
-+#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::Sampled))
-+#else
- else if ((func->getType() == 2) || (func->getType() == 0))
-+#endif
- {
- GfxColor stop1;
- shading->getColor(0.0, &stop1);
--- -2.44.0 - diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch deleted file mode 100644 index 9d2ae918768c..000000000000 --- a/app-office/scribus/files/scribus-1.6.1-poppler-24.05.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 985b7944e50b23f4558ba4ca539659f37b4b7ba4 Mon Sep 17 00:00:00 2001 -From: Jean Ghali <jghali@libertysurf.fr> -Date: Thu, 2 May 2024 22:26:03 +0000 -Subject: [PATCH] Enforce C++20 when building with poppler >= 24.05.0 - -git-svn-id: svn://scribus.net/trunk/Scribus@26125 11d20701-8431-0410-a711-e3c959e3b870 ---- 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") |