From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 8KHaHyGIH2O6ggEAbAwnHQ (envelope-from ) for ; Mon, 12 Sep 2022 21:27:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MGYEHyGIH2N2YwEAG6o9tA (envelope-from ) for ; Mon, 12 Sep 2022 21:27:29 +0200 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 33EFF36B36 for ; Mon, 12 Sep 2022 21:27:29 +0200 (CEST) Received: from localhost ([::1]:51834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oXp5c-0001GV-Cv for larch@yhetil.org; Mon, 12 Sep 2022 15:27:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oXp4F-0000pD-Jj for guix-patches@gnu.org; Mon, 12 Sep 2022 15:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oXp4F-00011Z-BP for guix-patches@gnu.org; Mon, 12 Sep 2022 15:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oXp4F-0000PK-7N for guix-patches@gnu.org; Mon, 12 Sep 2022 15:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57685] [PATCH v2 3/3] gnu: vtk: Use system libHaru. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 12 Sep 2022 19:26:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57685 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57685@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 57685-submit@debbugs.gnu.org id=B57685.16630107561528 (code B ref 57685); Mon, 12 Sep 2022 19:26:03 +0000 Received: (at 57685) by debbugs.gnu.org; 12 Sep 2022 19:25:56 +0000 Received: from localhost ([127.0.0.1]:48085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp47-0000OY-Iz for submit@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:55 -0400 Received: from mail-4317.proton.ch ([185.70.43.17]:61043) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oXp46-0000O9-Od for 57685@debbugs.gnu.org; Mon, 12 Sep 2022 15:25:55 -0400 Date: Mon, 12 Sep 2022 19:25:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1663010749; x=1663269949; bh=51vh3s36rHx9aKxccdCScQYBmC64Oz1lKbd01La0ar8=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=WFTZcX2lIsJGT38AK0D24CGJI0kmw/TzCDJlnI7e44eDIyUXAZiGSmLoS+HwOPX7i lJY9pVBN37aj1LwnvMczCMhNaiEp8WwbTUaQhjYN0ujYPLsCvedRNt85SOZzF6cIo6 noCH2xXmAc1o6Jg5X2qwzgabtF7sRR/YZ1b/S0/UIuQ/sgyFx0s7CNApHebXfNBngO nZI6hlXivPbT0CHibCAwi2+pRVxyEZFtyOssylz83ozPgtGq8Ph/WWZqcNP/qrF0fI ih0Nf+LURdl0sd59K93/UgXw5mjSpbo8ztA7VjEFO9yoDMbcq6O9eLnUsj2K2E/LjI X0hTq5a7YE4Mw== From: "Paul A. Patience" Message-ID: <20220912192510.420112-4-paul@apatience.com> In-Reply-To: <20220912192510.420112-1-paul@apatience.com> References: <20220912192510.420112-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1663010849; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=51vh3s36rHx9aKxccdCScQYBmC64Oz1lKbd01La0ar8=; b=fvKzkoKAFST3s4BIHsYFuaHativfb6XmlF1UI4gknud/6I7aKKT/9E4LSW675qacwWG9BT IeWUVLPK7zaXt+wfgjRvGdF44MePF9DGwVc/fU2TkZNoe53rTlSvpz5EKN1qnnxXrtjHPx aGCM7l0ZU4rXS0cM3g/o3b9y9WkuTK+z7h6tvrkhIhPOWsLgmRiST401adgP0O5wqeO4uU h2gLZwkDwuCLRI+nOza+rBud/vIOwR6NW7L03YDkLp8e3GoxYa2rVsOIDLBAVSo9TacPHv eco2D5Aj09Ive2VMiGI07+0H7KxwSyE81Ii2hNLagB/QL24kkfV5yPVeERQWTg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1663010849; a=rsa-sha256; cv=none; b=T46SGFks2B5g3FST81Ynwhj0uAFUtkXcsPwQ4mTaC2sxuUmgvAqL2jVGti/U60LehGCzZd XCfw92rjNkGMCBtwHKGfx/vY6RLK7gIo3xYIWLZP0zgQWg/yjPmD8O5W+8p/fgp+Op7OmF 0Mjv7cvB8/srmpb4LjCKnu5jlURuEyFW0UXIWsy9MgAQnHmgOTUgTNLjUqTgTgaUOYp69S Lwh4bw1Hrq7e/7wjXifvm0E3zvfnPKrkIpnom6ZVJOaS7SGad9bh6u6v9jXCz2+29NFyLb qKb6UUJZrsVRlmeLtAs53s0TN/xK+elJBDZwpozH6BztKcmVmAEjcKJkhDXXNA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail3 header.b=WFTZcX2l; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 3.69 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=apatience.com header.s=protonmail3 header.b=WFTZcX2l; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 33EFF36B36 X-Spam-Score: 3.69 X-Migadu-Scanner: scn1.migadu.com X-TUID: 1uLEXA0Y6NTO * gnu/packages/image-processing.scm (vtk)[snippet]: Delete bundled libHaru and patch VTK for newer libHaru. Reindent and remove trailing boolean. [arguments]: Specify external libHaru in configure flags. [inputs]: Add libharu. --- gnu/packages/image-processing.scm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-process= ing.scm index 0225f72651..4600c71ce0 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -324,14 +324,18 @@ (define-public vtk (snippet '(begin (for-each - (lambda (dir) - (delete-file-recursively - (string-append "ThirdParty/" dir "/vtk" dir))) - ;; pugixml depended upon unconditionally - '("doubleconversion" "eigen" "expat" "freetype" "gl2ps= " - "glew" "hdf5" "jpeg" "jsoncpp" "libproj" "libxml2" "= lz4" - "netcdf" "ogg" "png" "sqlite" "theora" "tiff" "zlib"= )) - #t)))) + (lambda (dir) + (delete-file-recursively + (string-append "ThirdParty/" dir "/vtk" dir))) + ;; pugixml depended upon unconditionally + '("doubleconversion" "eigen" "expat" "freetype" "gl2ps" + "glew" "hdf5" "jpeg" "jsoncpp" "libharu" "libproj" + "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora= " + "tiff" "zlib")) + (substitute* "IO/ExportPDF/vtkPDFContextDevice2D.cxx" + (("\\bHPDF_UINT16 (noPen|dash|dot|denseDot|dashDot|das= hDotDot)\\b" + _ var) + (string-append "HPDF_REAL " var))))))) (properties `((release-monitoring-url . "https://vtk.org/download/"))) (build-system cmake-build-system) (arguments @@ -348,6 +352,7 @@ (define-public vtk "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp=3DON" + "-DVTK_MODULE_USE_EXTERNAL_VTK_libharu=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_libproj=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=3DON" "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=3DON" @@ -381,6 +386,7 @@ (define-public vtk glew glu hdf5 + libharu libjpeg-turbo jsoncpp libtheora -- 2.37.3