Resolves: bz#2118862
This commit is contained in:
Jan Grulich 2022-10-24 12:39:49 +02:00
parent f17fe7b4f3
commit 6ad65740d0
4 changed files with 31 additions and 3 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/sip-6.5.1.tar.gz
/sip-6.6.2.tar.gz

22
323d39a2d602 Normal file
View File

@ -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)

View File

@ -1,7 +1,7 @@
%global pypi_name sip
Name: sip6
Version: 6.5.1
Version: 6.6.2
Release: 1%{?dist}
Summary: SIP - Python/C++ Bindings Generator
%py_provides python3-sip6
@ -10,10 +10,11 @@ Summary: SIP - Python/C++ Bindings Generator
License: (GPLv2 or GPLv3) and (GPLv2+ with exceptions)
URL: https://www.riverbankcomputing.com/software/sip
Source0: %{pypi_source}
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
@ -45,6 +46,10 @@ Python bindings for wxWidgets.}
%{python3_sitearch}/sipbuild/
%changelog
* Mon Oct 24 2022 Jan Grulich <jgrulich@redhat.com> - 6.6.2-1
- 6.6.2
Resolves: bz#2118862
* Tue Apr 19 2022 Jan Grulich <jgrulich@redhat.com> - 6.5.1-1
- Initial package
Resolves: bz#2071748

View File

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