From nobody Thu Aug 03 16:48:04 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 4RGvsx29tBz3cRnn; Thu, 3 Aug 2023 16:48:05 +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 4RGvsx1bXHz4dS1; Thu, 3 Aug 2023 16:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691081285; 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=J9ym1aqzZo/HY8bS5jTSpK1hoYV2+TjemJJ2J8qL2y0=; b=B9T0zbdnLpN0UEx5Xm+rkjdNSxakqy9J0dJrqmblLUJ1TUc+JKh6jvKM8ov/5IheqzThuo f6JP0XiTt4jqXIl4t7RI/bcqjUVBYrWdg3D+K+9F3ptLqxDhXswZ4fmVeNGCUTjJHHafeY 5ysfGvr5nspayFJUuk6zV+umn83yprR79YsGNSUEjDFRFJjxqNzdn5MxL59dN2nCz9BXjI U2WIPPLXIsBD8CbYcHI7EJqgdu3fF30/vG/6Lt6XWl3fjtz4DglZVQHYE/6bmCZPz72R/Z 0ZI/YMxD5vx6u8ZG9WGYoTWuW//0nA/YAlP2x1GDMKIpvX/i+FUIWzHc3upjgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691081285; 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=J9ym1aqzZo/HY8bS5jTSpK1hoYV2+TjemJJ2J8qL2y0=; b=tvcTYdt2sTNWTH/J9KwxyvBTrUYl2MhSQ9UOP3qRvC5ylpVbLPyKJtVL9N9Eo6SmI5Hg8X FWAq/53bvO4Ol5pQoH9YhGTFIG1SIgpzFLCZyZDazBVjJyz8x12WrC9DU2ko6RZ650RtG5 mYwP49Q7A5WduSHGuggOhvFN63+o01zloL4hxooXo4VrFx46ZWXPobmqyUXhtGM/UeysHz ojt4GCWS0GpnI+WNIYckmBLXLVvFQtCQ14gF50Il7qKRI2iFQH6qOgsT63cM3pWJ0tWYUC Hc9RIYTAovisAHfCV+aEDu2F+hCiT0mHDZMYZJ1rAvuftyGaoyVeM+NDNy//Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691081285; a=rsa-sha256; cv=none; b=GLOvFjbg99Uc1Cu1o+QGg2MSzkDfeZkO92WX4iwiWBGeQm+YgMN5VlDXqd2Bmvo3gOB+k5 Txrr8aRzttKGa6xmWGKmSXMfH01WDBjApp1Rg3JznxJ8zvueUECELZcnHlyjt/2Kd98XoV sbBXAG+qflcsJ4cJDjjG9ZyWbuYV15B2ftrJklLuCEYLEd8qZJnEjCekKMIxuHjvqJ/zs7 JUjYpGMmg6oqJUpw3+HZvE9c3Mdv1+LqJ3qP/Iey707X+DBSgdxfKBpc/IV42F3AH7NYiM TD/YZ/wmRUQnlo0zTmJRov2s+vnWGuOy3InQVLjSQiLnN3xymmro9fuCrOPpCg== 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 4RGvsx0hbnzCq6; Thu, 3 Aug 2023 16:48:05 +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 373Gm5Lc056380; Thu, 3 Aug 2023 16:48:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373Gm4aM056379; Thu, 3 Aug 2023 16:48:04 GMT (envelope-from git) Date: Thu, 3 Aug 2023 16:48:04 GMT Message-Id: <202308031648.373Gm4aM056379@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: fa869802d031 - main - print/scribus-devel: update patch for 14 to fix build on 12 and 13 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: fa869802d0318071f8e48f22579a7a3d777c1189 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa869802d0318071f8e48f22579a7a3d777c1189 commit fa869802d0318071f8e48f22579a7a3d777c1189 Author: Piotr Kubaj AuthorDate: 2023-08-03 16:46:45 +0000 Commit: Piotr Kubaj 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* RuleState::create +@@ -448,7 +448,11 @@ automata::NFA* RuleState::create return nfa; } --struct CreateDFAState : public std::unary_function , dfa_state_t> { ++#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)