[PATCH] gnu: freecad: Fix build with python-3.8

DoneSubmitted by Boris A. Dekshteyn.
Details
2 participants
  • Boris A. Dekshteyn
  • Marius Bakke
Owner
unassigned
Severity
normal
B
B
Boris A. Dekshteyn wrote on 10 May 2020 12:23
(address . guix-patches@gnu.org)(name . Boris A. Dekshteyn)(address . boris.dekshteyn@gmail.com)
20200510102318.23016-1-boris.dekshteyn@gmail.com
* gnu/packages/engineering.scm (freecad): Fix build with python-3.8
---
gnu/packages/engineering.scm | 7 +++++++
1 file changed, 7 insertions(+)

Toggle diff (20 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 15101e3aee..5e204201bd 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2312,6 +2312,13 @@ full programmatic control over your models.")
        (uri (git-reference
              (url "https://github.com/FreeCAD/FreeCAD.git")
              (commit version)))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; https://tracker.freecadweb.org/view.php?id=4143
+           (substitute* "src/Base/swigpyrun.inl"
+             (("PyObject \\*modules = interp->modules;")
+               "PyObject *modules = PyEval_GetBuiltins();")) #t))
        (file-name (git-file-name name version))
        (sha256
         (base32
-- 
2.26.2
M
M
Marius Bakke wrote on 10 May 2020 23:07
(name . Boris A. Dekshteyn)(address . boris.dekshteyn@gmail.com)
87imh31otk.fsf@devup.no
"Boris A. Dekshteyn" <boris.dekshteyn@gmail.com> writes:

Toggle quote (2 lines)
> * gnu/packages/engineering.scm (freecad): Fix build with python-3.8

Thank you!

[...]

Toggle quote (8 lines)
> + (modules '((guix build utils)))
> + (snippet
> + '(begin
> + ;; https://tracker.freecadweb.org/view.php?id=4143
> + (substitute* "src/Base/swigpyrun.inl"
> + (("PyObject \\*modules = interp->modules;")
> + "PyObject *modules = PyEval_GetBuiltins();")) #t))

I gave a little more context in the comment, moved the #t on a line of
its own, and fixed the indentation. I also edited the commit message
slightly.

Pushed as 72099cb0f20e87807f29b5a11a584ab7c66297ef.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl64bRcACgkQoqBt8qM6
VPp+ngf+Mph4r/PPPTNJojsMSmf06I/odVIvFM/EZnB7XSsQeA9n+bkiwWyHIl+y
Ri9uDiGRR+xxY69iucX5m2ppydbFusLa7Gto0CQotgbfwOEjhQABstKPR08BPQb2
6EtmvUdufdJY5py0w+zJi8mmOjJUf9v2X3izWb07teXqdrt2tdb2BbpCD/b+ijRk
+PzyTd9BNIJZ+wJ5H78XDJTPHbA3OtIDGLCEpKBgu0JBH1XcLaxmsunyHWRKvEN/
J6wPy1eP3H7tFIEIezsvkk9Hb28tQ1FJ0T7GNZiGZs9hxyjBepUux/fiQRI2yX41
R1c+rs7ja+Q1x0MkhZGU9qOU/4H8sA==
=zMca
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send email to 41170@debbugs.gnu.org