From nobody Tue Aug 15 23:20:39 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQS1M4bvbz4mMMY; Tue, 15 Aug 2023 23:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQS1M1sTdz4Nwf; Tue, 15 Aug 2023 23:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692141639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2+coB0vKr+j6cyJJWkfvuB+W+qrkYCsTFuBvHCno9Yw=; b=MhOh35f2ekZ5bLMOj1sPEYhKaKwRZGcfM9kkV14B3rUrQIddeaI8SjRwoe8RyJtpXwPfoG jz56ZD2fhPAXu/BDZwocSraZoMK9AgNlC2qfiDmZUB5S8K9vEofUlPag9x3IYxFZ4wPsQr QlRFetzb7j1q4XJWvW5/MbVlAtXwvDtmavl+wjxtzcojRleTqAfZgyov+o1H24O9qsu419 chfzf7KjJiu0FwaZ7QWmz93Ny30Ekt8/RXg5uH2GkKX8BfSo/zyLh5pqYTy9EIzydXHQib 9ZXtxn846dfpX+diXVZ6wWuTL0M2b8xZVH6kC+xTlRz/5zME0+y6f5AGlDP1FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692141639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2+coB0vKr+j6cyJJWkfvuB+W+qrkYCsTFuBvHCno9Yw=; b=xxaqkbW6QSizAfPIkdUWq4Ty8WLvVkcyseq7Vgga1fqxQLvHqa0GgSj74aFA/LRZxPIbTa AnhFImSnTheicttGUUyx0ODzmmqZIPUk7Mkg1ATh4JgQxnhVgpfKvJjQm76wpTRZeYf/qT R5wXGYDe+MBV1bcKojt4JSupAYh87Cp2AIJbikt/fthdEGUvUksqTNmebbUqOSUjuZRar/ O5UpSwXfUm5yFZ+hF9mqTqxnigSq5wutJrMyW5L+kCwHRe8bEh7XukBYvurU6zHn5hMaaK ddW80a4Cs4xEGEt+tSLs3eiW+SXOVS+j2AXfblrRsM9PNBqMnt749e2zSpzBhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692141639; a=rsa-sha256; cv=none; b=mTgBEugd1WIEt6Y3Ca7i1GC3xPUzPUXeD3ogfq+FGVJinH6C3f52fQ9u/wYaYPA2J9Ems2 1ozCXlM1fh6obKPcGAWDBeUXAYhPqcwr7pJ/QxF7toSCzRELtTHH8WskeRNVSKc3dty6D9 fot3IUK6bNfN2ST8DGkOkl4Svky8b0hYJTEOqo16X5moeHZpoZIhxZ2PHFXxaEQsO8NgSY 6Hspl9tIe0XcdlQaxbCQZ0+NVkYyBjKml+7ni3DXGQjyU00cxgfJYGlNHwTGFq//ns2dOU K1a2IrcjtIrom4hEeGSx8jfsQ/dYZY3ruktftRYy2A5/IT4vyt/JBInjW4BqnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQS1M0xHQzDW8; Tue, 15 Aug 2023 23:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FNKd4C001459; Tue, 15 Aug 2023 23:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FNKdBR001456; Tue, 15 Aug 2023 23:20:39 GMT (envelope-from git) Date: Tue, 15 Aug 2023 23:20:39 GMT Message-Id: <202308152320.37FNKdBR001456@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: c96075994621 - main - print/scribus-devel: fix build with llvm16 while keeping compatibility with older llvm List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c960759946217abeef45e5f39e7b224d69812730 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=c960759946217abeef45e5f39e7b224d69812730 commit c960759946217abeef45e5f39e7b224d69812730 Author: Piotr Kubaj AuthorDate: 2023-08-15 23:19:31 +0000 Commit: Piotr Kubaj CommitDate: 2023-08-15 23:19:31 +0000 print/scribus-devel: fix build with llvm16 while keeping compatibility with older llvm Previous fix broke llvm < 16. PR: 273140 --- print/scribus-devel/Makefile | 9 ++++++++- .../scribus-devel/files/patch-scribus_desaxe_digester.cpp | 14 -------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index feae31864363..aad5a04d62c5 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -50,6 +50,8 @@ CMAKE_ARGS+= -DWANT_HUNSPELL=YES \ OPTIONS_DEFINE= DOCS +.include + # Patch sources to force using include files installed by graphics/podofo09 post-patch: @${REINPLACE_CMD} -e '/^[\t ]*#include/s|podofo/podofo.h|podofo09/podofo.h|' \ @@ -58,9 +60,14 @@ post-patch: ${WRKSRC}/scribus/imagedataloaders/scimgdataloader_pdf.cpp \ ${WRKSRC}/scribus/pdflib_core.h \ ${WRKSRC}/scribus/pdf_analyzer.h +.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 160 + @${REINPLACE_CMD} -e 's|std::unary_function|std::__unary_function|' \ + ${WRKSRC}/scribus/desaxe/digester.cpp +.endif + post-install: ${LN} -sf ../share/icons/1_5_1/scribus.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ -.include +.include diff --git a/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp b/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp deleted file mode 100644 index db186823e4bd..000000000000 --- a/print/scribus-devel/files/patch-scribus_desaxe_digester.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- scribus/desaxe/digester.cpp.orig 2023-07-31 21:07:27 UTC -+++ scribus/desaxe/digester.cpp -@@ -448,7 +448,11 @@ automata::NFA* RuleState::create - return nfa; - } - -+#if __cplusplus >= 201703L // ISO C++ 2017 or newer. -+struct CreateDFAState : public std::__unary_function , dfa_state_t> { -+#else - struct CreateDFAState : public std::unary_function , dfa_state_t> { -+#endif - - CreateDFAState(const std::vector& rules, const std::vector& accepting) - : n(0), rules_(rules), accepting_(accepting)