From patchwork Thu May 18 14:58:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 50125 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CD7C327BBE9; Thu, 18 May 2023 16:46:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3366D27BBE2 for ; Thu, 18 May 2023 16:46:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzfps-0003tP-Fn; Thu, 18 May 2023 11:46:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzfpL-0003HI-If for guix-patches@gnu.org; Thu, 18 May 2023 11:46:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pzfpK-0007Vc-V5 for guix-patches@gnu.org; Thu, 18 May 2023 11:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pzfpK-0006Pc-Qu for guix-patches@gnu.org; Thu, 18 May 2023 11:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63570] [PATCH 5/5] gnu: paraview: Update to 5.11.1. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 15:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63570@debbugs.gnu.org Received: via spool by 63570-submit@debbugs.gnu.org id=B63570.168442472024536 (code B ref 63570); Thu, 18 May 2023 15:46:02 +0000 Received: (at 63570) by debbugs.gnu.org; 18 May 2023 15:45:20 +0000 Received: from localhost ([127.0.0.1]:54221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzfod-0006NY-BT for submit@debbugs.gnu.org; Thu, 18 May 2023 11:45:19 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:62529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pzfoY-0006MW-IZ for 63570@debbugs.gnu.org; Thu, 18 May 2023 11:45:16 -0400 Received: by mail-ej1-f68.google.com with SMTP id a640c23a62f3a-95fde138693so272342566b.0 for <63570@debbugs.gnu.org>; Thu, 18 May 2023 08:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684424709; x=1687016709; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=UvxuNPKPNeliX9q+a2ttNV+HsZW7Lx2uJCGptdpEWkU=; b=Fj5eeRmmp2OFy0h+LY59wxNf7a5L3URQ1afxRzKw0A6SzFOrFaou6TPGeIfvYzVeOT 8+4fp4bI0qqh9ng/8qJOqXx2qSTVMppyv9ORLWlGqxV8Sxj5ST+XbFVg5oxuH6lKEtYx raI2LyclhjKzMv4YB3HYYlgAzekkYqYJK1P/7mKp8lCOesFZayMTIi86+az0Gvp0SrNG del4ls89iPHGI554gcrwm5Y6cA5Sgu2xZSZBi2tNXJPxeHMeUfQWjfuIgcCvFnHj0yLw Qv06jT1BwC3nT6Cye+8gZtYqFRvcilxlxNQYEjycvS+Kqnd8iriy6R4S69RO/IgLxK2G hHOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684424709; x=1687016709; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UvxuNPKPNeliX9q+a2ttNV+HsZW7Lx2uJCGptdpEWkU=; b=eaj4hL+VffHaeNQSV9WhUY/6kNn7uBVHVwG9kpDm5gnD9eUqGWh8jdorgZr7BmD7V6 MNMW2E1s+TPn2lu8RuU/5deL/zkN52cZzkTY9dam+crX2jqAzw1d9Fq0udRkhqiUp8Zs VJXskD7DgY0W5f438ukLH1S96TEVfvRA6faHpFKfykLSdDf/sIYJSkuX7nhx59glxDjJ SZ7aJhtbiVVU42C5zJmLQlsWCMr049yfKYNaPIB36+WHKAVj62sec+zYmytnNx5VaHYI jp5M0cvW1kueVFFKzDJaWaye+ACz4Uv6DH/0XFsZoNuiaY9m5p2Gv6/FCMKm9JGDUPYe k8jQ== X-Gm-Message-State: AC+VfDwCDQu1lF7bKtdao8NdicWa5L2BBmjKyJ+TeI+KOE6pCBGlzUXD kRbAA0G9SIiSBjcA5E+h9zdgR/iwdOxwsw== X-Google-Smtp-Source: ACHHUZ4oUhHczTIB39e+AnzCFjRVV4DNCCvIjRYFaxARoMe3TWqiw0vmA9qBolWUZeIhDGqhs+/PHw== X-Received: by 2002:a17:907:3ea3:b0:965:aa65:233f with SMTP id hs35-20020a1709073ea300b00965aa65233fmr6474321ejc.2.1684424708584; Thu, 18 May 2023 08:45:08 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id h23-20020a170906719700b009659c23e78fsm1097530ejk.215.2023.05.18.08.45.08 for <63570@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 May 2023 08:45:08 -0700 (PDT) Message-Id: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 18 May 2023 16:58:33 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image-processing.scm (paraview): Update to 5.11.1. [source]: Unbundle nlohmannjson. [arguments]<#:configure-flags>: Add “-DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=ON”. [inputs]: Add nlohmann-json. --- gnu/packages/image-processing.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 03a78695bb..9a2eae8214 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -901,7 +901,7 @@ (define-public nip2 (define-public paraview (package (name "paraview") - (version "5.11.0") + (version "5.11.1") (source (origin (method git-fetch) @@ -911,7 +911,7 @@ (define-public paraview (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "0qifzsbgg8f7zvg5a4934nql6nv5b6sm1f59bylyc6v5bqd0myas")) + (base32 "0m1lgkl95f0pyhxp97gq2rf8hibv39v4c49imfj1va40z0flvard")) (modules '((guix build utils))) (snippet ;; TODO: Also remove unused bundled libraries and plugins? @@ -962,7 +962,7 @@ (define-public paraview "lzma" "mpi4py" "netcdf" - ;;"nlohmannjson" ; ParFlow build fails even with bundled + "nlohmannjson" "ogg" ;;"pegtl" "png" @@ -1071,7 +1071,7 @@ (define-public paraview "-DVTK_MODULE_USE_EXTERNAL_VTK_lzma=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON" - ;;"-DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=ON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON" ;;"-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON" @@ -1120,7 +1120,7 @@ (define-public paraview glew gmsh hdf5 - ;;nlohmann-json ;For ParFlow; build fails + nlohmann-json ;For ParFlow; build fails jsoncpp libjpeg-turbo libogg