From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0F8aFd1UNWCXdAAA0tVLHw (envelope-from ) for ; Tue, 23 Feb 2021 19:17:49 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id sKraEN1UNWCdKgAAB5/wlQ (envelope-from ) for ; Tue, 23 Feb 2021 19:17:49 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C89021757B for ; Tue, 23 Feb 2021 20:17:48 +0100 (CET) Received: from localhost ([::1]:55952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lEdBs-0003dy-00 for larch@yhetil.org; Tue, 23 Feb 2021 14:17:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50532) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEdB8-0003dh-P6 for guix-patches@gnu.org; Tue, 23 Feb 2021 14:17:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEdB8-0004kK-Hd for guix-patches@gnu.org; Tue, 23 Feb 2021 14:17:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lEdB8-0003sU-EE for guix-patches@gnu.org; Tue, 23 Feb 2021 14:17:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46724] [PATCH] gnu: vtk: Update to 9.0.1 Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Feb 2021 19:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46724 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46724@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161410781514885 (code B ref -1); Tue, 23 Feb 2021 19:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Feb 2021 19:16:55 +0000 Received: from localhost ([127.0.0.1]:60538 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEdB1-0003s1-3f for submit@debbugs.gnu.org; Tue, 23 Feb 2021 14:16:55 -0500 Received: from lists.gnu.org ([209.51.188.17]:57564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lEdAz-0003rt-6t for submit@debbugs.gnu.org; Tue, 23 Feb 2021 14:16:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50500) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lEdAz-0003c2-1k for guix-patches@gnu.org; Tue, 23 Feb 2021 14:16:53 -0500 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:34395) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lEdAw-0004f8-QG for guix-patches@gnu.org; Tue, 23 Feb 2021 14:16:52 -0500 Received: by mail-io1-xd32.google.com with SMTP id y202so18366351iof.1 for ; Tue, 23 Feb 2021 11:16:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atai-org.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to :content-transfer-encoding; bh=xYH6/q4INjWKGGIhY7Rw9/mm3GoI0nur08RqLAJjMzM=; b=GZ6Br8cYLfZ80J+TCJ9U1Tfc4F3i3fXVZGCw7D+CPiUyKpSJ/9RVAkJDhwt4acyNLc r+5LNtBUAL1fZLU8kt7dBDhoXtyPTwIp4S6ZHSGsZk4MyoOXhoDFTxzbMp00a2ahuTU5 6qmEewzKF5Rppr533To/wlNbClz+s8U62N37K3ad+ufasB378iw2Cmwpxfbu8VHyMn/b F4aqOjHG/AKpvrzwXWOmgKnJhUZOnNza8VI4zZC3ebdZ9sLZaC0EmY8Eyi6ADX1xu460 J7Hn0JC9kWW0LoRwEQTfe2uLH9AV8MWgqtlNzLu+w404FGNHtANPMYhUITLTVl4zIRrW XZYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to :content-transfer-encoding; bh=xYH6/q4INjWKGGIhY7Rw9/mm3GoI0nur08RqLAJjMzM=; b=q+d24LgFE2QylMGeydVQJo7FAGYLY5TihyNZ9yp9+dvaZMB59IUegYhmuPPuWOj76x Vqdq+nRpFNri3F3Ri4jwvwsXouA2G2pJ/GKUaO4dGxloX+2FKpYy85aaUEUgbrWT0XbC KLWYMArBt4uSOKStzuOb7gCHaYua7PoPQE6C01Zkg3eLzZfY2/8U3xfZk1ZPsFr/bTAw 5NdOx7nMfCOgraDDgPrB8WLFVAv/jyONpwE/2DZmyrltKxcr15mUzqJ+pGZpXXZBlBrw WdcZ7qo0/WbwDUbYYGu7utGbUfV8sgZGMXM4O8TFSME5K555QzM9RcpuLte3x29nUK9z NB3w== X-Gm-Message-State: AOAM530qYJziF3HWELrwXPkMbg04vltndTl+7E95wIQAjo+NU7W24yOc uB0aF0jYf0EdC3k0X2xgdygpDJgKGkmD1Nn6rTFiQGne/YQ8Aw== X-Google-Smtp-Source: ABdhPJyEw0YcnbalEuhmOeD2FNwz8MH2KLiIfV2Z2oCvuUcxDbE02wH6XdOKNzFMDlon/ct5d1B/58QWl+ttvNhWIu0= X-Received: by 2002:a05:6602:1856:: with SMTP id d22mr19881649ioi.62.1614107809150; Tue, 23 Feb 2021 11:16:49 -0800 (PST) MIME-Version: 1.0 From: Andy Tai Date: Tue, 23 Feb 2021 11:16:13 -0800 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2607:f8b0:4864:20::d32; envelope-from=lichengtai@gmail.com; helo=mail-io1-xd32.google.com X-Spam_score_int: -13 X-Spam_score: -1.4 X-Spam_bar: - X-Spam_report: (-1.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.37 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=atai-org.20150623.gappssmtp.com header.s=20150623 header.b=GZ6Br8cY; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C89021757B X-Spam-Score: -1.37 X-Migadu-Scanner: scn1.migadu.com X-TUID: a1Cj7nyDGR4a * gnu/packages/image-processing.scm (vtk): Update to 9.0.1 --- gnu/packages/image-processing.scm | 50 ++++++++++--------------------- 1 file changed, 15 insertions(+), 35 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index c3ea8491d9..3af9b3c6c3 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -13,6 +13,7 @@ ;;; Copyright =C2=A9 2020 Pierre Neidhardt ;;; Copyright =C2=A9 2020 Brendan Tildesley ;;; Copyright =C2=A9 2021 Oleh Malyi +;;; Copyright =C2=A9 2021 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -245,7 +246,7 @@ many popular formats.") (define-public vtk (package (name "vtk") - (version "8.2.0") + (version "9.0.1") (source (origin (method url-fetch) (uri (string-append "https://vtk.org/files/release/" @@ -253,44 +254,23 @@ many popular formats.") "/VTK-" version ".tar.gz")) (sha256 (base32 - "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each - (lambda (dir) - (delete-file-recursively - (string-append "ThirdParty/" dir "/vtk" dir))) - ;; ogg, pugixml depended upon unconditionally - '("doubleconversion" "eigen" "expat" "freetype" "gl2ps= " - "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "= lz4" - "netcdf" "png" "sqlite" "theora" "tiff" "zlib")) - #t)))) + "1ir2lq9i45ls374lcmjzw0nrm5l5hnm1w47lg8g8d0n2j7hsaf8v")) + (modules '((guix build utils))))) (build-system cmake-build-system) (arguments '(#:build-type "Release" ;Build without '-g' to save space. - #:configure-flags '(;"-DBUILD_TESTING:BOOL=3DTRUE" - ;"-DVTK_MODULE_USE_EXTERNAL_vtkogg:BOOL=3DTRUE" ; not honored - "-DVTK_USE_SYSTEM_DOUBLECONVERSION:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_EIGEN:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_EXPAT:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_FREETYPE:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_GL2PS:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_GLEW:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_HDF5:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_JPEG:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_JSONCPP:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_LIBPROJ:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_LIBXML2:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_LZ4:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_NETCDF:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_PNG:BOOL=3DTRUE" - ;"-DVTK_USE_SYSTEM_PUGIXML:BOOL=3DTRUE" ; breaks IO/CityGML - "-DVTK_USE_SYSTEM_SQLITE:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_THEORA:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_TIFF:BOOL=3DTRUE" - "-DVTK_USE_SYSTEM_ZLIB:BOOL=3DTRUE") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-sources + (lambda _ + (substitute* "Common/Core/vtkFloatingPointExceptions.cxx" + (("") "")) + (substitute* "Common/Core/CMakeLists.txt" + (("fenv.h") "cfenv")) + #t))) #:tests? #f)) ;XXX: test data not included + (native-inputs + `(("python", python-wrapper))) (inputs `(("double-conversion" ,double-conversion) ("eigen" ,eigen) --=20 2.30.1