me/guix
Archived
1
0
Fork 0
Code Activity

gnu: python-pyside: Update to 5.12.6.

Browse source 
* gnu/packages/qt.scm (python-shiboken-2): Update to 5.12.6.
[source]: Download tarball release instead of git repository.
[arguments]: Add phase to make files writable and update timestamps.
(python-pyside-2): Inherit version and source from PYTHON-SHIBOKEN-2.
[native-inputs]: Remove LIBCXX-6.  Rename "python-wrapper" input to "python".
Change from CMAKE to CMAKE-MINIMAL.
[arguments]: Remove libcxx substitution.  Add "-DPYTHON_EXECUTABLE" in
 #:configure-flags.
(python-pyside-2-tools)[native-inputs]: Add PYTHON-WRAPPER.
[arguments]: Set "-DPYTHON_EXECUTABLE" in #:configure-flags.  Add phase
'go-to-source-dir'.
This commit is contained in:
Marius Bakke 2020-03-15 13:27:53 +01:00
parent 0b6de85a4a
commit 76e0b5ba26
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 145 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

301
gnu/packages/qt.scm
View file

@ -2515,168 +2515,157 @@ color-related widgets.")
(license license:lgpl3+)))) (license license:lgpl3+))))
(define-public python-shiboken-2 (define-public python-shiboken-2
(let ((revision "1") (package
;; Pinned to branches with support for qt 5.11.3 (name "python-shiboken-2")
(commit "4018787a3cc01d632fdca7891ac8aa9487110c26")) (version "5.12.6")
(package (source (origin
(name "python-shiboken-2") (method url-fetch)
(version (git-version "v5.11.3" revision commit)) (uri (string-append "https://download.qt.io/official_releases"
(source "/QtForPython/pyside2/PySide2-" version
(origin "-src/pyside-setup-everywhere-src-"
(method git-fetch) version ".tar.xz"))
(uri (git-reference (sha256
;; The latest versions of Shiboken live in the pyside repo. (base32
;; There is another standalone repo only for Shiboken "1n45l6xxyxs6cfp2l4rp8qs1c2fyfwyrdxa4qcpwfsqsi51rydsk"))))
;; but it is outdated (build-system cmake-build-system)
(url "https://code.qt.io/pyside/pyside-setup") (inputs
(commit commit))) `(("clang-toolchain" ,clang-toolchain-6)
(file-name (git-file-name name version)) ("libxml2" ,libxml2)
(sha256 ("libxslt" ,libxslt)
(base32 ("python-wrapper" ,python-wrapper)
"0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5")))) ("qtbase" ,qtbase)
(build-system cmake-build-system) ("qtxmlpatterns" ,qtxmlpatterns)))
(inputs (arguments
`(("clang-toolchain" ,clang-toolchain-6) `(#:tests? #f
("libxml2" ,libxml2) ;; FIXME: Building tests fails
("libxslt" ,libxslt) #:configure-flags '("-DBUILD_TESTS=off")
("python-wrapper" ,python-wrapper) #:phases
("qtbase" ,qtbase) (modify-phases %standard-phases
("qtxmlpatterns" ,qtxmlpatterns))) (add-after 'unpack 'use-shiboken-dir-only
(arguments (lambda _ (chdir "sources/shiboken2") #t))
`(#:tests? #f (add-before 'configure 'make-files-writable-and-update-timestamps
;; FIXME: Building tests fails (lambda _
#:configure-flags '("-DBUILD_TESTS=off") ;; The build scripts need to modify some files in
#:phases ;; the read-only source directory, and also attempts
(modify-phases %standard-phases ;; to create Zip files which fails because the Zip
(add-after 'unpack 'use-shiboken-dir-only ;; format does not support timestamps before 1980.
(lambda _ (chdir "sources/shiboken2") #t)) (let ((circa-1980 (* 10 366 24 60 60)))
(add-before 'configure 'set-build-env (for-each (lambda (file)
(lambda* (#:key inputs #:allow-other-keys) (make-file-writable file)
(let ((llvm (assoc-ref inputs "clang-toolchain"))) (utime file circa-1980 circa-1980))
(setenv "CLANG_INSTALL_DIR" llvm) (find-files ".")))
#t)))))) #t))
(home-page "https://wiki.qt.io/Qt_for_Python") (add-before 'configure 'set-build-env
(synopsis (lambda* (#:key inputs #:allow-other-keys)
"Shiboken generates bindings for C++ libraries using CPython source code") (let ((llvm (assoc-ref inputs "clang-toolchain")))
(description (setenv "CLANG_INSTALL_DIR" llvm)
"Shiboken generates bindings for C++ libraries using CPython source code") #t))))))
(license (home-page "https://wiki.qt.io/Qt_for_Python")
(list (synopsis
;; The main code is GPL3 or LGPL3. "Shiboken generates bindings for C++ libraries using CPython source code")
;; Examples are BSD-3. (description
license:gpl3 "Shiboken generates bindings for C++ libraries using CPython source code")
license:lgpl3 (license
license:bsd-3))))) (list
;; The main code is GPL3 or LGPL3.
;; Examples are BSD-3.
license:gpl3
license:lgpl3
license:bsd-3))))
(define-public python-pyside-2 (define-public python-pyside-2
(let ((revision "1") (package
;; Pinned to branches with support for qt 5.11.3 (name "python-pyside-2")
(commit "4018787a3cc01d632fdca7891ac8aa9487110c26")) (version (package-version python-shiboken-2))
(package (source (package-source python-shiboken-2))
(name "python-pyside-2") (build-system cmake-build-system)
(version (git-version "v5.11.3" revision commit)) (inputs
(source `(("libxml2" ,libxml2)
(origin ("libxslt" ,libxslt)
(method git-fetch) ("clang-toolchain" ,clang-toolchain-6)
(uri (git-reference ("qtbase" ,qtbase)
(url "https://code.qt.io/pyside/pyside-setup") ("qtdatavis3d" ,qtdatavis3d)
(commit commit))) ("qtlocation" ,qtlocation)
(file-name (git-file-name name version)) ("qtmultimedia" ,qtmultimedia)
(sha256 ("qtquickcontrols" ,qtquickcontrols)
(base32 ("qtscript" ,qtscript)
"0g8jacm2iqd7lw2m7f1dp1nnrsk38bl3m8pihm8zz9gxs8d31sf5")))) ("qtscxml" ,qtscxml)
(build-system cmake-build-system) ("qtsensors" ,qtsensors)
(inputs ("qtspeech" ,qtspeech)
`(("libcxx" ,libcxx-6) ("qtsvg" ,qtsvg)
("libxml2" ,libxml2) ("qtwebchannel" ,qtwebchannel)
("libxslt" ,libxslt) ("qtwebsockets" ,qtwebsockets)
("clang-toolchain" ,clang-toolchain-6) ("qtx11extras" ,qtx11extras)
("qtbase" ,qtbase) ("qtxmlpatterns" ,qtxmlpatterns)))
("qtdatavis3d" ,qtdatavis3d) (native-inputs
("qtlocation" ,qtlocation) `(("cmake" ,cmake-minimal)
("qtmultimedia" ,qtmultimedia) ("python-shiboken-2" ,python-shiboken-2)
("qtquickcontrols" ,qtquickcontrols) ("python" ,python-wrapper)
("qtscript" ,qtscript) ("qttools" ,qttools)
("qtscxml" ,qtscxml) ("which" ,which)))
("qtsensors" ,qtsensors) (arguments
("qtspeech" ,qtspeech) `(#:tests? #f
("qtsvg" ,qtsvg) ;; FIXME: Building tests fail.
("qtwebchannel" ,qtwebchannel) #:configure-flags
("qtwebsockets" ,qtwebsockets) (list "-DBUILD_TESTS=FALSE"
("qtx11extras" ,qtx11extras) (string-append "-DPYTHON_EXECUTABLE="
("qtxmlpatterns" ,qtxmlpatterns))) (assoc-ref %build-inputs "python")
(native-inputs "/bin/python"))
`(("cmake" ,cmake) #:phases
("python-shiboken-2" ,python-shiboken-2) (modify-phases %standard-phases
("python-wrapper" ,python-wrapper) (add-after 'unpack 'go-to-source-dir
("qttools" ,qttools) (lambda _ (chdir "sources/pyside2") #t))
("which" ,which))) (add-before 'configure 'set-clang-dir
(arguments (lambda* (#:key inputs #:allow-other-keys)
`(#:tests? #f (let ((clang (assoc-ref inputs "clang-toolchain")))
;; FIXME: Building tests fail. (setenv "CLANG_INSTALL_DIR" clang)
#:configure-flags '("-DBUILD_TESTS=FALSE") #t))))))
#:phases (home-page "https://wiki.qt.io/Qt_for_Python")
(modify-phases %standard-phases (synopsis
(add-after 'unpack 'go-to-source-dir "The Qt for Python product enables the use of Qt5 APIs in Python applications")
(lambda _ (chdir "sources/pyside2") #t)) (description
(add-before 'configure 'set-clang-dir "The Qt for Python product enables the use of Qt5 APIs in Python
(lambda* (#:key inputs #:allow-other-keys)
(let ((clang (assoc-ref inputs "clang-toolchain"))
(libcxx (assoc-ref inputs "libcxx")))
(setenv "CLANG_INSTALL_DIR" clang)
(substitute* "cmake/Macros/PySideModules.cmake"
(("--include-paths=")
(string-append "--include-paths=" libcxx "/include/c++/v1:")))
#t))))))
(home-page "https://wiki.qt.io/Qt_for_Python")
(synopsis
"The Qt for Python product enables the use of Qt5 APIs in Python applications")
(description
"The Qt for Python product enables the use of Qt5 APIs in Python
applications. It lets Python developers utilize the full potential of Qt, applications. It lets Python developers utilize the full potential of Qt,
using the PySide2 module. The PySide2 module provides access to the using the PySide2 module. The PySide2 module provides access to the
individual Qt modules such as QtCore, QtGui,and so on. Qt for Python also individual Qt modules such as QtCore, QtGui,and so on. Qt for Python also
comes with the Shiboken2 CPython binding code generator, which can be used to comes with the Shiboken2 CPython binding code generator, which can be used to
generate Python bindings for your C or C++ code.") generate Python bindings for your C or C++ code.")
(license (list (license (list
license:lgpl3 license:lgpl3
;;They state that: ;;They state that:
;; this file may be used under the terms of the GNU General ;; this file may be used under the terms of the GNU General
;; Public License version 2.0 or (at your option) the GNU ;; Public License version 2.0 or (at your option) the GNU
;; General Public license version 3 or any later version ;; General Public license version 3 or any later version
;; approved by the KDE Free Qt Foundation. ;; approved by the KDE Free Qt Foundation.
;; Thus, it is currently v2 or v3, but no "+". ;; Thus, it is currently v2 or v3, but no "+".
license:gpl3 license:gpl3
license:gpl2))))) license:gpl2))))
(define-public python-pyside-2-tools (define-public python-pyside-2-tools
(let ((revision "1") (package
;; Pinned to branches with support for qt 5.11.3 (name "python-pyside-2-tools")
(commit "f1b775537e7fbd718516749583b2abf1cb6adbce")) (version (package-version python-shiboken-2))
(package (source (package-source python-shiboken-2))
(name "python-pyside-2-tools") (build-system cmake-build-system)
(version (git-version "v5.11.2" revision commit)) (inputs
(source `(("python-pyside-2" ,python-pyside-2)
(origin ("python-shiboken-2" ,python-shiboken-2)
(method git-fetch) ("qtbase" ,qtbase)))
(uri (git-reference (native-inputs
(url "https://code.qt.io/pyside/pyside-tools") `(("python" ,python-wrapper)))
(commit commit))) (arguments
(file-name (git-file-name name version)) `(#:tests? #f
(sha256 #:configure-flags
(base32 (list "-DBUILD_TESTS=off"
"1w2g5afvww9r89wmdm9jx8sz67x4bzy9difkh72n4c73ya1n91ry")))) (string-append "-DPYTHON_EXECUTABLE="
(build-system cmake-build-system) (assoc-ref %build-inputs "python")
(inputs "/bin/python"))
`(("python-pyside-2" ,python-pyside-2) #:phases (modify-phases %standard-phases
("python-shiboken-2" ,python-shiboken-2) (add-after 'unpack 'go-to-source-dir
("qtbase" ,qtbase))) (lambda _ (chdir "sources/pyside2-tools") #t)))))
(arguments (home-page "https://wiki.qt.io/Qt_for_Python")
`(#:tests? #f (synopsis
#:configure-flags '("-DBUILD_TESTS=off"))) "Contains command line tools for PySide2")
(home-page "https://wiki.qt.io/Qt_for_Python") (description
(synopsis "Contains lupdate, rcc and uic tools for PySide2")
"Contains command line tools for PySide2") (license license:gpl2)))
(description
"Contains lupdate, rcc and uic tools for PySide2")
(license license:gpl2))))