me/guix
Archived
1
0
Fork 0
Code Activity

gnu: python-pyqt: Update to 5.10.1.

Browse source 
* gnu/packages/qt.scm (python-pyqt): Update to 5.10.1.
[inputs]: Remove qtwebkit.
[arguments]: Add custom phase to fix compilation with Qt 5.11.
This commit is contained in:
Efraim Flashner 2018-06-04 10:48:55 +03:00
parent 9cdd868450
commit c0e7a52996
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/qt.scm
View file

@ -1582,7 +1582,7 @@ module provides support functions to the automatically generated code.")
(define-public python-pyqt (define-public python-pyqt
(package (package
(name "python-pyqt") (name "python-pyqt")
(version "5.9") (version "5.10.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1592,7 +1592,7 @@ module provides support functions to the automatically generated code.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb")) "1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr"))
(patches (search-patches "pyqt-configure.patch")))) (patches (search-patches "pyqt-configure.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
@ -1611,7 +1611,7 @@ module provides support functions to the automatically generated code.")
("qtsvg" ,qtsvg) ("qtsvg" ,qtsvg)
("qttools" ,qttools) ("qttools" ,qttools)
("qtwebchannel" ,qtwebchannel) ("qtwebchannel" ,qtwebchannel)
("qtwebkit" ,qtwebkit) ;("qtwebkit" ,qtwebkit)
("qtwebsockets" ,qtwebsockets) ("qtwebsockets" ,qtwebsockets)
("qtx11extras" ,qtx11extras) ("qtx11extras" ,qtx11extras)
("qtxmlpatterns" ,qtxmlpatterns))) ("qtxmlpatterns" ,qtxmlpatterns)))
@ -1620,6 +1620,12 @@ module provides support functions to the automatically generated code.")
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-build-with-qt-5.11
;; See: https://bugs.gentoo.org/654742
(lambda _
(substitute* "sip/QtTest/qtestmouse.sip"
(("void waitForEvents\\(\\) /ReleaseGIL/;") ""))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))