SLFO-pool/python-qt5-sip
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main python-qt5-sip revision 2cdb1177d5011271d2823c3e512e2bfe

Browse Source
This commit is contained in:
Adrian Schröter
2025-02-25 17:24:40 +01:00
parent 8f3523eb39
commit 397f8c1cda
7 changed files with 113 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
PyQt5_sip-12.13.0.tar.gz (Stored with Git LFS)
View File

Binary file not shown.

18
fix-build-gcc14.patch
View File

@@ -1,18 +0,0 @@
From: Phil Thompson <phil@riverbankcomputing.com>
Date: Mon, 4 Dec 2023 11:54:31 +0000
Subject: [PATCH] Removed a warning message (soon to be an error message) in
the v12 module.
Index: PyQt5_sip-12.13.0/siplib.c
===================================================================
--- PyQt5_sip-12.13.0.orig/siplib.c
+++ PyQt5_sip-12.13.0/siplib.c
@@ -3902,7 +3902,7 @@ static int parsePass1(PyObject **parseEr
{
case '#':
/* A ctor has an argument with the /Transfer/ annotation. */
- *selfp = va_arg(va, PyObject *);
+ *selfp = (sipSimpleWrapper *)va_arg(va, PyObject *);
break;
case 'B':

39
fix-license-in-setup_py.patch Normal file
View File

@@ -0,0 +1,39 @@
Index: pyqt5_sip-12.16.1/PKG-INFO
===================================================================
--- pyqt5_sip-12.16.1.orig/PKG-INFO
+++ pyqt5_sip-12.16.1/PKG-INFO
@@ -5,7 +5,7 @@ Summary: The sip module support for PyQt
Home-page: https://github.com/Python-SIP/sip
Author: Phil Thompson
Author-email: phil@riverbankcomputing.com
-License: SIP
+License: BSD-2-Clause
Platform: X11
Platform: macOS
Platform: Windows
Index: pyqt5_sip-12.16.1/setup.py
===================================================================
--- pyqt5_sip-12.16.1.orig/setup.py
+++ pyqt5_sip-12.16.1/setup.py
@@ -17,7 +17,7 @@ module = Extension('PyQt5.sip', module_s
setup(
name='PyQt5_sip',
version='12.16.1',
- license='SIP',
+ license='BSD-2-Clause',
python_requires='>=3.9',
ext_modules=[module]
)
Index: pyqt5_sip-12.16.1/PyQt5_sip.egg-info/PKG-INFO
===================================================================
--- pyqt5_sip-12.16.1.orig/PyQt5_sip.egg-info/PKG-INFO
+++ pyqt5_sip-12.16.1/PyQt5_sip.egg-info/PKG-INFO
@@ -5,7 +5,7 @@ Summary: The sip module support for PyQt
Home-page: https://github.com/Python-SIP/sip
Author: Phil Thompson
Author-email: phil@riverbankcomputing.com
-License: SIP
+License: BSD-2-Clause
Platform: X11
Platform: macOS
Platform: Windows

BIN
pyqt5_sip-12.16.1.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

21
python-qt5-sip.changes
View File

@@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Jan 22 08:47:55 UTC 2025 - Antonio Larrosa <alarrosa@suse.com>
- Add patch to fix license in setup.py and PKG-INFO files. I
contacted upstream (Phil Thompson) and he confirmed that
pyqt6-sip is now licensed just as BSD-2-Clause and setup.py needs
fixing. Considering the sources of pyqt6-sip and pyqt5-sip had
the same license related changes, I added the following patch
to fix this here too:
* fix-license-in-setup_py.patch
- Rebase patch:
* support-python3.6.patch
-------------------------------------------------------------------
Tue Jan 21 10:53:06 UTC 2025 - Dirk Stoecker <opensuse@dstoecker.de>
- update to 12.16.1
No changelog provided
* fix-build-gcc14.patch (fixed upstream)
* refresh support-python3.6.patch
-------------------------------------------------------------------
Thu Mar 7 07:49:00 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>

15
python-qt5-sip.spec
View File

@@ -18,14 +18,15 @@
%{?sle15_python_module_pythons}
Name: python-qt5-sip
Version: 12.13.0
Version: 12.16.1
Release: 0
License: GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP
License: BSD-2-Clause
Summary: The sip module support for PyQt5
URL: https://www.riverbankcomputing.com/software/sip/
URL: https://github.com/Python-SIP/sip
Group: Development/Languages/Python
Source0: https://files.pythonhosted.org/packages/source/P/PyQt5-sip/PyQt5_sip-%{version}.tar.gz
Patch0: fix-build-gcc14.patch
Source0: https://files.pythonhosted.org/packages/source/P/PyQt5-sip/pyqt5_sip-%{version}.tar.gz
Patch0: fix-license-in-setup_py.patch
# PATCH-FIX-OPENSUSE Set minimum python version to 3.6 to support Leap distribution
Patch100: support-python3.6.patch
BuildRequires: %{python_module devel >= 3.6}
BuildRequires: %{python_module setuptools >= 30.3}
@@ -45,7 +46,7 @@ bindings for any C or C++ library. For example, it is also used to
create wxPython, the Python bindings for the wxWidget toolkit.
%prep
%autosetup -p1 -n PyQt5_sip-%{version}
%autosetup -p1 -n pyqt5_sip-%{version}
%build
%python_build
@@ -55,7 +56,7 @@ create wxPython, the Python bindings for the wxWidget toolkit.
%python_expand %fdupes %{buildroot}%{$python_sitearch}
%files %{python_files}
%license LICENSE LICENSE-GPL2 LICENSE-GPL3
%license LICENSE
%dir %{python_sitearch}/PyQt5
%{python_sitearch}/PyQt5/sip*
%{python_sitearch}/PyQt5_sip-%{version}*info

89
support-python3.6.patch
View File

@@ -1,35 +1,56 @@
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(
diff -ur pyqt5_sip-12.16.1/PKG-INFO pyqt5_sip-12.16.1_fix/PKG-INFO
--- pyqt5_sip-12.16.1/PKG-INFO 2024-12-12 11:01:36.048525000 +0100
+++ pyqt5_sip-12.16.1_fix/PKG-INFO 2025-01-21 12:59:58.918060996 +0100
@@ -9,7 +9,7 @@
Platform: X11
Platform: macOS
Platform: Windows
-Requires-Python: >=3.9
+Requires-Python: >=3.6
License-File: LICENSE
sip Extension Module
diff -ur pyqt5_sip-12.16.1/PyQt5_sip.egg-info/PKG-INFO pyqt5_sip-12.16.1_fix/PyQt5_sip.egg-info/PKG-INFO
--- pyqt5_sip-12.16.1/PyQt5_sip.egg-info/PKG-INFO 2024-12-12 11:01:35.000000000 +0100
+++ pyqt5_sip-12.16.1_fix/PyQt5_sip.egg-info/PKG-INFO 2025-01-21 13:00:02.294780054 +0100
@@ -9,7 +9,7 @@
Platform: X11
Platform: macOS
Platform: Windows
-Requires-Python: >=3.9
+Requires-Python: >=3.6
License-File: LICENSE
sip Extension Module
diff -ur pyqt5_sip-12.16.1/setup.py pyqt5_sip-12.16.1_fix/setup.py
--- pyqt5_sip-12.16.1/setup.py 2024-12-12 11:01:35.000000000 +0100
+++ pyqt5_sip-12.16.1_fix/setup.py 2025-01-21 13:01:46.169725120 +0100
@@ -18,6 +18,6 @@
name='PyQt5_sip',
version='12.13.0',
license='SIP',
- python_requires='>=3.7',
version='12.16.1',
license='BSD-2-Clause',
- python_requires='>=3.9',
+ 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 @@
diff -ur pyqt5_sip-12.16.1/sip.h pyqt5_sip-12.16.1_fix/sip.h
--- pyqt5_sip-12.16.1/sip.h 2024-12-12 11:01:35.000000000 +0100
+++ pyqt5_sip-12.16.1_fix/sip.h 2025-01-21 13:01:46.169725120 +0100
@@ -14,8 +14,8 @@
#include <Python.h>
/* 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 < 0x03090000
-#error "This version of PyQt5.sip requires Python v3.9 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
diff -ur pyqt5_sip-12.16.1/siplib.c pyqt5_sip-12.16.1_fix/siplib.c
--- pyqt5_sip-12.16.1/siplib.c 2024-12-12 11:01:35.000000000 +0100
+++ pyqt5_sip-12.16.1_fix/siplib.c 2025-01-21 13:01:46.173058506 +0100
@@ -1027,6 +1027,10 @@
PyObject *obj;
PyMethodDef *md;
@@ -40,7 +61,7 @@ Index: PyQt5_sip-12.13.0/siplib.c
/* Add the SIP version number. */
obj = PyLong_FromLong(SIP_VERSION);
@@ -13331,12 +13335,16 @@ int sip_api_convert_from_slice_object(Py
@@ -13335,12 +13339,16 @@
Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
Py_ssize_t *slicelength)
{
@@ -57,29 +78,3 @@ Index: PyQt5_sip-12.13.0/siplib.c
}
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