diff --git a/print/scribus/Makefile b/print/scribus/Makefile index b0d7c0909ec..9b830d8cc16 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -3,7 +3,7 @@ DPB_PROPERTIES= parallel COMMENT= desktop publishing program DISTNAME= scribus-1.6.1 CATEGORIES= print -REVISION= 0 +REVISION= 1 HOMEPAGE= https://www.scribus.net/ @@ -46,9 +46,10 @@ LIB_DEPENDS= graphics/lcms2 \ ${MODPY_LIB_DEPENDS} CXXFLAGS+= -D CMS_NO_REGISTER_KEYWORD +# For newer versions of scribus, -DWANT_CPP20=ON will probably be +# necessary. CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR="${LOCALBASE}/man/" \ - -DWANT_NOOSG=1 \ - -DWANT_CPP17=ON + -DWANT_NOOSG=1 #DEBUG_CONFIGURE_ARGS += -DWANT_DEBUG=1 FIX_CRLF_FILES= `find . -type f \( -name "*.cpp" -o -name "*.h" \)` diff --git a/print/scribus/patches/patch-CMakeLists_txt b/print/scribus/patches/patch-CMakeLists_txt new file mode 100644 index 00000000000..e0dfa104a0d --- /dev/null +++ b/print/scribus/patches/patch-CMakeLists_txt @@ -0,0 +1,25 @@ +Enforce C++20 for poppler-24.05.0. + +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -407,17 +407,8 @@ endif() + + #C++11 Support + #as of 1.5.5.svn, require C++11 +-if(NOT WANT_CPP14 AND NOT WANT_CPP17) +- message(STATUS "Enabling C++11 compiler features") +- set(CMAKE_CXX_STANDARD 11) +-endif() +-if (WANT_CPP14) +- message(STATUS "Enabling C++14 compiler features") +- set(CMAKE_CXX_STANDARD 14) +-elseif(WANT_CPP17) +- message(STATUS "Enabling C++17 compiler features") +- set(CMAKE_CXX_STANDARD 17) +-endif() ++message(STATUS "Enabling C++20 compiler features") ++set (CMAKE_CXX_STANDARD 20) + set (CMAKE_CXX_STANDARD_REQUIRED ON) + set (CMAKE_CXX_EXTENSIONS OFF) +