diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-08-22 10:53:23 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-08-22 12:32:31 -0400 |
| commit | 9c08ba358e47c52953cc63ee1baae6e6208faebf (patch) | |
| tree | 38656e59067f000602f64b7ba91855203378f7a3 | |
| parent | 79b44a92e5bfd4da3a8fbdab4a435a7cc59409b2 (diff) | |
gnu: python-shiboken-2: Update to 5.15.10.
* gnu/packages/qt.scm (python-shiboken-2): Update to 5.15.10.
[source]: Use mirror://qt for the source URL. Delete patches.
* gnu/packages/patches/python-shiboken-2-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/python-shiboken-2-compat.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 10 |
3 files changed, 4 insertions, 22 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index eb6f622349..ee4567c857 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1728,7 +1728,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pypdf-annotate-tests-appropriately.patch \ %D%/packages/patches/python-sip-include-dirs.patch \ %D%/packages/patches/python-sgmllib3k-assertions.patch \ - %D%/packages/patches/python-shiboken-2-compat.patch \ %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-typeguard-python3.10.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ diff --git a/gnu/packages/patches/python-shiboken-2-compat.patch b/gnu/packages/patches/python-shiboken-2-compat.patch deleted file mode 100644 index 48aa74173b..0000000000 --- a/gnu/packages/patches/python-shiboken-2-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -Backport a fix from 5.15.9, mentioned in [1]. - -[1] https://bugreports.qt.io/browse/PYSIDE-2176 - ---- pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/pep384impl.cpp 2023-04-24 11:05:48.770934499 +0200 -+++ pyside-setup-opensource-src-5.15.8/sources/shiboken2/libshiboken/pep384impl.cpp 2023-04-24 11:04:51.566943936 +0200 -@@ -751,7 +751,7 @@ - #endif // IS_PY2 - Shiboken::AutoDecRef privateobj(PyObject_GetAttr( - reinterpret_cast<PyObject *>(Py_TYPE(self)), Shiboken::PyMagicName::name())); --#ifndef Py_LIMITED_API -+#ifdef IS_PY2 - return _Py_Mangle(privateobj, name); - #else - // PYSIDE-1436: _Py_Mangle is no longer exposed; implement it always. diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 811b42fef5..be882f964c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4179,17 +4179,15 @@ color-related widgets.") (define-public python-shiboken-2 (package (name "python-shiboken-2") - (version "5.15.8") + (version "5.15.10") (source (origin (method url-fetch) - (uri (string-append "https://download.qt.io/official_releases" - "/QtForPython/pyside2/PySide2-" version - "-src/pyside-setup-opensource-src-" + (uri (string-append "mirror://qt/QtForPython/pyside2/PySide2-" + version "-src/pyside-setup-opensource-src-" version ".tar.xz")) (sha256 (base32 - "0pbbdypwkn3vrgy8ww207fl8pqq4jv80bck9qz5v9dfyr0166hr3")) - (patches (search-patches "python-shiboken-2-compat.patch")))) + "0fnkx8ax2lkin3bpqbz4zbdrdin2ixb4d6s3c0xghh9sc79r3xia")))) (build-system cmake-build-system) (inputs (list clang-toolchain |