Subject: [PATCH] Fix FreeCAD dependencies.
From: John Soo <[email-masked]>
To: [email-masked]
Date: Wed, 18 Dec 2019 14:24:01 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi all,

Since the addition of clang-toolchain, python-shiboken-2 and
python-pyside-2 have had failing builds.  This patchset updates them to use
clang-toolchain.

- John
From 0f3f5e81911c766feb9b44289072747d20973dec Mon Sep 17 00:00:00 2001
From: John Soo <[email-masked]>
Date: Wed, 18 Dec 2019 06:21:56 -0800
Subject: [PATCH 2/2] gnu: Fix python-pyside-2.

* gnu/packages/qt.scm (python-pyside-2): Update inputs.
---
 gnu/packages/qt.scm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 747d5437e2..795b5e9d2b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2161,8 +2161,7 @@ color-related widgets.")
        `(("libcxx" ,libcxx-6)
          ("libxml2" ,libxml2)
          ("libxslt" ,libxslt)
-         ("llvm-6" ,llvm-6)
-         ("clang-6" ,clang-6)
+         ("clang-toolchain" ,clang-toolchain-6)
          ("qtbase" ,qtbase)
          ("qtdatavis3d" ,qtdatavis3d)
          ("qtlocation" ,qtlocation)
@@ -2188,13 +2187,12 @@ color-related widgets.")
          ;; FIXME: Building tests fail.
          #:configure-flags '("-DBUILD_TESTS=FALSE")
          #:phases
-         (modify-phases
-             %standard-phases
+         (modify-phases %standard-phases
            (add-after 'unpack 'go-to-source-dir
              (lambda _ (chdir "sources/pyside2") #t))
            (add-before 'configure 'set-clang-dir
              (lambda* (#:key inputs #:allow-other-keys)
-               (let ((clang (assoc-ref inputs "clang-6"))
+               (let ((clang (assoc-ref inputs "clang-toolchain"))
                      (libcxx (assoc-ref inputs "libcxx")))
                  (setenv "CLANG_INSTALL_DIR" clang)
                  (substitute* "cmake/Macros/PySideModules.cmake"
-- 
2.24.0

From 12a0469ca8c3f30426c709872562922cc3e0237b Mon Sep 17 00:00:00 2001
From: John Soo <[email-masked]>
Date: Wed, 18 Dec 2019 06:21:00 -0800
Subject: [PATCH 1/2] gnu: Fix python-shiboken-2.

* gnu/packages/qt.scm (python-shiboken-2): Update inputs.
---
 gnu/packages/qt.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c0d652a407..747d5437e2 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2107,8 +2107,7 @@ color-related widgets.")
            "0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5"))))
       (build-system cmake-build-system)
       (inputs
-       `(("llvm-6" ,llvm-6)
-         ("clang-6" ,clang-6)
+       `(("clang-toolchain" ,clang-toolchain-6)
          ("libxml2" ,libxml2)
          ("libxslt" ,libxslt)
          ("python-wrapper" ,python-wrapper)
@@ -2124,7 +2123,7 @@ color-related widgets.")
              (lambda _ (chdir "sources/shiboken2") #t))
            (add-before 'configure 'set-build-env
              (lambda* (#:key inputs #:allow-other-keys)
-               (let ((llvm (assoc-ref inputs "llvm-6")))
+               (let ((llvm (assoc-ref inputs "clang-toolchain")))
                  (setenv "CLANG_INSTALL_DIR" llvm)
                  #t))))))
       (home-page "https://wiki.qt.io/Qt_for_Python")
-- 
2.24.0