From nobody Tue Jul 05 11:27:30 2022 X-Original-To: dev-commits-ports-branches@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 18CE71CFA925; Tue, 5 Jul 2022 11:27:31 +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 4LcgPv0036z4pyD; Tue, 5 Jul 2022 11:27:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657020451; 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=viz1EKMqxHznEFx6hpirl9cyJhP58KJ3wmYhdwLwKwk=; b=ZjD4VzHpRT2/ldPq/EjSaV9SWz0E79buI1oLCjPuI9rK1k6Gzh29v8w2RwSEVtSK0sWLzR FKKQ7Sy8lDs2dQlctqc3IPZL2I2fffROL8yvWfSFBhJpjuYlrgGOL8Whg24jkYH/wAyGcK mdI8JWwXUICijB9i0rRAtEQOHKycONPHnAJnxV9dFd5TRy5s7tOTTf1a94T6bL5c39pblb Mbq2fWDz1V8unOu+kwOrBYjQRoxCrNk1qXCLvsrKRXinRO3ThdqTPJ0TKEwZbnEkiX9xZR RTjZ38Ri8SxzIOLywTooy04IkM5WTZpuBx6t7fVilwXpt3Znyi+CnU4ofnTzLg== 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 D3A79247CF; Tue, 5 Jul 2022 11:27:30 +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 265BRUQF071547; Tue, 5 Jul 2022 11:27:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 265BRUhT071546; Tue, 5 Jul 2022 11:27:30 GMT (envelope-from git) Date: Tue, 5 Jul 2022 11:27:30 GMT Message-Id: <202207051127.265BRUhT071546@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Thierry Thomas Subject: git: 7411972306a3 - 2022Q3 - science/paraview: unbreak after the upgrade of science/netcdf List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 7411972306a393f1a549752587fd6b6d34878ff0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657020451; 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=viz1EKMqxHznEFx6hpirl9cyJhP58KJ3wmYhdwLwKwk=; b=MtRf9HAEdAZUFcwpXoXN5yH5Lp49QSqcj2EeCW+LCDHVEO4gEIsXvLEWn/Si9gtVEInMmS L6jpNSLPJdkv98Wzi8sBDWi2sh2p7zzeDe4gavzjB0lCYup9qsdXtVscAk6Cz6FbSMau6/ p2ql0EA07cdawt416DDRy1WhPaRlzrISv/GvV0kv9NKMI89RWlZjfC8SAw5kKJo45AYWWK DI8EjL7GdS4mpzFlxHZFK9EaO8QwzkHxF6qwH1CMPOlbXpPsj7VATED6EiUl4mOtHlHtSN S0JnO7WeiVIce0gZY4I7Fuq5iuyIPGNnBIzR4iSvjuKSJW8wxKLYd59LnbmPLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657020451; a=rsa-sha256; cv=none; b=ICoXiBioFuV9U5/fmBCq/GsgWLSRrmzt7IjaUtIhVX/2llUapQRlX63iFue4A8oZbG8XuM EI7VO1/gcEBrcGFr4dnAWaHm/fjPD3bJE2Q/MfPKndMKQPq23/AkZ1u57TWZmf06yk6WWT fB+1LT094gzQlng5knCph/aEN5N3Dd7eR0Abwk64BBXLsRpU4ilmpZvlHCzSS+Jc8HfH2s SHhhubAtXl3DBMKIeZu3HMHsOzmm1D+etB+hx/XRHySh/dbWU8zvdorPVR0NoPcNBCslKH r/UQd1Mf2LdeYd4KAEuQqM3/M5W9M6CTnBG2v9cFZCIn0Wb+tUkuWDmjpR82WQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=7411972306a393f1a549752587fd6b6d34878ff0 commit 7411972306a393f1a549752587fd6b6d34878ff0 Author: Thierry Thomas AuthorDate: 2022-07-03 12:48:43 +0000 Commit: Thierry Thomas CommitDate: 2022-07-05 11:27:25 +0000 science/paraview: unbreak after the upgrade of science/netcdf d1e81465471ca5a4976e6119991aa464ea03788b broke Paraview: chase this upgrade. Obtained from: https://bugs.debian.org/1012663 by Bas Couwenberg (cherry picked from commit 8ebe2acebff6ba16c07cc5b5d15c9edfbd0376b6) --- science/paraview/Makefile | 1 + ...h-VTK_ThirdParty_exodusII_vtkexodusII_src_ex__utils.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/science/paraview/Makefile b/science/paraview/Makefile index d420e8945b62..41e3ad65e3ed 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -2,6 +2,7 @@ PORTNAME= paraview DISTVERSION= 5.10.1 +PORTREVISION= 1 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/ DISTNAME= ParaView-v${PORTVERSION} diff --git a/science/paraview/files/patch-VTK_ThirdParty_exodusII_vtkexodusII_src_ex__utils.c b/science/paraview/files/patch-VTK_ThirdParty_exodusII_vtkexodusII_src_ex__utils.c new file mode 100644 index 000000000000..06985d1ffa22 --- /dev/null +++ b/science/paraview/files/patch-VTK_ThirdParty_exodusII_vtkexodusII_src_ex__utils.c @@ -0,0 +1,16 @@ +--- VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c.orig 2022-03-11 22:19:30 UTC ++++ VTK/ThirdParty/exodusII/vtkexodusII/src/ex_utils.c +@@ -1770,11 +1770,11 @@ void ex__compress_variable(int exoid, int varid, int t + */ + + /* const int NC_SZIP_EC = 4; */ /* Selects entropy coding method for szip. */ +- const int NC_SZIP_NN = 32; /* Selects nearest neighbor coding method for szip. */ ++ const int NC_SZIP_NN_ = 32; /* Selects nearest neighbor coding method for szip. */ + /* Even and between 4 and 32; typical values are 8, 10, 16, 32 */ + const int SZIP_PIXELS_PER_BLOCK = + file->compression_level == 0 ? 32 : file->compression_level; +- nc_def_var_szip(exoid, varid, NC_SZIP_NN, SZIP_PIXELS_PER_BLOCK); ++ nc_def_var_szip(exoid, varid, NC_SZIP_NN_, SZIP_PIXELS_PER_BLOCK); + #else + char errmsg[MAX_ERR_LENGTH]; + snprintf(errmsg, MAX_ERR_LENGTH,