From 8231b0585bbcfbae02a2228f00fb180719a820c6e2324fffec041e102389d249 Mon Sep 17 00:00:00 2001
From: Benjamin Greiner <code@bnavigator.de>
Date: Wed, 5 Oct 2022 14:36:40 +0000
Subject: [PATCH] - Update to version 6.7.1   * Bug fixes - Drop
 ip-6.7.0-zipstrict.patch

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:PyQt/python-sip6?expand=0&rev=13
---
 python-sip6.changes       |  7 +++++++
 python-sip6.spec          |  4 +---
 sip-6.7.0-zipstrict.patch | 21 ---------------------
 sip-6.7.0.tar.gz          |  3 ---
 sip-6.7.1.tar.gz          |  3 +++
 5 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 sip-6.7.0-zipstrict.patch
 delete mode 100644 sip-6.7.0.tar.gz
 create mode 100644 sip-6.7.1.tar.gz

diff --git a/python-sip6.changes b/python-sip6.changes
index d553e06..b1faf20 100644
--- a/python-sip6.changes
+++ b/python-sip6.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct  5 14:35:17 UTC 2022 - Ben Greiner <code@bnavigator.de>
+
+- Update to version 6.7.1
+  * Bug fixes
+- Drop ip-6.7.0-zipstrict.patch
+
 -------------------------------------------------------------------
 Mon Oct  3 17:19:16 UTC 2022 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-sip6.spec b/python-sip6.spec
index 4013685..74b471c 100644
--- a/python-sip6.spec
+++ b/python-sip6.spec
@@ -19,15 +19,13 @@
 %{?!python_module:%define python_module() python3-%{**}}
 %define skip_python2 1
 Name:           python-sip6
-Version:        6.7.0
+Version:        6.7.1
 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}
diff --git a/sip-6.7.0-zipstrict.patch b/sip-6.7.0-zipstrict.patch
deleted file mode 100644
index 86dc1b7..0000000
--- a/sip-6.7.0-zipstrict.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
diff --git a/sip-6.7.0.tar.gz b/sip-6.7.0.tar.gz
deleted file mode 100644
index 29d4358..0000000
--- a/sip-6.7.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fd0fa6824e39ed5b4533e36a997763aae215c54070fdf461d9d7ba5cc0509ed
-size 1142786
diff --git a/sip-6.7.1.tar.gz b/sip-6.7.1.tar.gz
new file mode 100644
index 0000000..e4dbe36
--- /dev/null
+++ b/sip-6.7.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28170fdf880f937026fc87faa9c177b062c353c5d169ea3242b07802614ddd0c
+size 1153181