diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/pyqt-configure.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 5 |
3 files changed, 2 insertions, 19 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 8c859de0e0..e49453ea38 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2144,7 +2144,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 b8e538ae04..a870db30e4 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -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 |