guix_mirror_bot pushed a commit to branch qt-team-rebased
in repository guix.
commit f3a310b3ecbc6cb0bc07adff29adc460fe20e591
Author: 宋文武 <iyzs...@member.fsf.org>
AuthorDate: Sat Feb 8 16:45:17 2025 +0800
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
---
gnu/local.mk | 1 -
gnu/packages/patches/pyqt-configure.patch | 15 ---------------
gnu/packages/qt.scm | 5 ++---
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index ffedadf25d..d7e47e3fe8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2147,7 +2147,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 \
diff --git a/gnu/packages/patches/pyqt-configure.patch
b/gnu/packages/patches/pyqt-configure.patch
deleted file mode 100644
index b922f108d8..0000000000
--- a/gnu/packages/patches/pyqt-configure.patch
+++ /dev/null
@@ -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
-
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index b37bca0176..f492e87abe 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4273,7 +4273,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)
@@ -4286,8 +4286,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
