From nobody Sat Jun 17 15:25:06 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 4Qk0Fv2CVzz4fKX6; Sat, 17 Jun 2023 15:25:07 +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 4Qk0Fv1QpVz43mC; Sat, 17 Jun 2023 15:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687015507; 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=m37USHDYPQ8jc9SCiqmXDYb5IE453irAAWhev2IZGAw=; b=oKkU0EIeR49aJW/xgo7LZfNiuG6uILN3nP/+g0/v8mXKkZvvfCvJJdKJEqNWpmQIsj7lJK ooEHnAvN3521JAPcEWtdODUhbwzTC1d+do7aLhKrrfZtuBryfWrckdE1z8nwPXfbyU1rfl Cv2xwUzbvzHYvX5JpGZcX9zPmVqlFptyZmv2BvbKhI61+o39BYgrg4sB13V2OTo+yMJdZs WCLlIk8btA2sJq0cMU9brk8Jt2E9F1lMx5xRuNLx6RF/bQl8knkoTwWRoiXdjOLAQ6cNun ljJY444XHQuBViA++GKRdQN4hIGqHLCyYzDGTNbqnIdlW8b58kEhymZKJeOOZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687015507; 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=m37USHDYPQ8jc9SCiqmXDYb5IE453irAAWhev2IZGAw=; b=GGc+52tthd1Zuv3/VhFtYr5vZjBskSfMT3OJ9e4w+B2/SZdulig/wA6TaxbTBformqfLXq 4GOf69hq2Gtro/gzYU+9RLVMDFZXhwFMWoh7jvsXgILjDejSePWPoSAMFYzciBAi76DH8f wIssFdDkWagU6x6ZzU2+YPZHLgfsPRdQAR06t7/mk6D5pSyS7LpKLJI5CXHFQ6IAXpFsr0 sRJKzw/OCDqQvUQ1RMMprfCBEDGytVIRCyixryMcOKfr4DxMSLwYpA9SzcqxYiGySCYtyC NEnLb29tfy8jtd2V4mE9AcWh/ShBtpknU/D/dPeQuaJciLdJj0NEgaJI1aNHrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687015507; a=rsa-sha256; cv=none; b=cFJEWevZC+va9oz9R81ib9NR8lBkxqwkD6euRT9DNXoyJowRig8+zVWHemco0Y9n+O7siP gzPBy9FCTxPvqBFlglzose3Dtj1zn5eAsVzOMJ4iWbzUs6IRVhVEEPmH1nAB4I8zD4AOYS jYqUFaZxIedLiBphpuYIYc7g6WVl5fHxlMxVW1OUUrLr6elcQ5h/rDaJn9oAfoEA12KqbD At89LR6oF2AcY94dDJyXi7WIEabT+VMgL/9YCs578KjBmMhuucVxbZg9R9JpSOOjmhhbiV LUirZ1voUv461vcNlNNy9g0feodUyl0kqgVxNk7DjJ2IA4Q4W7rQcTsWyboZTw== 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 4Qk0Fv0RtZz1F5J; Sat, 17 Jun 2023 15:25:07 +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 35HFP7Fc017246; Sat, 17 Jun 2023 15:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35HFP6ld017245; Sat, 17 Jun 2023 15:25:06 GMT (envelope-from git) Date: Sat, 17 Jun 2023 15:25:06 GMT Message-Id: <202306171525.35HFP6ld017245@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 8c1a570ba56e - main - math/vtk9: fix build with clang 16 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c1a570ba56ecb0ed8714b81241b1858058d156f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c1a570ba56ecb0ed8714b81241b1858058d156f commit 8c1a570ba56ecb0ed8714b81241b1858058d156f Author: Dimitry Andric AuthorDate: 2023-06-17 12:23:00 +0000 Commit: Dimitry Andric CommitDate: 2023-06-17 15:24:55 +0000 math/vtk9: fix build with clang 16 Clang 16 has a new error about incompatible function types, which shows up when building math/vtk9: /wrkdirs/usr/ports/math/vtk9/work/VTK-9.2.2/ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c:1274:93: error: incompatible function pointer types passing 'herr_t (hid_t, const char *, const H5L_info1_t *, void *)' (aka 'int (long, const char *, const H5L_info1_t *, void *)') to parameter of type 'H5L_iterate2_t' (aka 'int (*)(long, const char *, const H5L_info2_t *, void *)') [-Wincompatible-function-pointer-types] if (! is_link(id)) H5Literate_by_name2(id, name, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, delete_children, data, H5P_DEFAULT); ^~~~~~~~~~~~~~~ /usr/local/include/H5Lpublic.h:992:87: note: passing argument to parameter 'op' here H5_iter_order_t order, hsize_t *idx, H5L_iterate2_t op, void *op_data, ^ /wrkdirs/usr/ports/math/vtk9/work/VTK-9.2.2/ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c:1434:64: error: incompatible function pointer types passing 'herr_t (hid_t, const char *, const H5L_info1_t *, void *)' (aka 'int (long, const char *, const H5L_info1_t *, void *)') to parameter of type 'H5L_iterate2_t' (aka 'int (*)(long, const char *, const H5L_info2_t *, void *)') [-Wincompatible-function-pointer-types] H5Literate2(gid, H5_INDEX_CRT_ORDER, H5_ITER_NATIVE, NULL, fix_dimensions, NULL); ^~~~~~~~~~~~~~ /usr/local/include/H5Lpublic.h:926:42: note: passing argument to parameter 'op' here H5L_iterate2_t op, void *op_data); ^ and a bunch more of these. The problem is that the H5Literate_by_name2() function (from /usr/local/include/H5Lpublic.h) is being called with an incorrect argument for the "op" parameter, which should be of type "H5L_iterate2_t" instead. In turn, "H5L_iterate2_t" is a function type, and requires the function's "info" parameter to be of type "const H5L_info2_t *". Redefine "H5L_info_t" to mean "H5L_info2_t" to work around this problem, otherwise a lot of function definitions would have to be adjusted. PR: 272037 Approved by: yuri (maintainer) MFH: 2023Q2 --- math/vtk9/Makefile | 2 +- .../files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index d04d22191888..34368e2814ff 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,6 @@ PORTNAME= vtk DISTVERSION= 9.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 diff --git a/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c b/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c new file mode 100644 index 000000000000..908a0098eced --- /dev/null +++ b/math/vtk9/files/patch-ThirdParty_cgns_vtkcgns_src_adfh_ADFH.c @@ -0,0 +1,13 @@ +--- ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c.orig 2022-10-02 11:37:19 UTC ++++ ThirdParty/cgns/vtkcgns/src/adfh/ADFH.c +@@ -287,6 +287,10 @@ if (mta_root == NULL){set_error(ADFH_ERR_ROOTNULL, err + #define CMP_OINFO(r,n) ((r)->fileno==(n)->fileno && \ + (r)->addr==(n)->addr && (r)->addr != HADDR_UNDEF) + ++#if H5_VERSION_GE(1,12,0) ++#undef H5L_info_t ++#define H5L_info_t H5L_info2_t ++#endif + + static herr_t gfind_by_name(hid_t, const char *, const H5L_info_t*, void *); + static herr_t find_by_name(hid_t, const char *, const H5A_info_t*, void *);