From nobody Mon Apr 3 20:16:37 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 4Pr2Gs6Ql4z43Fpd; Mon, 3 Apr 2023 20:16:37 +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 4Pr2Gs5rjDz4bcF; Mon, 3 Apr 2023 20:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680552997; 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=BjphKkNOvLEjUQMTC6kGwpr7sqJ5F7EBmuXPOXNfdOQ=; b=GwNfoCiHO27LXy194ChwkpwUSMaGIqEn3YgNTiADaCRYzw5CpO36zeo6TVDEbeToBn9ckR V3T/aovp7HjFmojpf/dxI+Hkp/QGU/secC+D5y5U5HU97fAHBPgx+NiejayK10utltO18B cmJ2ZDdvZURBtK468dd5FVBEvTu+xHFDyiQ3HJjIFtkkmUZZh8btWrNh8+GkfN7veQUMuI v4HeNJH2AtZNF4ZrKNrA2tpQQfdXo4yPM3rIdKPd+RuD47TzS/YeBsCDC1qViqyQJPGd7w vXvz81BaIbU7j6ikxGZ4w+rvfyn2qS8VxJpVpGAvBhCc/z8napcaCLyGeu2Lzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680552997; 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=BjphKkNOvLEjUQMTC6kGwpr7sqJ5F7EBmuXPOXNfdOQ=; b=SfVJ9f5Y0G3PHlnhv6bB2OjheFIIwL/PgRI4hJsESB2B329XvKKC7XKGhky8EdUEZkZZoX sAV79WUreeUJovpCyI3k2dEcmqoshwil6jqzV8i0IzERzANskj7haPsVRNyNAskxQ+kccw PmLQ38yWEp/vab/0ALLecY6Z5w7f3B5qf+v6zS4dwbzl8GFuPAbHWYbC7F7/9DOppLI/kB W2pcjTRIk+LiwU5ntQNfWlT5+KGXHccm4AP9zFKHj06FwOcf6Xo+LE06IUHfZQqtdqgUO5 xNkcaHuWncTDqFts7B6ak8JSdISLHeWG+8NipHcg1AYlw/NPoQ8/1Zq1CouEbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680552997; a=rsa-sha256; cv=none; b=D9pAMlWKFo3at75FxJu01O1VT8FQPRtNZGk0e/RD1AI0HIx+NmZg4OLTsw3wwQe/8VvO/x ocSCghu60Rmf61gS+VbHO9JesL/axagQhG29CX5bVruB0wh1p/ucwI5lEY0PMzgpMxXLSJ yK6jzKY1m7EdDc0NuQCB+h/5SoRF3CloK2KjwcolQv3HFb2ZLvZvd8FQ9+wKlF+Q0JmuF4 XdIxQVQvv6WwTtmrawRG40lP4mSIJv4HQeJBuoBvs/JejODrERDlsQ37l7inIrjxy0Wv8x WJvaM6IdJZ/54JofqgwEOpbKArzorPlqn4CHAp36yGX4Msh9YERvEcWVVazHaQ== 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 4Pr2Gs4nj4z1BlX; Mon, 3 Apr 2023 20:16:37 +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 333KGbjn008982; Mon, 3 Apr 2023 20:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 333KGblV008981; Mon, 3 Apr 2023 20:16:37 GMT (envelope-from git) Date: Mon, 3 Apr 2023 20:16:37 GMT Message-Id: <202304032016.333KGblV008981@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: 7db91bae5c8b - main - science/paraview: upgrade to 5.11.1 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7db91bae5c8bf161a661ae5a92b855b2eea65c55 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=7db91bae5c8bf161a661ae5a92b855b2eea65c55 commit 7db91bae5c8bf161a661ae5a92b855b2eea65c55 Author: Thierry Thomas AuthorDate: 2023-04-03 19:49:40 +0000 Commit: Thierry Thomas CommitDate: 2023-04-03 20:16:10 +0000 science/paraview: upgrade to 5.11.1 This allows the removing of the ExprTk patches. --- science/paraview/Makefile | 6 +++--- science/paraview/distinfo | 6 +++--- science/paraview/files/patch-VTK_CMake_FindExprTk.cmake | 15 --------------- .../patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx | 12 ------------ 4 files changed, 6 insertions(+), 33 deletions(-) diff --git a/science/paraview/Makefile b/science/paraview/Makefile index da46d51bac6c..b1f6aa2ea906 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -1,6 +1,5 @@ PORTNAME= paraview -DISTVERSION= ${PARAVIEW_VER}.0 -PORTREVISION= 3 +DISTVERSION= ${PARAVIEW_VER}.1 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${PARAVIEW_VER}/ DISTNAME= ParaView-v${PORTVERSION} @@ -145,7 +144,8 @@ PLIST_SUB+= VERMAJORMINOR=${PARAVIEW_VER} VTK9_CONFLICTS= vtk.py vtkmodules/__init__.py vtkmodules/all.py \ vtkmodules/gtk vtkmodules/numpy_interface \ vtkmodules/qt vtkmodules/test vtkmodules/tk \ - vtkmodules/util vtkmodules/wx vtkmodules/generate_pyi.py + vtkmodules/util vtkmodules/wx vtkmodules/generate_pyi.py \ + vtkmodules/web/errors.py pre-configure: ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ diff --git a/science/paraview/distinfo b/science/paraview/distinfo index fcd6eada6df4..4401e886e1f0 100644 --- a/science/paraview/distinfo +++ b/science/paraview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668610241 -SHA256 (ParaView-v5.11.0.tar.xz) = 9a0b8fe8b1a2cdfd0ace9a87fa87e0ec21ee0f6f0bcb1fdde050f4f585a25165 -SIZE (ParaView-v5.11.0.tar.xz) = 70212180 +TIMESTAMP = 1680368317 +SHA256 (ParaView-v5.11.1.tar.xz) = 5cc2209f7fa37cd3155d199ff6c3590620c12ca4da732ef7698dec37fa8dbb34 +SIZE (ParaView-v5.11.1.tar.xz) = 79847556 diff --git a/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake b/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake deleted file mode 100644 index 215a8fb90f6f..000000000000 --- a/science/paraview/files/patch-VTK_CMake_FindExprTk.cmake +++ /dev/null @@ -1,15 +0,0 @@ -- 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) diff --git a/science/paraview/files/patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx b/science/paraview/files/patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx deleted file mode 100644 index 3507e242e481..000000000000 --- a/science/paraview/files/patch-VTK_Common_Misc_vtkExprTkFunctionParser.cxx +++ /dev/null @@ -1,12 +0,0 @@ -- unbreak bundled VTK after math/exprtk update to 0.0.2 - ---- VTK/Common/Misc/vtkExprTkFunctionParser.cxx.orig 2023-03-20 04:03:14 UTC -+++ VTK/Common/Misc/vtkExprTkFunctionParser.cxx -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - // exprtk macros - #define exprtk_disable_string_capabilities