~ruther/guix-local

eb7fb3c59d8de06ef942dce55ceb9565917e7ddb — 宋文武 1 year, 5 months ago 3f790f1
gnu: python-pyqt: Update to 5.15.11.

* gnu/packages/patches/pyqt-configure.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/qt.scm (python-pyqt): Update to 5.15.11.
[source]: Remove patch.

Change-Id: I62e712aab1c7aa40f7847eb1b5669b010cab25ce
3 files changed, 2 insertions(+), 19 deletions(-)

M gnu/local.mk
D gnu/packages/patches/pyqt-configure.patch
M gnu/packages/qt.scm
M gnu/local.mk => gnu/local.mk +0 -1
@@ 2146,7 2146,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/pulseview-glib-2.68.patch		\
  %D%/packages/patches/pybugz-encode-error.patch		\
  %D%/packages/patches/pybugz-stty.patch			\
  %D%/packages/patches/pyqt-configure.patch			\
  %D%/packages/patches/python-2-deterministic-build-info.patch	\
  %D%/packages/patches/python-2.7-adjust-tests.patch		\
  %D%/packages/patches/python-2.7-expat-compat.patch		\

D gnu/packages/patches/pyqt-configure.patch => gnu/packages/patches/pyqt-configure.patch +0 -15
@@ 1,15 0,0 @@
Have configure.py modify internal variables depending on the --qml-plugindir
configure option.
diff -u PyQt-gpl-5.4.alt/configure.py PyQt-gpl-5.4/configure.py
--- PyQt-gpl-5.4.alt/configure.py	2015-01-25 17:27:50.000000000 +0100
+++ PyQt-gpl-5.4/configure.py	2015-01-25 17:56:41.000000000 +0100
@@ -904,6 +904,9 @@
         if opts.pyuicinterpreter is not None:
             self.pyuic_interpreter = opts.pyuicinterpreter
 
+        if opts.qmlplugindir is not None:
+            self.qml_plugin_dir = opts.qmlplugindir
+
         if opts.qsciapidir is not None:
             self.qsci_api_dir = opts.qsciapidir
 

M gnu/packages/qt.scm => gnu/packages/qt.scm +2 -3
@@ 4283,7 4283,7 @@ module provides support functions to the automatically generated code.")
(define-public python-pyqt
  (package
    (name "python-pyqt")
    (version "5.15.10")
    (version "5.15.11")
    (source
      (origin
        (method url-fetch)


@@ 4296,8 4296,7 @@ module provides support functions to the automatically generated code.")
        (file-name (string-append "PyQt5-" version ".tar.gz"))
        (sha256
         (base32
          "12l96irlk11diql2ccig8ssd502mbcz13y2k2zwly2min427hsyl"))
        (patches (search-patches "pyqt-configure.patch"))))
          "0lkwap0va0kq9j9x540cc5fink2w8ppxiiji395pp8mlxd1mg97x"))))
    (build-system pyproject-build-system)
    (native-inputs
     (list qtbase-5 ; for qmake