guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/02: gnu: python-pyqt: Update to 5.10.1.


From: Efraim Flashner
Subject: 02/02: gnu: python-pyqt: Update to 5.10.1.
Date: Mon, 4 Jun 2018 04:06:34 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit c0e7a52996edf75a403ef6c454072271fd1c277a
Author: Efraim Flashner <address@hidden>
Date:   Mon Jun 4 10:48:55 2018 +0300

    gnu: python-pyqt: Update to 5.10.1.
    
    * 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.
---
 gnu/packages/qt.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 67e8f89..297ddb1 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1582,7 +1582,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)
@@ -1592,7 +1592,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
@@ -1611,7 +1611,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)))
@@ -1620,6 +1620,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"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]