Update to new upstream release 6.6.2 (#2074712)

.gitignore

@@ -5,3 +5,4 @@
 /sip-6.4.0.tar.gz
 /sip-6.5.0.tar.gz
 /sip-6.5.1.tar.gz
+/sip-6.6.2.tar.gz

0001-Py-3.11-fix.patch

@@ -1,31 +0,0 @@
-From d9d7e72154aa4434538410357de8b90bf6e573d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
-Date: Wed, 23 Mar 2022 09:26:55 +0100
-Subject: [PATCH] Py 3.11 fix
-
----
- sipbuild/module/source/12/siplib.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/sipbuild/module/source/12/siplib.c b/sipbuild/module/source/12/siplib.c
-index 2d74650..3412364 100644
---- a/sipbuild/module/source/12/siplib.c
-+++ b/sipbuild/module/source/12/siplib.c
-@@ -12750,7 +12750,14 @@ static struct _frame *sip_api_get_frame(int depth)
- 
-     while (frame != NULL && depth > 0)
-     {
-+#if PY_VERSION_HEX < 0x03090000
-         frame = frame->f_back;
-+#else
-+        frame = PyFrame_GetBack(frame);
-+
-+        /* Historically we return a borrowed reference. */
-+        Py_XDECREF(frame);
-+#endif
-         --depth;
-     }
- 
--- 
-2.33.1
-

323d39a2d602

@@ -0,0 +1,22 @@
+
+# HG changeset patch
+# User Phil Thompson <phil@riverbankcomputing.com>
+# Date 1658047276 -3600
+# Node ID 323d39a2d6020e224e82f894c694add0621714ee
+# Parent  1430b279a3c90da85f2cadd97ec833deae14f446
+Fixed the instantiation of template values.
+
+diff -r 1430b279a3c9 -r 323d39a2d602 sipbuild/generator/parser/instantiations.py
+--- a/sipbuild/generator/parser/instantiations.py	Sun Jun 26 10:01:41 2022 +0100
++++ b/sipbuild/generator/parser/instantiations.py	Sun Jul 17 09:41:16 2022 +0100
+@@ -434,7 +434,8 @@
+         proto_name = proto_value.value.result.definition
+ 
+         if proto_name.is_simple:
+-            i_name = ScopedName.parse(template_string(proto_name, expansions))
++            i_name = ScopedName.parse(
++                    template_string(proto_name.base_name, expansions))
+             i_result = Argument(type=ArgumentType.DEFINED, definition=i_name)
+             i_fcall = FunctionCall(result=i_result,
+                     args=proto_value.value.args)
+

sip6.spec

@@ -1,8 +1,8 @@
 %global pypi_name sip
 
 Name:           sip6
-Version:        6.5.1
-Release:        3%{?dist}
+Version:        6.6.2
+Release:        1%{?dist}
 Summary:        SIP - Python/C++ Bindings Generator
 %py_provides    python3-sip6
 # Remove when F34 is EOL
@@ -13,11 +13,11 @@ Obsoletes:      sip5 < 6.0.0
 License:        (GPLv2 or GPLv3) and (GPLv2+ with exceptions)
 URL:            https://www.riverbankcomputing.com/software/sip
 Source0:        %{pypi_source}
-Patch1:         0001-Py-3.11-fix.patch
+Patch0:         323d39a2d602
 
 BuildRequires:  gcc
 BuildRequires:  python3-devel
-BuildRequires:  %{py3_dist setuptools toml}
+BuildRequires:  %{py3_dist packaging ply setuptools toml}
 
 %global _description %{expand:
 SIP is a collection of tools that makes it very easy to create Python bindings
@@ -49,6 +49,9 @@ Python bindings for wxWidgets.}
 %{python3_sitearch}/sipbuild/
 
 %changelog
+* Tue Jul 19 2022 Scott Talbert <swt@techie.net> - 6.6.2-1
+- Update to new upstream release 6.6.2 (#2074712)
+
 * Wed Jun 15 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 6.5.1-3
 - Add patch for Python 3.11 compatibility
 

sources

@@ -1 +1 @@
-SHA512 (sip-6.5.1.tar.gz) = 2d6f225e653873462d97dfdc85bd308a26b66996e1bb98e2c3aa60a3b260db745021f1d3182db8e943fd216ee27a2f65731b96d287e94f8f2e7972c5df971c69
+SHA512 (sip-6.6.2.tar.gz) = 5e031baa9ff6d8d19f4c36ef7c3900c6440d261102259cdc12fce28471a849fed80c123bf31ad506b099a925b2967eb5863e6736ac00fbcff99198711cf0e5e5