From nobody Sat Mar 11 22:38:47 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 4PYyWX198wz3wy7C; Sat, 11 Mar 2023 22:38:48 +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 4PYyWX0cwbz4G8x; Sat, 11 Mar 2023 22:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678574328; 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=EEzMhuSJg83PxZPJoXJ5i1GYYjDG4pjnExP/jl3SOGc=; b=ACtWwGJofklfVQ2Y0S0pD/n2/cb1fOgVNPa4RgI5/84viomLShctQy56iN2B+Iuimrpdf6 ifid56Pr6WQ/XKTT/6GmVBop0ZIEEIXsUuYrtCeJP8WBXf2IExmQifMPkpWDTrNQ/kAWq1 6bdmp3sXuAG1qxQLVReRIoa2l3glnRQFExBSOD4goYwAhJjupNR71l+dPu5EpVNOdVNurP z5HRqHtsaQzn79xn2f2/wdGvhRIhX9KfYIl+fq/OzTiotw/EpHNry9n2S+pUFOcyTM8/en YdyeWsEGcgDIdiHRBzy/+Ne7PSwJieP9jiv58u+S2vvpApielJ6vdGyqWmGvdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678574328; 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=EEzMhuSJg83PxZPJoXJ5i1GYYjDG4pjnExP/jl3SOGc=; b=IYvn+J4O+RiIhIQgB2lgkUQQHvFtqkgnB52dIkSPBnvjVZL/g7CtKlAZfAPjokhBqqQ7kM b3xdf4YiTHcZGT+T6LBcVWUk5+RRmfZ815+E+JM3Qpip5LP6RuIeTqO69Mlh6E0yXCEspk r1Vw7SLt2KMwoNBg0B/LCP6BxCuQOjDt5DBnsAdMWxoWoAhyQneBKyrPD8H4dzWSYy1MoN KW4FUVy6hC/yNMfbmfSFptPNVY5wRLoIXOH9MAIfocR7UJMWVfUYt95Hr36BkC3k5H85VT sSqiP31puYtLIvbmegqyphgifiy96wjpMu++3xO3xQdePq28nuwnjA0TzNclnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678574328; a=rsa-sha256; cv=none; b=htJzffzT/RG56K2pAi87rDNW+GZB2CPB1DKsRYk+yDT8APTNdXVbp/w0a7rsxO6xlpjrjN rA8lRxuw/V9hxs4kpYWKLjJnjbGqbZDcRfu5DB2lQaBrQrJaY/6eF6w279GhUBJJUqric4 UChVSJEvGk1U7yMH1r79EAeOLPvdKrr9Z6DcN/071BoVqHieFeK0O2XnUxBjtGFiLTXUT7 1hUkVq+RwzMCaSAA6SMrqjE1mwGUe4ncnFLOSI+AHNhkCIO587WWx22B5dgx4vjOmG+6RX AXANX6eFc0m4VaJjR6vzcgtmlCWI+zLqt+vbMKC4ItW25CW9LbGUY64NOIjf/g== 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 4PYyWW6n1xznW8; Sat, 11 Mar 2023 22:38:47 +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 32BMclpp064103; Sat, 11 Mar 2023 22:38:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32BMcl9b064102; Sat, 11 Mar 2023 22:38:47 GMT (envelope-from git) Date: Sat, 11 Mar 2023 22:38:47 GMT Message-Id: <202303112238.32BMcl9b064102@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: dd567b32c6a8 - main - science/paraview: Fix build after recent upgrade of math/exprtk 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd567b32c6a831801869ee36d4e932044180f8d1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd567b32c6a831801869ee36d4e932044180f8d1 commit dd567b32c6a831801869ee36d4e932044180f8d1 Author: Yuri Victorovich AuthorDate: 2023-03-11 22:35:55 +0000 Commit: Yuri Victorovich CommitDate: 2023-03-11 22:38:45 +0000 science/paraview: Fix build after recent upgrade of math/exprtk FindExprTk.cmake parses the header file exprtk.h to find version, but the type of this variable changed since exprtk-0.0.2 Reported by: thierry@ --- science/paraview/files/patch-VTK_CMake_FindExprTk.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake b/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake new file mode 100644 index 000000000000..215a8fb90f6f --- /dev/null +++ b/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake @@ -0,0 +1,15 @@ +- workaround for https://gitlab.kitware.com/paraview/paraview/-/issues/21817 + +--- VTK/CMake/FindExprTk.cmake.orig 2023-03-11 22:27:31 UTC ++++ VTK/CMake/FindExprTk.cmake +@@ -21,8 +21,8 @@ mark_as_advanced(ExprTk_INCLUDE_DIR) + + if (ExprTk_INCLUDE_DIR) + file(STRINGS "${ExprTk_INCLUDE_DIR}/exprtk.hpp" _exprtk_version_header +- REGEX "static const char\\* version") +- string(REGEX MATCH "static const char\\* version = \"([0-9.]+)\"" _exprtk_version_match "${_exprtk_version_header}") ++ REGEX "static char_cptr *version") ++ string(REGEX MATCH "static char_cptr *version = \"([0-9.]+)\"" _exprtk_version_match "${_exprtk_version_header}") + set(ExprTk_VERSION "${CMAKE_MATCH_1}") + unset(_exprtk_version_header) + unset(_exprtk_version_match)