amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openscad: Fix build.

Browse source 
Fixes <https://issues.guix.gnu.org/72693>.

* gnu/packages/patches/openscad-fix-boost-join.patch: New file.
* gnu/packages/patches/openscad-with-cgal-5.3.patch: New file.
* gnu/packages/patches/openscad-with-cgal-5.4.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register new patches.
* gnu/packages/engineering.scm (openscad)[source]: Use new patches.
  [inputs, native-inputs]: Remove labels.
  [arguments]: Disable a few more tests. Remove trailing booleans.

Change-Id: I3ce103afd8669dd68c95352a87d76994a3f08504
This commit is contained in:
Guillaume Le Vaillant 2024-08-22 15:30:32 +02:00
parent 645cb9b6f6
commit 6bec6c20b6
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
5 changed files with 194 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

76
gnu/packages/engineering.scm
View file

@ -2810,44 +2810,49 @@ ontinuous-time and discret-time expressions.")
".src.tar.gz"))
(sha256
(base32
"0n83szr88h8snccjrslr96mgw3f65x3sq726n6x5vxp5wybw4f6r"))))
"0n83szr88h8snccjrslr96mgw3f65x3sq726n6x5vxp5wybw4f6r"))
(patches
;; Upstream patches to make version 2021.01 build with recent versions
;; of boost and cgal.
(search-patches "openscad-with-cgal-5.3.patch"
"openscad-with-cgal-5.4.patch"
"openscad-fix-boost-join.patch"))))
(build-system cmake-build-system)
(inputs
`(("boost" ,boost)
("cgal" ,cgal)
("double-conversion" ,double-conversion)
("eigen" ,eigen)
("fontconfig" ,fontconfig)
("glew" ,glew)
("gmp" ,gmp)
("harfbuzz" ,harfbuzz)
("lib3mf" ,lib3mf)
("libxml2" ,libxml2)
("libzip" ,libzip)
("mpfr" ,mpfr)
("opencsg" ,opencsg)
("qscintilla" ,qscintilla)
("qtbase" ,qtbase-5)
("qtmultimedia-5" ,qtmultimedia-5)))
(list boost
cgal
double-conversion
eigen
fontconfig
glew
gmp
harfbuzz
lib3mf
libxml2
libzip
mpfr
opencsg
qscintilla
qtbase-5
qtmultimedia-5))
(native-inputs
`(("bison" ,bison)
("flex" ,flex)
("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)
("which" ,which)
;; the following are only needed for tests
("imagemagick" ,imagemagick)
("ps" ,procps)
("python" ,python)
("xvfb" ,xorg-server-for-tests)))
(list bison
flex
gettext-minimal
pkg-config
which
;; the following are only needed for tests
imagemagick
procps
python
xorg-server-for-tests))
(arguments
`(#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(invoke "qmake"
(string-append "PREFIX=" (assoc-ref outputs "out")))
#t))
(string-append "PREFIX=" (assoc-ref outputs "out")))))
(replace 'check
(lambda _
(with-directory-excursion "tests"
@ -2873,12 +2878,19 @@ ontinuous-time and discret-time expressions.")
"cgalpngtest_nef3_broken"
"opencsgtest_nef3_broken"
"csgpngtest_nef3_broken"
"throwntogethertest_nef3_broken")
"throwntogethertest_nef3_broken"
;; FIXME: Tests probably broken by the patches allowing
;; to build with recent cgal versions.
"cgalpngtest_polyhedron-nonplanar-tests"
"csgpngtest_polyhedron-nonplanar-tests"
"monotonepngtest_polyhedron-nonplanar-tests"
"cgalstlcgalpngtest_polyhedron-nonplanar-tests"
"cgalbinstlcgalpngtest_polyhedron-nonplanar-tests")
"|")))
;; strip python test files since lib dir ends up in out/share
(for-each delete-file
(find-files "libraries/MCAD" ".*\\.py"))
#t)))))
(find-files "libraries/MCAD" ".*\\.py")))))))
(synopsis "Script-based 3D modeling application")
(description
"OpenSCAD is a 3D Computer-aided Design (CAD) application. Unlike an