commit: 87e54ac491002dcb3fa18a57110d700c12dcb7a7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jun 6 17:45:07 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jun 6 18:09:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87e54ac4
app-office/calligra: Fix build with >=app-text/poppler-24.05 Thanks-to: Attila Tóth Closes: https://bugs.gentoo.org/933490 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> app-office/calligra/calligra-3.2.1-r9.ebuild | 1 + .../files/calligra-3.2.1-poppler-24.05.0.patch | 42 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/app-office/calligra/calligra-3.2.1-r9.ebuild b/app-office/calligra/calligra-3.2.1-r9.ebuild index 32314e5d0f86..0503c3fba007 100644 --- a/app-office/calligra/calligra-3.2.1-r9.ebuild +++ b/app-office/calligra/calligra-3.2.1-r9.ebuild @@ -130,6 +130,7 @@ PATCHES=( "${WORKDIR}"/${PATCHSET}/${P}-kross-optional.patch # bug 903532 "${FILESDIR}"/${P}-use-cmake-FindGSL-module.patch # bug 903343 "${FILESDIR}"/${P}-clang-16-configure.patch + "${FILESDIR}"/${P}-poppler-24.05.0.patch # bug 933490 ) pkg_pretend() { diff --git a/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch new file mode 100644 index 000000000000..2ef45d675e3b --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-poppler-24.05.0.patch @@ -0,0 +1,42 @@ +diff '--color=auto' -urNp calligra-3.2.1-orig/CMakeLists.txt calligra-3.2.1-dwok/CMakeLists.txt +--- calligra-3.2.1-orig/CMakeLists.txt 2024-06-05 13:06:55.730007129 +0200 ++++ calligra-3.2.1-dwok/CMakeLists.txt 2024-06-05 13:08:00.587082911 +0200 +@@ -104,7 +104,7 @@ if(NOT DEFINED RELEASE_BUILD) + endif() + message(STATUS "Release build: ${RELEASE_BUILD}") + +-set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01 ++set (CMAKE_CXX_STANDARD 20) # required for >=poppler-22.04 + + ############ + ############# +diff '--color=auto' -urNp calligra-3.2.1-orig/libs/pigment/lut.h calligra-3.2.1-dwok/libs/pigment/lut.h +--- calligra-3.2.1-orig/libs/pigment/lut.h 2024-06-05 13:06:55.922010313 +0200 ++++ calligra-3.2.1-dwok/libs/pigment/lut.h 2024-06-05 13:09:24.460474108 +0200 +@@ -143,7 +143,7 @@ typedef uint32_t lut_uint32; + template<> \ + class LutKey<_INT_TYPE_> { \ + public: \ +- LutKey<_INT_TYPE_>(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ ++ LutKey(_INT_TYPE_ min, _INT_TYPE_ max) : m_min(min), m_max(max) \ + { \ + } \ + public: \ +@@ -183,7 +183,7 @@ PARTIAL_LUT_INT_SPECIALIZATION(lut_uint3 + template<> \ + class FullLutKey<_INT_TYPE_> { \ + public: \ +- FullLutKey<_INT_TYPE_>() \ ++ FullLutKey() \ + { \ + } \ + public: \ +@@ -233,7 +233,7 @@ class LutKey<float> { + float f; + }; + public: +- LutKey<float>(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) ++ LutKey(float min, float max, float precision) : m_min(min), m_max(max), m_precision(precision) + { + // Those values where computed using the test_linear and setting the shift and then using + // the standard deviation.
