From 8c04d87abb589a8c4ba71ddfcb0e165e1682b483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 21:58:26 +0200 Subject: [PATCH 1/7] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sip.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sip.spec b/sip.spec index 4559c9d..fdd9aeb 100644 --- a/sip.spec +++ b/sip.spec @@ -47,10 +47,11 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 12%{?dist} +Release: 13%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) -License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) +# Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. +License: GPL-2.0-only OR GPL-3.0-only AND (LicenseRef-Callaway-GPLv3+-with-exceptions) Url: https://riverbankcomputing.com/software/sip/intro Source0: https://riverbankcomputing.com/static/Downloads/sip/%{version}/sip-%{version}%{?snap:.%{snap}}.tar.gz @@ -480,6 +481,9 @@ popd %changelog +* Wed Sep 04 2024 Miroslav Suchý - 4.19.25-13 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.19.25-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b9d9920e0403dccf3eac36e2fb22fa367f465111 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:50:49 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index fdd9aeb..8d2960d 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 13%{?dist} +Release: 14%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.19.25-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 4.19.25-13 - convert license to SPDX From c50999f171ba97a888f8d85eee86cb96a22c7777 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:37:55 +0200 Subject: [PATCH 3/7] Rebuilt for Python 3.14 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 8d2960d..5fd22ce 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 14%{?dist} +Release: 15%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Mon Jun 02 2025 Python Maint - 4.19.25-15 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 4.19.25-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6f3c12fee00a2764fa46dc1aabca9a36d5419fce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:21:44 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 5fd22ce..8b246f1 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 15%{?dist} +Release: 16%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.19.25-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 4.19.25-15 - Rebuilt for Python 3.14 From a85112733e465e61f383a24343d72adfe5baa2b5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:17:58 +0200 Subject: [PATCH 5/7] Rebuilt for Python 3.14.0rc2 bytecode --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 8b246f1..cba4e00 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 16%{?dist} +Release: 17%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Fri Aug 15 2025 Python Maint - 4.19.25-17 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 4.19.25-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7245e3021ae160ab59a76cfb9a76121d15f85f32 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:56:40 +0200 Subject: [PATCH 6/7] Rebuilt for Python 3.14.0rc3 bytecode --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index cba4e00..b8b05a5 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 17%{?dist} +Release: 18%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Fri Sep 19 2025 Python Maint - 4.19.25-18 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 4.19.25-17 - Rebuilt for Python 3.14.0rc2 bytecode From cc94854a864152c00ed04a41c16a19cfb7cd0baa Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 27 Nov 2025 12:49:29 +0100 Subject: [PATCH 7/7] =?UTF-8?q?Fix=20rhbz#2414555=20-=20error:=20implicit?= =?UTF-8?q?=20declaration=20of=20function=20=E2=80=98PyWeakref=5FGetObject?= =?UTF-8?q?=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sip-4.19.25-ftbfs-python-3.15.patch | 20 ++++++++++++++++++++ sip.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 sip-4.19.25-ftbfs-python-3.15.patch diff --git a/sip-4.19.25-ftbfs-python-3.15.patch b/sip-4.19.25-ftbfs-python-3.15.patch new file mode 100644 index 0000000..31ec6b9 --- /dev/null +++ b/sip-4.19.25-ftbfs-python-3.15.patch @@ -0,0 +1,20 @@ +diff -up sip-4.19.25/siplib/qtlib.c.pyweekref_getobject sip-4.19.25/siplib/qtlib.c +--- sip-4.19.25/siplib/qtlib.c.pyweekref_getobject 2021-02-26 16:17:35.136483000 +0100 ++++ sip-4.19.25/siplib/qtlib.c 2025-11-12 18:23:13.020805318 +0100 +@@ -24,6 +24,16 @@ + + #include "sipint.h" + ++// Fix FTBFS with python3.15 ++#if PY_VERSION_HEX >= 0x30F00A1 ++static inline PyObject *compat_PyWeakref_GetObject(PyObject *ref) { ++ PyObject *obj = NULL; ++ if (PyWeakref_GetRef(ref, &obj) < 0) ++ return NULL; ++ return obj; ++} ++#define PyWeakref_GetObject compat_PyWeakref_GetObject ++#endif + + /* This is how Qt "types" signals and slots. */ + #define isQtSlot(s) (*(s) == '1') diff --git a/sip.spec b/sip.spec index b8b05a5..c4c77e6 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 18%{?dist} +Release: 19%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -73,6 +73,8 @@ Patch53: sip-4.19.18-no_hardcode_sip_so.patch Patch54: sip-4.19.25-py_ssize_t_clean.patch # Fix error: invalid use of undefined type 'struct _frame' Patch55: sip-4.19.25-pyframe_getback.patch +# Fix error: implicit declaration of function ‘PyWeakref_GetObject’ +Patch56: sip-4.19.25-ftbfs-python-3.15.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -227,6 +229,7 @@ This is the Python 3 build of wx-siplib. %patch -P53 -p1 -b .no_sip_so %patch -P54 -p1 -b .py_ssize_t_clean %patch -P55 -p1 -b .pyframe_getback +%patch -P56 -p1 -b .pyweekref_getobject %build @@ -481,6 +484,9 @@ popd %changelog +* Thu Nov 27 2025 Than Ngo - 4.19.25-19 +- Fix rhbz#2414555 - error: implicit declaration of function ‘PyWeakref_GetObject’ + * Fri Sep 19 2025 Python Maint - 4.19.25-18 - Rebuilt for Python 3.14.0rc3 bytecode