[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/20: gnu: coin3d: Use system expat.
From: |
guix-commits |
Subject: |
17/20: gnu: coin3d: Use system expat. |
Date: |
Mon, 15 Apr 2024 05:18:45 -0400 (EDT) |
cbaines pushed a commit to branch master
in repository guix.
commit 949c3682b7e4ba29c47c1fd92aecbca815b19d68
Author: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
AuthorDate: Tue Apr 9 12:22:36 2024 +0200
gnu: coin3d: Use system expat.
* gnu/packages/graphics.scm (coin3d): Remove bundled expat and use the
system one.
Change-Id: Ief176e320b7f57c5c3f349f244ed7d76e54f8281
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
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 @@ or by subtracting one shape from the other.")
(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 @@ or by subtracting one shape from the other.")
(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")
- 10/20: gnu: conky: Update to 1.19.8., (continued)
- 10/20: gnu: conky: Update to 1.19.8., guix-commits, 2024/04/15
- 11/20: gnu: meld: Update to 3.22.2., guix-commits, 2024/04/15
- 13/20: gnu: widelands: Update to 1.2., guix-commits, 2024/04/15
- 18/20: gnu: coin3d: Avoid use of dlopen., guix-commits, 2024/04/15
- 03/20: gnu: tests: Add system test for sddm., guix-commits, 2024/04/15
- 06/20: gnu: diffoscope: Increase test verbosity., guix-commits, 2024/04/15
- 09/20: gnu: Add gcc-cross-x86_64-w64-mingw32-toolchain-13., guix-commits, 2024/04/15
- 08/20: gnu: cross-gcc: Add patch for GCC 13., guix-commits, 2024/04/15
- 12/20: gnu: xpra: Update to 5.0.8., guix-commits, 2024/04/15
- 16/20: gnu: coin3d: Use G-Expressions., guix-commits, 2024/04/15
- 17/20: gnu: coin3d: Use system expat.,
guix-commits <=
- 19/20: gnu: coin3d: Update to 4.0.2., guix-commits, 2024/04/15
- 14/20: gnu: widelands: Improve package style., guix-commits, 2024/04/15
- 20/20: gnu: telescope: Update to 0.9., guix-commits, 2024/04/15
- 15/20: gnu: coin3D: Rename to coin3d., guix-commits, 2024/04/15