From nobody Fri Jul 22 15:42:04 2022 X-Original-To: dev-commits-ports-all@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 4LqDFm6Bq6z4XTb2; Fri, 22 Jul 2022 15:42:04 +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 4LqDFm5nQQz3SCR; Fri, 22 Jul 2022 15:42:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658504524; 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=EadCg9V0FFRBY6cHeHV5f7m/k2nS/H4bedKCA1dUB/Y=; b=Z2YONbvDBxckfYyepMlIGTX2MldWouqt/nSW+JW/0NcWsWUPhTxe+M+ILwJ3oiIb4Nz5oh ZX1n3JCczz5RDgWCSyS5Lb+pKKY71AeNplONRH6quPBZx7+TLIkbi2lp/mWn2vzJhnz1AF Q99IRyWPhoejZGrC1+o5Yb0/Vo59Eb7YQO7CVlNyWXgZw37D+lfIvaFbMZgPTNsRud12pI Byrs1LTvTYbQF2i/L3jGY5oHTvs2eTZ4hG7t/2yZ6yiMj4efuV3aZKNw2rweVvXP1jsI3i e/GzLc8OZlj3Etks0c/mc6DrJmChe0CH25d44t3EKhVbpS7xMG37gkcHXi6Xkw== 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 4LqDFm4rK9z15gw; Fri, 22 Jul 2022 15:42:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26MFg4mw020513; Fri, 22 Jul 2022 15:42:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26MFg4dV020511; Fri, 22 Jul 2022 15:42:04 GMT (envelope-from git) Date: Fri, 22 Jul 2022 15:42:04 GMT Message-Id: <202207221542.26MFg4dV020511@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 5a133e19607d - main - cad/camotics: unbreak after the upgrade of lang/v8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a133e19607d5199549bbb28e2e90273663cea05 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658504524; 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=EadCg9V0FFRBY6cHeHV5f7m/k2nS/H4bedKCA1dUB/Y=; b=t3WT3Z5CwJR/sBmioC0cEn619pztntxE7hjzzisgiR6X6IdOX55lFqlVb+HUjGsu3a11oF 3Gmy0uYCUgnQmD+rz1p2wuYD9Yr+DmEnv7oORaIkRpMXRg4mYiAjpOvWSVYyXq9EVRTGdx ZkhtCZiwtiKHXoGFOz3YVUbLpUTWqns9qmwUZzl5znkBlR1IhTxi1palag10s0reprA6kc CtML7aMnM/2u+dtmeW24nDjA5B8XmPpkGAeQ/dT4KuamUKmXJm/fczIP/XwAGOuo/yGtzv QaU5Zm84SK2s1QtrsH/2+nB/Hd9ovZxXzFb2iqAFg4CNYIOY+tNpXU1f4qdvTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658504524; a=rsa-sha256; cv=none; b=KTwsI3dvphzbwNBxd6S5dKesswOGRQZsN9M9kqhspi5wcQgXSNsobUUj7VkXqe2uXUtM57 XOaau1YVqvKsS/q5fWmcE35pEPmpLOKauVvy1kRNpFGOXvD44ryY/D3MmxnLOSs+evc2t+ CdTX5jJqfVffcr56rxpdNhlKv825I3fSdrd6l29cs8JAUHlTwVNIBrsYxvJw7kXc2W3NXQ AdCOvP2JCCrM+H7EYQummBuUP0zdzGmQEE51iT4muhnAQUJeb7W47mtrO6VnIVi3Hvxl/T DTEIim4YRoKs0CiINeOzcryoinRqUjCd3pVgk8KqCZx4mbAkAOzdssKYolOXkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a133e19607d5199549bbb28e2e90273663cea05 commit 5a133e19607d5199549bbb28e2e90273663cea05 Author: Thierry Thomas AuthorDate: 2022-07-22 13:43:26 +0000 Commit: Thierry Thomas CommitDate: 2022-07-22 15:41:57 +0000 cad/camotics: unbreak after the upgrade of lang/v8 After the latest upgrade of v8, C! and CAMotics must be built with c++17 standard. Obtained from: https://github.com/CauldronDevelopmentLLC/CAMotics/issues/369 Fixes: 0db7465f145a Reported by: pkg-fallout --- cad/camotics/Makefile | 3 ++- cad/camotics/files/patch-src_camotics_contour_TriangleMesh.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/cad/camotics/Makefile b/cad/camotics/Makefile index 2e711b9a09d6..05caf682632f 100644 --- a/cad/camotics/Makefile +++ b/cad/camotics/Makefile @@ -1,6 +1,7 @@ PORTNAME= CAMotics DISTVERSIONPREFIX= v DISTVERSION= 1.2.2-rc1 +PORTREVISION= 1 CATEGORIES= cad MAINTAINER= thierry@FreeBSD.org @@ -52,7 +53,7 @@ PORTEXAMPLES= * MAKE_ARGS+= cc="${CC}" \ cxx="${CXX}" \ - cxxstd="c++14" \ + cxxstd="c++17" \ ccflags="${CCFLAGS}" \ cxxflags="${CXXFLAGS} ${QT5_INC}" \ linkflags="${LDFLAGS} ${QT5_LIBS}" \ diff --git a/cad/camotics/files/patch-src_camotics_contour_TriangleMesh.h b/cad/camotics/files/patch-src_camotics_contour_TriangleMesh.h new file mode 100644 index 000000000000..02e8a834dddf --- /dev/null +++ b/cad/camotics/files/patch-src_camotics_contour_TriangleMesh.h @@ -0,0 +1,11 @@ +--- src/camotics/contour/TriangleMesh.h.orig 2021-07-27 23:51:08 UTC ++++ src/camotics/contour/TriangleMesh.h +@@ -52,7 +52,7 @@ namespace CAMotics { + + + struct VertexSort { +- bool operator() (const Vertex *a, const Vertex *b) {return *a < *b;} ++ bool operator() (const Vertex *a, const Vertex *b) const {return *a < *b;} + }; + +