[bug#70957] [PATCH 0/2] gnu: python-pivy: Update to 0.6.8.

[bug#70957] [PATCH 0/2] gnu: python-pivy: Update to 0.6.8.

[Artyom V. Poptsov]

This patchset fixes "python-pivy" build.  Also it updates "python-pivy" to
0.6.8 as it fixes Draft Workbench in FreeCAD:
  https://bugs.launchpad.net/ubuntu/+source/pivy/+bug/2000840

Artyom V. Poptsov (2):
  gnu: python-pivy: Fix build.
  gnu: python-pivy: Update to 0.6.8.

 gnu/packages/python-xyz.scm | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)


base-commit: 898b5f30f3d485d48275c920da172863da9524c6
-- 
2.41.0

[bug#70957] [PATCH 1/2] gnu: python-pivy: Fix build.

[Artyom V. Poptsov]

"python-pivy" build fails when "soqt" is in the inputs (see
<https://bugs.gentoo.org/920482>.)

* gnu/packages/python-xyz.scm (python-pivy): Fix build.
  [inputs]: Remove "soqt".
  [arguments]: Use gexps.

Change-Id: If332ccd42b3a373e7b4118f3bcbc3646e8b59d41
---
 gnu/packages/python-xyz.scm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b295d780ab..c48d52952b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -121,7 +121,7 @@
 ;;; Copyright © 2022 Peter Polidoro <peter@polidoro.io>
 ;;; Copyright © 2022, 2023 Wamm K. D. <jaft.r@outlook.com>
 ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com>
-;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2022-2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2022 Paul A. Patience <paul@apatience.com>
 ;;; Copyright © 2022 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
 ;;; Copyright © 2022 Philip McGrath <philip@philipmcgrath.com>
@@ -32935,20 +32935,20 @@ (define-public python-pivy
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
-          (base32 "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"))))
+         (base32 "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"))))
     (build-system python-build-system)
     (arguments
-      `(;; The test suite fails due to an import cycle between 'pivy' and '_coin'
-        #:tests? #f
-        #:phases
-        (modify-phases %standard-phases
+     (list
+      ;; The test suite fails due to an import cycle between 'pivy' and '_coin'
+      #:tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
           (add-after 'unpack 'patch-cmake-include-dirs
-           (lambda _
-             ;; Patch buildsystem to respect Coin3D include directory
-             (substitute* "CMakeLists.txt"
-                          (("\\$\\{SoQt_INCLUDE_DIRS}")
-                           "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}"))
-             #t)))))
+            (lambda _
+              ;; Patch buildsystem to respect Coin3D include directory
+              (substitute* "CMakeLists.txt"
+                (("\\$\\{SoQt_INCLUDE_DIRS}")
+                 "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")))))))
     (native-inputs
       (list cmake swig))
     (inputs
@@ -32956,7 +32956,6 @@ (define-public python-pivy
             qtbase-5
             libxi
             libice
-            soqt
             glew
             coin3d))
     (home-page "https://github.com/coin3d/pivy")
-- 
2.41.0

[bug#70957] [PATCH 2/2] gnu: python-pivy: Update to 0.6.8.

[Artyom V. Poptsov]

* gnu/packages/python-xyz.scm (python-pivy): Update to 0.6.8.

Change-Id: I7375a8261bd24ae1c2f54c6889e1a39d6db93468
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c48d52952b..72f232e3ac 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -32926,7 +32926,7 @@ (define-public python-retry
 (define-public python-pivy
   (package
     (name "python-pivy")
-    (version "0.6.5")
+    (version "0.6.8")
     (source
       (origin
         (method git-fetch)
@@ -32935,7 +32935,7 @@ (define-public python-pivy
                (commit version)))
         (file-name (git-file-name name version))
         (sha256
-         (base32 "0vids7sxk8w5vr73xdnf8xdci71a7syl6cd35aiisppbqyyfmykx"))))
+         (base32 "00l4r06dwmgn8h29nrl3g3yv33cfyizyylk28x1j95qyj36sggfb"))))
     (build-system python-build-system)
     (arguments
      (list
-- 
2.41.0

bug#70957: [PATCH 0/2] gnu: python-pivy: Update to 0.6.8.

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 83 bytes --]

Patches applied as d8d0fdd25ce3479f7ba45e1800241196b6828284 and
following.
Thanks.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]