From d2a60ad8936d6c8486425294d1c5547c320ed708dfffcd48fd4eedd044f0b356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 3 May 2024 22:43:06 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main python-qt5-sip revision 098d85f879db8342df8f2a17cdb7f0ba --- .gitattributes | 23 +++++++++++ PyQt5_sip-12.13.0.tar.gz | 3 ++ python-qt5-sip.changes | 78 ++++++++++++++++++++++++++++++++++++ python-qt5-sip.spec | 63 +++++++++++++++++++++++++++++ support-python3.6.patch | 85 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 252 insertions(+) create mode 100644 .gitattributes create mode 100644 PyQt5_sip-12.13.0.tar.gz create mode 100644 python-qt5-sip.changes create mode 100644 python-qt5-sip.spec create mode 100644 support-python3.6.patch diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/PyQt5_sip-12.13.0.tar.gz b/PyQt5_sip-12.13.0.tar.gz new file mode 100644 index 0000000..f2f0d3b --- /dev/null +++ b/PyQt5_sip-12.13.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f321daf84b9c9dbca61b80e1ef37bdaffc0e93312edae2cd7da25b953971d91 +size 123225 diff --git a/python-qt5-sip.changes b/python-qt5-sip.changes new file mode 100644 index 0000000..09605fb --- /dev/null +++ b/python-qt5-sip.changes @@ -0,0 +1,78 @@ +------------------------------------------------------------------- +Sun Oct 15 13:56:21 UTC 2023 - Ben Greiner + +- Update to 12.13.0 + * Added sipPyTypeDictRef() to the v12 and v13 ABIs. + sipPyTypeDict() is now deprecated and must not be used with + Python v3.12 and later. + * Classes will automatically support being iterated over if they + implement '__getitem__()' or 'operator[]' and have a method + annotated with '__len__'. + * Bug fixes. + +------------------------------------------------------------------- +Wed Sep 27 09:04:14 UTC 2023 - Ben Greiner + +- Update to ABI version 12.12.2 + * Match python-sip6-devel 6.7.10+ + +------------------------------------------------------------------- +Sat Jun 10 09:46:33 UTC 2023 - ecsos + +- Add %{?sle15_python_module_pythons} + +------------------------------------------------------------------- +Mon Apr 24 19:47:19 UTC 2023 - Ben Greiner + +- Update to 12.12.1 + * Fixed the new handling of ctors with /Transfer/ annotated + arguments. + +------------------------------------------------------------------- +Sun Jan 29 19:42:52 UTC 2023 - Ben Greiner + +- Update to ABI version 12.11.1 + * error on subclassing enums + +------------------------------------------------------------------- +Thu Jan 12 07:37:05 UTC 2023 - Antonio Larrosa + +- Add patch to revert the drop of support for python 3.6: + * support-python3.6.patch + +------------------------------------------------------------------- +Mon Jun 20 21:29:16 UTC 2022 - Ben Greiner + +- Update to ABI version 12.11.0 + * The array type is now accessible from the sip module. + +------------------------------------------------------------------- +Wed Apr 13 08:33:33 UTC 2022 - Ben Greiner + +- Update to ABI version 12.10.1 +- Support for Python 3.6 has been dropped + +------------------------------------------------------------------- +Fri Jun 18 21:29:46 UTC 2021 - Ben Greiner + +- Provide the PyPI name + +------------------------------------------------------------------- +Thu May 13 21:30:08 UTC 2021 - Ben Greiner + +- Update to 12.9.0 + * no release notes, new ABI version. + +------------------------------------------------------------------- +Sun Aug 30 18:04:41 UTC 2020 - Benjamin Greiner + +- Update to version 12.8.1 + * minor bugfix release + +------------------------------------------------------------------- +Fri Aug 28 19:54:17 UTC 2020 - Benjamin Greiner + +- Initial specfile for version 12.8.0 + Quote from https://www.riverbankcomputing.com/static/Docs/PyQt5/installation.html#building-the-sip-module + It is not necessary to install the PyQt5.sip module before + building PyQt5 but it must be installed before PyQt5 can be used. diff --git a/python-qt5-sip.spec b/python-qt5-sip.spec new file mode 100644 index 0000000..7dd79ee --- /dev/null +++ b/python-qt5-sip.spec @@ -0,0 +1,63 @@ +# +# spec file for package python-qt5-sip +# +# Copyright (c) 2021 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%{?sle15_python_module_pythons} +Name: python-qt5-sip +Version: 12.13.0 +Release: 0 +License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP +Summary: The sip module support for PyQt5 +URL: https://www.riverbankcomputing.com/software/sip/ +Group: Development/Languages/Python +Source0: https://files.pythonhosted.org/packages/source/P/PyQt5-sip/PyQt5_sip-%{version}.tar.gz +Patch0: support-python3.6.patch +BuildRequires: %{python_module devel >= 3.6} +BuildRequires: %{python_module setuptools >= 30.3} +BuildRequires: fdupes +BuildRequires: python-rpm-macros +Provides: python-PyQt5-sip = %{version}-%{release} + +%python_subpackages + +%description +The sip extension module provides support for the PyQt5 package. + +SIP is a tool that makes it very easy to create Python bindings for +C and C++ libraries. It was originally developed to create PyQt, +the Python bindings for the Qt toolkit, but can be used to create +bindings for any C or C++ library. For example, it is also used to +create wxPython, the Python bindings for the wxWidget toolkit. + +%prep +%setup -q -n PyQt5_sip-%{version} +%patch0 -p1 + +%build +%python_build + +%install +%python_install +%python_expand %fdupes %{buildroot}%{$python_sitearch} + +%files %{python_files} +%license LICENSE LICENSE-GPL2 LICENSE-GPL3 +%dir %{python_sitearch}/PyQt5 +%{python_sitearch}/PyQt5/sip* +%{python_sitearch}/PyQt5_sip-%{version}*info + +%changelog diff --git a/support-python3.6.patch b/support-python3.6.patch new file mode 100644 index 0000000..4c81aa7 --- /dev/null +++ b/support-python3.6.patch @@ -0,0 +1,85 @@ +Index: PyQt5_sip-12.13.0/setup.py +=================================================================== +--- PyQt5_sip-12.13.0.orig/setup.py ++++ PyQt5_sip-12.13.0/setup.py +@@ -40,6 +40,6 @@ setup( + name='PyQt5_sip', + version='12.13.0', + license='SIP', +- python_requires='>=3.7', ++ python_requires='>=3.6', + ext_modules=[module] + ) +Index: PyQt5_sip-12.13.0/sip.h +=================================================================== +--- PyQt5_sip-12.13.0.orig/sip.h ++++ PyQt5_sip-12.13.0/sip.h +@@ -24,8 +24,8 @@ + #include + + /* Sanity check on the Python version. */ +-#if PY_VERSION_HEX < 0x03070000 +-#error "This version of PyQt5.sip requires Python v3.7 or later" ++#if PY_VERSION_HEX < 0x03060000 ++#error "This version of PyQt5.sip requires Python v3.6 or later" + #endif + + +Index: PyQt5_sip-12.13.0/siplib.c +=================================================================== +--- PyQt5_sip-12.13.0.orig/siplib.c ++++ PyQt5_sip-12.13.0/siplib.c +@@ -1046,6 +1046,10 @@ const sipAPIDef *sip_init_library(PyObje + PyObject *obj; + PyMethodDef *md; + ++#if PY_VERSION_HEX < 0x03070000 && defined(WITH_THREAD) ++ PyEval_InitThreads(); ++#endif ++ + /* Add the SIP version number. */ + obj = PyLong_FromLong(SIP_VERSION); + +@@ -13331,12 +13335,16 @@ int sip_api_convert_from_slice_object(Py + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, + Py_ssize_t *slicelength) + { ++#if PY_VERSION_HEX >= 0x03070000 + if (PySlice_Unpack(slice, start, stop, step) < 0) + return -1; + + *slicelength = PySlice_AdjustIndices(length, start, stop, *step); + + return 0; ++#else ++ return PySlice_GetIndicesEx(slice, length, start, stop, step, slicelength); ++#endif + } + + +Index: PyQt5_sip-12.13.0/PKG-INFO +=================================================================== +--- PyQt5_sip-12.13.0.orig/PKG-INFO ++++ PyQt5_sip-12.13.0/PKG-INFO +@@ -9,7 +9,7 @@ License: SIP + Platform: X11 + Platform: macOS + Platform: Windows +-Requires-Python: >=3.7 ++Requires-Python: >=3.6 + License-File: LICENSE + License-File: LICENSE-GPL2 + License-File: LICENSE-GPL3 +Index: PyQt5_sip-12.13.0/PyQt5_sip.egg-info/PKG-INFO +=================================================================== +--- PyQt5_sip-12.13.0.orig/PyQt5_sip.egg-info/PKG-INFO ++++ PyQt5_sip-12.13.0/PyQt5_sip.egg-info/PKG-INFO +@@ -9,7 +9,7 @@ License: SIP + Platform: X11 + Platform: macOS + Platform: Windows +-Requires-Python: >=3.7 ++Requires-Python: >=3.6 + License-File: LICENSE + License-File: LICENSE-GPL2 + License-File: LICENSE-GPL3