From patchwork Tue Apr 9 10:22:36 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: 62885 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 00D4D27BBEA; Tue, 9 Apr 2024 11:24:37 +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 83E8327BBE2 for ; Tue, 9 Apr 2024 11:24:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ru8e3-0001n2-8H; Tue, 09 Apr 2024 06:24:03 -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-0001lr-2o 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-0005dT-0Y 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-0001wH-KC for guix-patches@gnu.org; Tue, 09 Apr 2024 06:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70305] [PATCH 3/5] gnu: coin3d: Use system expat. 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.17126581937159 (code B ref 70305); Tue, 09 Apr 2024 10:24:02 +0000 Received: (at 70305) by debbugs.gnu.org; 9 Apr 2024 10:23:13 +0000 Received: from localhost ([127.0.0.1]:48371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru8dE-0001rI-EP for submit@debbugs.gnu.org; Tue, 09 Apr 2024 06:23:12 -0400 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]:51314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ru8d1-0001nb-7B for 70305@debbugs.gnu.org; Tue, 09 Apr 2024 06:23:03 -0400 Received: by mail-lf1-x12b.google.com with SMTP id 2adb3069b0e04-516d487659bso5436367e87.2 for <70305@debbugs.gnu.org>; Tue, 09 Apr 2024 03:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1712658165; x=1713262965; 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=1AFif+slgonjv5TDwCijcK5Qbd9N+QbvMnjj4u1afyw=; b=CbsT7Zd/QjXHCHXePYqOH699TdwGeHc75l3rxy24f+1o2MZym2nNj0NSFBxBiA1BBI ALPDVu1A7YEbzVMoRdMLsS89EGlpI9EhtC7HEQ4D/FbaHsyLkfUjFit5IxH9c+zoaoAv BzEhZaPSxtdUrJhcp2sZrBmurGxEIDcuB3lHfEDjF+f+FZc4zGZm5QKJHayvFo5kBTOF 1pb8D5yV6kE9ACTEqUVBR/eQJaGt3i6UM9NuozHKbJ1he36/WxEJWx/LdyCpKHr7fHpy lFXigB+MJv5mf8a+Ac+Ahbe8dL3urUq9aSxPb/YLtt0QLaalvuIe764qJTNw6TLiM33/ cQGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712658165; x=1713262965; 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=1AFif+slgonjv5TDwCijcK5Qbd9N+QbvMnjj4u1afyw=; b=Eiqq8SVe8DfUbRMEBJ87T1b+/sU8NHMpI20Z4iBXQ5CJ3ffaGpVt7q8EDf/JB8pwYl DO76w8lPMyVg7jjDbxMZV8Iswck3GfpElu4Oau0BZjMflHQFZhWWIJBK2tKxEvIIohLQ 6H8mLeHevJW/6ZJfARleeQitn6zFwApOF6pJEz2fqoTCwn1sFT3Zxn1inmU/7e6ieUS7 EJ6LV141Z264wItM9AhEek3lnw2IPcZQ8BeiFIr7tgJC6uVz1Ge+F5HA1I117KXuyin2 95qkspVYyl9U3WOpZueJBTbk8DiPu140h4FNNWTwtMgl8Xi/o8swc/IDxEsyaUpak3R3 J8DQ== X-Gm-Message-State: AOJu0YwOihIS4Q3IDx1mg5Onb+jaQ30WZyNLzIVoC75vMaUWv1/bW1nK SANLHD8VlJa3aWw3WyMOVvJG74snMCLqwDNKd6A/uwmqEzNLZl4tL4PDQntkEoqqkfa8B7ki6ho 7 X-Google-Smtp-Source: AGHT+IGQfeMKXi40iYez5cDncKRNVq/rh8+cELa4r39GDgeAqxOFr+nPOy2/UiKlp9sstTUvjrbTBA== X-Received: by 2002:a05:6512:4025:b0:516:d24b:b06e with SMTP id br37-20020a056512402500b00516d24bb06emr7793752lfb.41.1712658165163; Tue, 09 Apr 2024 03:22:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Apr 2024 03:22:44 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Tue, 9 Apr 2024 12:22:36 +0200 Message-ID: <7137561dd15207078db943555e392a3ba876d548.1712657465.git.jean@foundation.xyz> 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): Remove bundled expat and use the system one. Change-Id: Ief176e320b7f57c5c3f349f244ed7d76e54f8281 --- gnu/packages/graphics.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index f866318289..7f704c3e58 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1972,6 +1972,10 @@ (define-public coin3d (for-each delete-file '("cfg/csubst.exe" "cfg/wrapmsvc.exe")) + ;; Unbundle expat. + (delete-file-recursively "src/xml/expat") + (substitute* "src/xml/document.cpp" + (("expat/expat\\.h") "expat.h")) ;; Delete references to packaging tool cpack. Otherwise the build ;; fails with "add_subdirectory given source "cpack.d" which is not ;; an existing directory." @@ -1981,12 +1985,13 @@ (define-public coin3d (arguments (list #:configure-flags #~(list "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" + "-DUSE_EXTERNAL_EXPAT=ON" (string-append "-DBOOST_ROOT=" #$(this-package-input "boost"))))) (native-inputs (list doxygen graphviz)) (inputs - (list boost freeglut glew)) + (list boost expat freeglut glew)) (home-page "https://github.com/coin3d/coin") (synopsis "High-level 3D visualization library with Open Inventor 2.1 API")