From patchwork Sat Jan 14 21:58:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Tor-bj=C3=B6rn_Claesson?= X-Patchwork-Id: 46119 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 6261827BBE9; Sat, 14 Jan 2023 22:01:20 +0000 (GMT) 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 0EFA627BBEB for ; Sat, 14 Jan 2023 22:01:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pGoaG-0003xi-50; Sat, 14 Jan 2023 17:01:04 -0500 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 1pGoaE-0003xG-SS for guix-patches@gnu.org; Sat, 14 Jan 2023 17:01:02 -0500 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 1pGoaE-0008Ds-G6 for guix-patches@gnu.org; Sat, 14 Jan 2023 17:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pGoaE-0002df-4n for guix-patches@gnu.org; Sat, 14 Jan 2023 17:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60640] Gnu: Add gdcm Resent-From: =?utf-8?q?Tor-bj=C3=B6rn?= Claesson Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 14 Jan 2023 22:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60640 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 60640@debbugs.gnu.org Received: via spool by 60640-submit@debbugs.gnu.org id=B60640.167373363210100 (code B ref 60640); Sat, 14 Jan 2023 22:01:02 +0000 Received: (at 60640) by debbugs.gnu.org; 14 Jan 2023 22:00:32 +0000 Received: from localhost ([127.0.0.1]:55696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGoZk-0002cq-30 for submit@debbugs.gnu.org; Sat, 14 Jan 2023 17:00:32 -0500 Received: from mail-lf1-f41.google.com ([209.85.167.41]:39763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pGoZg-0002cZ-0V for 60640@debbugs.gnu.org; Sat, 14 Jan 2023 17:00:30 -0500 Received: by mail-lf1-f41.google.com with SMTP id bf43so37870792lfb.6 for <60640@debbugs.gnu.org>; Sat, 14 Jan 2023 14:00:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=zQnpxs6UKO5mVKO6eyCvUA4P0dxcC/I7nsO0P9G3mMg=; b=J75PtHscN65ndA8KER+0mPEuJzt9eVC5CrjKd9ybAZ7/Px/wjsO5ialYQF9rwFvnsk J6z/wDsB7SivwPJ8/n3JRhrA4vb9bk0AOcNneI0cqRlpeo+4rdcVUzFy1/aGGGoQ2rs5 E3w2Qa1UvoNfeUr2s3mHgAeZ9yRVZ7jx5SEwMAhUz6bLXsiQ1rf3HmYgBcdSW14Avw+W mzqXryyiJ7JMu1CoxThmS8p4WqthBsnMHPPgBPaBCi/jVn4kg6L3HkcJw+3HGWdTOs9O RabzcXdGHr95cX7jX9uXDihvY+PgkRwmL4HMMRSwnLTKfJZmhVs/kvHerGdU4/YtfxiX HJ1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=zQnpxs6UKO5mVKO6eyCvUA4P0dxcC/I7nsO0P9G3mMg=; b=gSv0VEjOaFb9ANsT2p5ypJH0NpvW0q/ORckIv++OzRuVXptxDcPLybfUnIiWLSFxPR NOX6YyIJV0vLgXQ2Loal+DlFQHvim9EDJxGq6//zbDUk1d7N48A4Z0kn0zt2ImLZgPPK e8y0WZ/HiFhyPfsLBXsjotbmAraX1oxc0mo2CycttT+IeWzB02tFaanka93253AHbqjS m19E5gF2SlYAPfoCs4a4Krnoexc4gVVai5+oUzviTTk4BR745YieYSLvtqnL6NhClrKp Dcb1e1HMoMjGbAW0pxG5y/IMIa0Jf6e1CARzqqwlr6aukXSTgxcefzVbSmAHnHMdJl3n qekA== X-Gm-Message-State: AFqh2kpz4Ci7uFJ1afBh82bDB+ALwGJoO9JbVeWc6H6B9HUlrkqx28+8 2PebJ7hmCKMEp7XqKeESc6XEPbbCtz4= X-Google-Smtp-Source: AMrXdXvODNhGWzGc2HBfXR3+PGsU29ttDaxYuLwO9W9x2LJu0LezKJm9kfYqJN8gEg2ZSSlc9RMUZQ== X-Received: by 2002:ac2:446b:0:b0:4b5:8504:feea with SMTP id y11-20020ac2446b000000b004b58504feeamr20702473lfl.24.1673733621619; Sat, 14 Jan 2023 14:00:21 -0800 (PST) Received: from barbar (mobile-access-d98cd1-67.dhcp.inet.fi. [217.140.209.67]) by smtp.gmail.com with ESMTPSA id h21-20020a0565123c9500b004d468ed2ce3sm432205lfv.173.2023.01.14.14.00.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Jan 2023 14:00:20 -0800 (PST) References: <877cxyp1wf.fsf@gmail.com> <87y1qdo3qq.fsf@gmail.com> <87wn5rfldh.fsf_-_@gnu.org> <875ydau2vf.fsf@gmail.com> <87wn5q9epc.fsf@gnu.org> User-agent: mu4e 1.8.13; emacs 28.2 From: =?utf-8?q?Tor-bj=C3=B6rn?= Claesson Date: Sat, 14 Jan 2023 23:58:43 +0200 In-reply-to: <87wn5q9epc.fsf@gnu.org> Message-ID: <87358cn5e4.fsf@gmail.com> 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 And here is the last patch, which uses system packages where possible. All nice things in these patches are thanks to the help of Tobias, any screwups are mine. Thanks! Tor-björn From 77a7609eb727c53028846d0bf54204cdf9f58f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor-bj=C3=B6rn=20Claesson?= Date: Sat, 14 Jan 2023 23:56:43 +0200 Subject: [PATCH] gnu: gdcm: Use system packages where possible. --- gnu/packages/bioinformatics.scm | 47 +++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index e45d33ec2b..41709fd9ed 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -17853,7 +17853,29 @@ (define-public gdcm (file-name (git-file-name name version)) (sha256 (base32 - "1w78cmm9q7aavs7svdkl4dgilcqk4yazci9m6x7icrssb7cj991i")))) + "1w78cmm9q7aavs7svdkl4dgilcqk4yazci9m6x7icrssb7cj991i")) + (modules '((guix build utils) + (ice-9 ftw))) + (snippet + '(begin + (define (unbundle? file) + (member file '("dicom3tools" + "gdcmexpat" + "gdcmutfcpp" + "gdcmuuid" + "gdcmzlib" + "getopt" + "KWStyle" + "pvrg" + "Release" + "Release" + "VTK"))) + (with-directory-excursion "Utilities" + (for-each (lambda (utility) + (delete-file-recursively utility) + (substitute* "CMakeLists.txt" + (((string-append ".*/" utility "/.*")) ""))) + (scandir "." unbundle?))))))) (build-system cmake-build-system) (outputs '("out" "bin" "doc")) (arguments @@ -17882,6 +17904,20 @@ (define-public gdcm "|gdcmscu-find-dicomserver" "|TestEcho" "|TestFind'") + ;; Libraries + "-DGDCM_USE_SYSTEM_EXPAT:BOOL=ON" + "-DGDCM_USE_SYSTEM_JSON:BOOL=ON" + "-DGDCM_USE_SYSTEM_LIBXML2:BOOL=ON" + "-DGDCM_USE_SYSTEM_OPENSSL:BOOL=ON" + "-DGDCM_USE_SYSTEM_POPPLER:BOOL=ON" + "-DGDCM_USE_SYSTEM_UUID:BOOL=ON" + "-DGDCM_USE_SYSTEM_ZLIB:BOOL=ON" + ;; TODO: Unbundle these if possible. + "-DGDCM_USE_SYSTEM_CHARLS:BOOL=OFF" + "-DGDCM_USE_SYSTEM_LJPEG:BOOL=OFF" + "-DGDCM_USE_SYSTEM_OPENJPEG:BOOL=OFF" + "-DGDCM_USE_SYSTEM_PAPYRUS3:BOOL=OFF" + "-DGDCM_USE_SYSTEM_SOCKETXX:BOOL=OFF" ;; Documentation "-DGDCM_DOCUMENTATION:BOOL=ON" "-DGDCM_PDF_DOCUMENTATION:BOOL=ON" @@ -17890,7 +17926,14 @@ (define-public gdcm "-DGDCM_BUILD_DOCBOOK_MANPAGES:BOOL=OFF" ;; TODO: need ‘xsl-ns’ ;; Utilities "-DGDCM_BUILD_APPLICATIONS:BOOL=ON"))) - (native-inputs (list doxygen ghostscript graphviz texlive)) + (inputs (list expat + json-c + libxml2 + openssl + poppler + `(,util-linux "lib") + zlib)) + (native-inputs (list doxygen ghostscript graphviz pkg-config texlive)) (home-page "https://gdcm.sourceforge.net/wiki/index.php/Main_Page") (synopsis "Grassroots DICOM library") (description -- 2.38.1