mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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
This commit is contained in:
parent
3f790f1f72
commit
eb7fb3c59d
3 changed files with 2 additions and 19 deletions
|
@ -2146,7 +2146,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/pulseview-glib-2.68.patch \
|
%D%/packages/patches/pulseview-glib-2.68.patch \
|
||||||
%D%/packages/patches/pybugz-encode-error.patch \
|
%D%/packages/patches/pybugz-encode-error.patch \
|
||||||
%D%/packages/patches/pybugz-stty.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-deterministic-build-info.patch \
|
||||||
%D%/packages/patches/python-2.7-adjust-tests.patch \
|
%D%/packages/patches/python-2.7-adjust-tests.patch \
|
||||||
%D%/packages/patches/python-2.7-expat-compat.patch \
|
%D%/packages/patches/python-2.7-expat-compat.patch \
|
||||||
|
|
|
@ -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
|
|
||||||
|
|
|
@ -4283,7 +4283,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.15.10")
|
(version "5.15.11")
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -4296,8 +4296,7 @@ module provides support functions to the automatically generated code.")
|
||||||
(file-name (string-append "PyQt5-" version ".tar.gz"))
|
(file-name (string-append "PyQt5-" version ".tar.gz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"12l96irlk11diql2ccig8ssd502mbcz13y2k2zwly2min427hsyl"))
|
"0lkwap0va0kq9j9x540cc5fink2w8ppxiiji395pp8mlxd1mg97x"))))
|
||||||
(patches (search-patches "pyqt-configure.patch"))))
|
|
||||||
(build-system pyproject-build-system)
|
(build-system pyproject-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list qtbase-5 ; for qmake
|
(list qtbase-5 ; for qmake
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue