From patchwork Tue Apr 9 10:22:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus Diaz X-Patchwork-Id: 62882 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 2AED527BBEB; Tue, 9 Apr 2024 11:24:24 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 971D027BBEA for ; Tue, 9 Apr 2024 11:24:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ru8e4-0001nk-O6; Tue, 09 Apr 2024 06:24:04 -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 1ru8dz-0001lu-4R for guix-patches@gnu.org; Tue, 09 Apr 2024 06:23:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ru8dv-0005dS-BU for guix-patches@gnu.org; Tue, 09 Apr 2024 06:23:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ru8e2-0001wA-8e for guix-patches@gnu.org; Tue, 09 Apr 2024 06:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70305] [PATCH 2/5] gnu: coin3d: Use G-Expressions. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Apr 2024 10:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70305 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70305@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 70305-submit@debbugs.gnu.org id=B70305.17126581927151 (code B ref 70305); Tue, 09 Apr 2024 10:24:02 +0000 Received: (at 70305) by debbugs.gnu.org; 9 Apr 2024 10:23:12 +0000 Received: from localhost ([127.0.0.1]:48369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru8dC-0001r4-Ku for submit@debbugs.gnu.org; Tue, 09 Apr 2024 06:23:12 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:60836) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru8cz-0001nZ-Us for 70305@debbugs.gnu.org; Tue, 09 Apr 2024 06:23:02 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-416923f05faso8583655e9.1 for <70305@debbugs.gnu.org>; Tue, 09 Apr 2024 03:22:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1712658164; x=1713262964; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=BWRajpQR3YISQOYYfenTq/UU77s4DmK5Sqj0bKrBlGI=; b=Hqf8ph5CnrPIR/JRbvpgk0U0PUPMoGY5Ls/QeBP2N0go0Ol9qkkUPTK7d3WErGS9hn J2CJFsFQGxuMFQyKT82yCzSO23xcQZuErrOmx7NGVZg6JsBTlImWoulf7NxFC2aXNh0X UrvFGuw5QvaXsGc9FtxpsC1NsgCEdZQQqZffUQBg8vhheLqq8W8KeqBUMRkFghEI+799 e8nSTjrtbcvgf0au6o8KvJGuCJSYTK4zXgE7fbiJWnV6AUFkSLWE2OVwx8v78cWfU+rB ZfaoVyVkM+5oe4J7jMa+BtgLdhVkZoIJC7/Un1zzvtbe8bl56zDeVSfnOP1poczJcbGQ /Pzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712658164; x=1713262964; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BWRajpQR3YISQOYYfenTq/UU77s4DmK5Sqj0bKrBlGI=; b=HLmFru1HaQJaU61qMNeeagEYmrZ6jHR/bRTBtexCYCgNu+pnGRcpWLXtZAe9NgrTJA /+DZCMIXsQi/D8X0+IIUTcUjLJgSS5RmdNIBuIWkz1k/3L6zxE9rNPEId4Ji+SuQFLkh tm7g0hwlK/qvKrMXXdSdYQUhhj/3DFIwiBNOKBnPVw5UOeDYsHKybO6smSUMj6Fmk/Qn 6OPqRIbzMx8yjPIsLytJ+tPoB4w8GFY3F2qZVNi9MhZgh5j4dKh5OP1fLsM8iI6Yc4T7 BPvKywIp96uQuUAq+xqHhM9XUxnBS2vN4jkVThAzIZDlkQDhTQcoGN2zkSjPMSgCYWMK TAvg== X-Gm-Message-State: AOJu0Yx6ajKC/QPxyLp1viKdBjarM+QBtqYEyBpFtwDa20EDunl59rR4 abWtp4YKQCvLLa70g9xtw5nOuKE5Zbbfns8HVV+7/Y6px5cUvWYOxJbMKjIbhdhIlqlkqoCWdcE t X-Google-Smtp-Source: AGHT+IGD5LOF2FZt/UHSy+XeWViq3Xn2F/twbk2MGmHj7/xYEiC/q50fE3ZscCl01oje3CwloKDkkQ== X-Received: by 2002:a05:600c:1987:b0:416:a71e:f2c6 with SMTP id t7-20020a05600c198700b00416a71ef2c6mr977451wmq.4.1712658163973; Tue, 09 Apr 2024 03:22:43 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id f16-20020a05600c4e9000b0041643c9cb0dsm11119880wmq.42.2024.04.09.03.22.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 03:22:43 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Tue, 9 Apr 2024 12:22:35 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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/graphics.scm (coin3d) , : Use G-Expressions. Change-Id: I79a77bda6fc919d9c3b80e77e38855824e81f6e6 --- gnu/packages/graphics.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index ebbc705cfc..f866318289 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1967,28 +1967,26 @@ (define-public coin3d (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p")) (modules '((guix build utils))) (snippet - '(begin - ;; Delete binaries - (for-each delete-file - '("cfg/csubst.exe" - "cfg/wrapmsvc.exe")) - ;; Delete references to packaging tool cpack. Otherwise the build - ;; fails with "add_subdirectory given source "cpack.d" which is not - ;; an existing directory." - (substitute* "CMakeLists.txt" - ((".*cpack.d.*") "")) - #t)))) + #~(begin + ;; Delete binaries + (for-each delete-file + '("cfg/csubst.exe" + "cfg/wrapmsvc.exe")) + ;; Delete references to packaging tool cpack. Otherwise the build + ;; fails with "add_subdirectory given source "cpack.d" which is not + ;; an existing directory." + (substitute* "CMakeLists.txt" + ((".*cpack.d.*") "")))))) (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~(list "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" + (string-append "-DBOOST_ROOT=" + #$(this-package-input "boost"))))) (native-inputs (list doxygen graphviz)) (inputs (list boost freeglut glew)) - (arguments - `(#:configure-flags - (list - "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" - (string-append "-DBOOST_ROOT=" - (assoc-ref %build-inputs "boost"))))) (home-page "https://github.com/coin3d/coin") (synopsis "High-level 3D visualization library with Open Inventor 2.1 API")