diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-06-04 11:25:48 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-06-04 11:25:48 +0200 |
| commit | 32da38d5721663a470b335f86b67cffdc4f34f0a (patch) | |
| tree | b633522943117bf3552195ef77ae74470b706ce0 /gnu/packages/qt.scm | |
| parent | 0c0431f9ce32a64ca663a2c5fc6656cbb86dc245 (diff) | |
| parent | c0e7a52996edf75a403ef6c454072271fd1c277a (diff) | |
| download | guix-32da38d5721663a470b335f86b67cffdc4f34f0a.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 020cccd04d..7d323cd2d5 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1521,7 +1521,7 @@ message."))) (define-public python-sip (package (name "python-sip") - (version "4.19.3") + (version "4.19.8") (source (origin (method url-fetch) @@ -1530,7 +1530,7 @@ message."))) "sip-" version "/sip-" version ".tar.gz")) (sha256 (base32 - "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl")))) + "1g4pq9vj753r2s061jc4y9ydzgb48ibhc9bdvmb8mlyllwp7mbvy")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-wrapper))) @@ -1584,7 +1584,7 @@ module provides support functions to the automatically generated code.") (define-public python-pyqt (package (name "python-pyqt") - (version "5.9") + (version "5.10.1") (source (origin (method url-fetch) @@ -1594,7 +1594,7 @@ module provides support functions to the automatically generated code.") version ".tar.gz")) (sha256 (base32 - "15hh4z5vd45dcswjla58q6rrfr6ic7jfz2n7c8lwfb10rycpj3mb")) + "1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr")) (patches (search-patches "pyqt-configure.patch")))) (build-system gnu-build-system) (native-inputs @@ -1613,7 +1613,7 @@ module provides support functions to the automatically generated code.") ("qtsvg" ,qtsvg) ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) - ("qtwebkit" ,qtwebkit) + ;("qtwebkit" ,qtwebkit) ("qtwebsockets" ,qtwebsockets) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns))) @@ -1622,6 +1622,12 @@ module provides support functions to the automatically generated code.") ,@%gnu-build-system-modules) #: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 (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) |