From nobody Sun Jul 03 12:52:21 2022 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 3E04086B672; Sun, 3 Jul 2022 12:52:22 +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 4LbTNk1G0Kz3n6k; Sun, 3 Jul 2022 12:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656852742; 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=3jMhJEVlyewLnX8fs32vBryvcrmFLXb3VkPKQ2+iLEk=; b=VmTGYe1IKYz5jlutaJlxHPZ2cUhqqf4w2BVWSBx8EwjLeSydL3jsjD8N/sDESVBF5CQDXZ IbWn5nzC8kRwpVTs9bxOnY5YGeOTJGB8nlRWiJwrZtXRuyN4XQLPpVthsmLHWCJOnPfXDG Y2mpdH3eyvMYmGniP7nerjUONYnztv5LlUzlOPWAi3UzzijEi90kd/9FPdCuQ5iPLN5hxq Q7+JtQRGokFDfZah2PM5Y4PWNkDDyp33QOXpEm2pVBwXCLVs40XS2qKr1Sf23pwnc69M11 mso0QgY0GJ9EL8u7cIVu7i9osEu5b6TA9KIfOesVGJfTBcQPBwVYIo+lsgSz9A== 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 0B20B24935; Sun, 3 Jul 2022 12:52:22 +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 263CqLOW088773; Sun, 3 Jul 2022 12:52:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 263CqL24088772; Sun, 3 Jul 2022 12:52:21 GMT (envelope-from git) Date: Sun, 3 Jul 2022 12:52:21 GMT Message-Id: <202207031252.263CqL24088772@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: 8ebe2acebff6 - main - science/paraview: unbreak after the upgrade of science/netcdf 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: 8ebe2acebff6ba16c07cc5b5d15c9edfbd0376b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656852742; 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=3jMhJEVlyewLnX8fs32vBryvcrmFLXb3VkPKQ2+iLEk=; b=HM+M7nsfKTayfY46nh253/x2rplivAa+CoglrFkLMUitSE1bBkmOcS0twEUpn6qVFU1ypN zbDkECT/lIbHmekaMAPuzle+NXi68fp7xcYslRJ8ieeWDZZjnV5qDRWT/Cmclqj/z5AO4x TLfBNP9qUZ+k3aDca1aQ8OxMyjdR2UNI98nFP00HBb1emsFbqfn8fIV5VidOQBUAUwJ6Lb qmzCXImzs/+dLmmrBvV56OttItauMHl9xjLVlvcwHZ1/FzIsPd1Jn3UqMyM8KRDc4VSSMw hxlVxUNYEU1XyllWC35ozLEl4wixLYxp8+3gsjh3XdcSLmyZLLhT+QpKrwcWVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656852742; a=rsa-sha256; cv=none; b=XhF5C1KJ3E9PsgB+6vmNrGd/vVXxttHPm+hz7IBq25AIevlrqIl9JwBeyajrq0k1feBhlm uZF8A8TmpnNogMbuCuftXJkgsdBuO77M2ZQ4iDxcceVVjxbGDJEFKiVnej4j92bjWpQ8c5 MVITb23d38M7T6FdiBw0W/0mIWbv82k5s67vPlY9zOuXhOAwImzxuiJANR6NPH9LzpTlyC y2lgvIMYwfB2VzSzmTde2hgFuG/T753+4nd0DU3dBKPoRTcbA0INhyz/flg4YpRG8L3R9g Io/tTmOd1d+7PUuKlZc/BxPvY5SgrW9m/791Zsnv8TnFxBRYWivwBHTug7JM4w== 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=8ebe2acebff6ba16c07cc5b5d15c9edfbd0376b6 commit 8ebe2acebff6ba16c07cc5b5d15c9edfbd0376b6 Author: Thierry Thomas AuthorDate: 2022-07-03 12:48:43 +0000 Commit: Thierry Thomas CommitDate: 2022-07-03 12:48:43 +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 --- 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,