diff options
Diffstat (limited to 'app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch')
| -rw-r--r-- | app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch b/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch new file mode 100644 index 000000000000..288c72b61558 --- /dev/null +++ b/app-office/calligra/files/calligra-3.2.1-cxx17-for-poppler-22.patch @@ -0,0 +1,31 @@ +From 175b92c26637a08be4093c9579128f2f89253090 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Fri, 7 Jan 2022 14:00:05 +0100 +Subject: [PATCH] Fix build with >=app-text/poppler-22.01.0 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 71272ffef2d..bdd9ed74406 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -104,12 +104,7 @@ if(NOT DEFINED RELEASE_BUILD) + endif() + message(STATUS "Release build: ${RELEASE_BUILD}") + +-# use CPP-11 +-if (CMAKE_VERSION VERSION_LESS "3.1") +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") +-else () +- set (CMAKE_CXX_STANDARD 11) +-endif () ++set (CMAKE_CXX_STANDARD 17) # required for >=poppler-22.01 + + ############ + ############# +-- +2.34.1 + |