all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
To: 70305@debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
Subject: [bug#70305] [PATCH 3/5] gnu: coin3d: Use system expat.
Date: Tue,  9 Apr 2024 12:22:36 +0200	[thread overview]
Message-ID: <7137561dd15207078db943555e392a3ba876d548.1712657465.git.jean@foundation.xyz> (raw)
In-Reply-To: <cover.1712657465.git.jean@foundation.xyz>

* 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")
-- 
2.41.0





  parent reply	other threads:[~2024-04-09 10:24 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-09 10:13 [bug#70305] [PATCH 0/5] gnu: coin3d: Improve and update to 4.0.2 Jean-Pierre De Jesus DIAZ
2024-04-09 10:22 ` [bug#70305] [PATCH 1/5] gnu: coin3D: Rename to coin3d Jean-Pierre De Jesus DIAZ
2024-04-09 10:22 ` [bug#70305] [PATCH 2/5] gnu: coin3d: Use G-Expressions Jean-Pierre De Jesus DIAZ
2024-04-09 10:22 ` Jean-Pierre De Jesus DIAZ [this message]
2024-04-09 10:22 ` [bug#70305] [PATCH 4/5] gnu: coin3d: Avoid use of dlopen Jean-Pierre De Jesus DIAZ
2024-04-09 10:22 ` [bug#70305] [PATCH 5/5] gnu: coin3d: Update to 4.0.2 Jean-Pierre De Jesus DIAZ
2024-04-15  9:52 ` bug#70305: [PATCH 0/5] gnu: coin3d: Improve and update " Christopher Baines
2024-05-02 14:49 ` [bug#70305] Related issue? Buttons Presser via Guix-patches via

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7137561dd15207078db943555e392a3ba876d548.1712657465.git.jean@foundation.xyz \
    --to=jean@foundation.xyz \
    --cc=70305@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.