Accepting request 1007755 from home:bnavigator:branches:KDE:Qt:PyQt

- Update to version 6.7.0
  * Added the /NoAssignmentOperator/, /NoCopyCtor/ and
    /NoDefaultCtor/ mapped type annotations.
  * Added the --generator-version command line option to
    sip-distinfo.
  * Added the 'generator_version' argument to
    Project.get_sip_distinfo_command_line().
  * The resolver/transform stage has been replaced with a pure
    Python implementation.
  * Bug fixes.
- Add sip-6.7.0-zipstrict.patch
  * https://www.riverbankcomputing.com/pipermail/pyqt/2022-October/044927.html

OBS-URL: https://build.opensuse.org/request/show/1007755
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-sip6?expand=0&rev=12

python-sip6.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Oct  3 17:19:16 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Update to version 6.7.0
+  * Added the /NoAssignmentOperator/, /NoCopyCtor/ and
+    /NoDefaultCtor/ mapped type annotations.
+  * Added the --generator-version command line option to
+    sip-distinfo.
+  * Added the 'generator_version' argument to
+    Project.get_sip_distinfo_command_line().
+  * The resolver/transform stage has been replaced with a pure
+    Python implementation.
+  * Bug fixes.
+- Add sip-6.7.0-zipstrict.patch
+  * https://www.riverbankcomputing.com/pipermail/pyqt/2022-October/044927.html
+
 -------------------------------------------------------------------
 Mon Jun 20 21:15:15 UTC 2022 - Ben Greiner <code@bnavigator.de>
 

python-sip6.spec

@@ -19,13 +19,15 @@
 %{?!python_module:%define python_module() python3-%{**}}
 %define skip_python2 1
 Name:           python-sip6
-Version:        6.6.2
+Version:        6.7.0
 Release:        0
 Summary:        A Python bindings generator for C/C++ libraries
 License:        GPL-2.0-only OR GPL-3.0-only OR SUSE-SIP
 Group:          Development/Libraries/Python
 URL:            https://www.riverbankcomputing.com/software/sip
 Source0:        https://files.pythonhosted.org/packages/source/s/sip/sip-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM sip-6.7.0-zipstrict.patch -- https://www.riverbankcomputing.com/pipermail/pyqt/2022-October/044927.html
+Patch0:         sip-6.7.0-zipstrict.patch
 BuildRequires:  %{python_module devel >= 3.7}
 BuildRequires:  %{python_module packaging}
 BuildRequires:  %{python_module ply}

sip-6.6.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e3efac1c5dfd8e525ae57140927df26993e13f58b89d1577c314f4105bfd90d
-size 1143535

sip-6.7.0-zipstrict.patch

@@ -0,0 +1,21 @@
+diff -ur sip-6.7.0/sipbuild/generator/utils.py sip-6.7.0.patched/sipbuild/generator/utils.py
+--- sip-6.7.0/sipbuild/generator/utils.py	2022-09-30 02:32:40.000000000 -0700
++++ sip-6.7.0.patched/sipbuild/generator/utils.py	2022-10-03 11:45:07.590039668 -0700
+@@ -404,14 +404,14 @@
+         if td1.cpp_name.absolute != td2.cpp_name.absolute:
+             return False
+ 
+-        try:
+-            for ad1, ad2 in zip(td1.types.args, td2.types.args, strict=True):
++        if len(td1.types.args) == len(td2.types.args):
++            for ad1, ad2 in zip(td1.types.args, td2.types.args):
+                 if len(ad1.derefs) != len(ad2.derefs):
+                     return False
+ 
+                 if not same_base_type(ad1, ad2):
+                     return False
+-        except ValueError:
++        else:
+             return False
+ 
+         return True

sip-6.7.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2fd0fa6824e39ed5b4533e36a997763aae215c54070fdf461d9d7ba5cc0509ed
+size 1142786