Date: Thu, 3 Aug 2023 16:48:04 GMT From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fa869802d031 - main - print/scribus-devel: update patch for 14 to fix build on 12 and 13 Message-ID: <202308031648.373Gm4aM056379@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa869802d0318071f8e48f22579a7a3d777c1189 commit fa869802d0318071f8e48f22579a7a3d777c1189 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2023-08-03 16:46:45 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2023-08-03 16:48:02 +0000 print/scribus-devel: update patch for 14 to fix build on 12 and 13 PR: 272673 Submitted by: Trond Endrestøl --- print/scribus-devel/files/patch-scribus_desaxe_digester.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp b/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp index 41a978ccd222..db186823e4bd 100644 --- a/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp +++ b/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp @@ -1,11 +1,14 @@ ---- scribus/desaxe/digester.cpp.orig 2023-07-26 15:32:48 UTC +--- scribus/desaxe/digester.cpp.orig 2023-07-31 21:07:27 UTC +++ scribus/desaxe/digester.cpp -@@ -448,7 +448,7 @@ automata::NFA<nfa_state_t, token_t>* RuleState::create +@@ -448,7 +448,11 @@ automata::NFA<nfa_state_t, token_t>* RuleState::create return nfa; } --struct CreateDFAState : public std::unary_function <std::set<nfa_state_t>, dfa_state_t> { ++#if __cplusplus >= 201703L // ISO C++ 2017 or newer. +struct CreateDFAState : public std::__unary_function <std::set<nfa_state_t>, dfa_state_t> { ++#else + struct CreateDFAState : public std::unary_function <std::set<nfa_state_t>, dfa_state_t> { ++#endif CreateDFAState(const std::vector<rule_t>& rules, const std::vector<nfa_state_t>& accepting) : n(0), rules_(rules), accepting_(accepting)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308031648.373Gm4aM056379>