From 2b020f6244c537be617aee7a3be2fc4752d6fa99 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 3 Jun 2021 15:14:27 +0200 Subject: [PATCH 01/24] Rebuilt for Python 3.10 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index f04eee0..0244cac 100644 --- a/sip.spec +++ b/sip.spec @@ -40,7 +40,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.24 -Release: 3%{?dist} +Release: 4%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -453,6 +453,9 @@ popd %changelog +* Thu Jun 03 2021 Python Maint - 4.19.24-4 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 4.19.24-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dbfd3563ab114087fc6fd23ea40a4c048cb6cc9b Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 16 Jun 2021 23:04:45 -0400 Subject: [PATCH 02/24] Stop building python3-pyqt5-sip package on F35+ - replaced by separate pkg --- sip.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 0244cac..23779a7 100644 --- a/sip.spec +++ b/sip.spec @@ -37,10 +37,17 @@ %global wx_siplib 1 %endif +# Stop building PyQt5.sip on F35+ +%if 0%{?fedora} && 0%{?fedora} >= 35 +%global pyqt5_sip 0 +%else +%global pyqt5_sip 1 +%endif + Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.24 -Release: 4%{?dist} +Release: 5%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -177,6 +184,7 @@ Provides: python%{python3_pkgversion}-pyqt4-sip-api(%{_sip_api_major})%{?_isa} = %description -n python%{python3_pkgversion}-pyqt4-sip This is the Python 3 build of pyqt4-SIP. +%if %{?pyqt5_sip} %package -n python%{python3_pkgversion}-pyqt5-sip Summary: SIP - Python 3/C++ Bindings Generator for pyqt5 BuildRequires: python%{python3_pkgversion}-devel @@ -184,6 +192,7 @@ Provides: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_ Provides: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python%{python3_pkgversion}-pyqt5-sip This is the Python 3 build of pyqt5-SIP. +%endif %if %{?wx_siplib} %package -n python%{python3_pkgversion}-wx-siplib @@ -277,6 +286,7 @@ pushd %{_target_platform}-python3-pyqt4 %make_build popd +%if %{?pyqt5_sip} mkdir %{_target_platform}-python3-pyqt5 pushd %{_target_platform}-python3-pyqt5 %{__python3} ../configure.py \ @@ -286,6 +296,7 @@ pushd %{_target_platform}-python3-pyqt5 %make_build popd +%endif %if %{?wx_siplib} sed -i -e 's|target = sip|target = siplib|g' siplib/siplib.sbf @@ -312,7 +323,9 @@ sed -i -e 's|target = siplib|target = sip|g' siplib/siplib.sbf %make_install -C %{_target_platform}-python3 %endif %make_install -C %{_target_platform}-python3-pyqt4 +%if %{?pyqt5_sip} %make_install -C %{_target_platform}-python3-pyqt5 +%endif %if %{?wx_siplib} %make_install -C %{_target_platform}-python3-wx mv %{buildroot}%{python3_sitearch}/wx/sip.pyi %{buildroot}%{python3_sitearch}/wx/siplib.pyi @@ -434,12 +447,14 @@ popd %{python3_sitearch}/PyQt4/sip.* %{python3_sitearch}/PyQt4_sip-%{version}.dist-info/ +%if %{?pyqt5_sip} %files -n python%{python3_pkgversion}-pyqt5-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %dir %{python3_sitearch}/PyQt5/ %{python3_sitearch}/PyQt5/sip.* %{python3_sitearch}/PyQt5_sip-%{version}.dist-info/ +%endif %if %{?wx_siplib} %files -n python%{python3_pkgversion}-wx-siplib @@ -453,6 +468,9 @@ popd %changelog +* Mon Jun 14 2021 Scott Talbert - 4.19.24-5 +- Stop building python3-pyqt5-sip package on F35+ - replaced by separate pkg + * Thu Jun 03 2021 Python Maint - 4.19.24-4 - Rebuilt for Python 3.10 From 78346fe8f24f92f9b05569b712713c97ce9eb3cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:40:55 +0000 Subject: [PATCH 03/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 23779a7..078fc9d 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.24 -Release: 5%{?dist} +Release: 6%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -468,6 +468,9 @@ popd %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.19.24-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 14 2021 Scott Talbert - 4.19.24-5 - Stop building python3-pyqt5-sip package on F35+ - replaced by separate pkg From 4bbbecf718a3b9e30d837cd62d21c084b93b14b7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 Oct 2021 13:46:41 +0200 Subject: [PATCH 04/24] Update to 4.19.25 --- .gitignore | 1 + sip-4.18-no_rpath.patch | 10 +++++----- sip-4.18-no_strip.patch | 10 +++++----- sip-4.19.18-no_hardcode_sip_so.patch | 8 ++++---- sip.spec | 7 +++++-- sources | 2 +- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index f7b1e4a..9f9eb15 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /sip-4.19.22.tar.gz /sip-4.19.23.tar.gz /sip-4.19.24.tar.gz +/sip-4.19.25.tar.gz diff --git a/sip-4.18-no_rpath.patch b/sip-4.18-no_rpath.patch index 406a26c..0ae91e4 100644 --- a/sip-4.18-no_rpath.patch +++ b/sip-4.18-no_rpath.patch @@ -1,7 +1,7 @@ -diff -up sip-4.18/siputils.py.no_rpath sip-4.18/siputils.py ---- sip-4.18/siputils.py.no_rpath 2015-03-25 06:00:24.000000000 -0500 -+++ sip-4.18/siputils.py 2016-04-13 11:34:48.179894616 -0500 -@@ -435,7 +435,7 @@ class Makefile: +diff -rupN --no-dereference sip-4.19.25/siputils.py sip-4.19.25-new/siputils.py +--- sip-4.19.25/siputils.py 2021-10-21 13:45:54.808566613 +0200 ++++ sip-4.19.25-new/siputils.py 2021-10-21 13:45:54.812566611 +0200 +@@ -436,7 +436,7 @@ class Makefile: if l_dir in ("", ".", ".."): continue @@ -10,7 +10,7 @@ diff -up sip-4.18/siputils.py.no_rpath sip-4.18/siputils.py if self._python: incdir.append(self.config.py_inc_dir) -@@ -612,7 +612,7 @@ class Makefile: +@@ -613,7 +613,7 @@ class Makefile: # Handle library directories. libdir_qt = self.optional_list("LIBDIR_QT") libdir.extend(libdir_qt) diff --git a/sip-4.18-no_strip.patch b/sip-4.18-no_strip.patch index 3273311..326759e 100644 --- a/sip-4.18-no_strip.patch +++ b/sip-4.18-no_strip.patch @@ -1,7 +1,7 @@ -diff -up sip-4.18/siputils.py.no_strip sip-4.18/siputils.py ---- sip-4.18/siputils.py.no_strip 2015-03-25 06:00:24.000000000 -0500 -+++ sip-4.18/siputils.py 2016-04-13 11:34:23.718690341 -0500 -@@ -1469,7 +1469,7 @@ class ModuleMakefile(Makefile): +diff -rupN --no-dereference sip-4.19.25/siputils.py sip-4.19.25-new/siputils.py +--- sip-4.19.25/siputils.py 2021-02-26 16:17:35.156108000 +0100 ++++ sip-4.19.25-new/siputils.py 2021-10-21 13:45:54.780566626 +0200 +@@ -1473,7 +1473,7 @@ class ModuleMakefile(Makefile): """ def __init__(self, configuration, build_file, install_dir=None, static=0, console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, @@ -10,7 +10,7 @@ diff -up sip-4.18/siputils.py.no_strip sip-4.18/siputils.py export_all=0, universal=None, arch=None, deployment_target=None): """Initialise an instance of a module Makefile. -@@ -1780,7 +1780,7 @@ class SIPModuleMakefile(ModuleMakefile): +@@ -1784,7 +1784,7 @@ class SIPModuleMakefile(ModuleMakefile): """ def __init__(self, configuration, build_file, install_dir=None, static=0, console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, diff --git a/sip-4.19.18-no_hardcode_sip_so.patch b/sip-4.19.18-no_hardcode_sip_so.patch index b6fe637..86c453c 100644 --- a/sip-4.19.18-no_hardcode_sip_so.patch +++ b/sip-4.19.18-no_hardcode_sip_so.patch @@ -1,7 +1,7 @@ -diff -up sip-4.19.18/configure.py.orig sip-4.19.18/configure.py ---- sip-4.19.18/configure.py.orig 2019-07-04 12:28:08.000000000 -0400 -+++ sip-4.19.18/configure.py 2019-08-27 21:56:33.871428348 -0400 -@@ -447,7 +447,7 @@ def create_makefiles(macros): +diff -rupN --no-dereference sip-4.19.25/configure.py sip-4.19.25-new/configure.py +--- sip-4.19.25/configure.py 2021-02-26 16:28:41.621025600 +0100 ++++ sip-4.19.25-new/configure.py 2021-10-21 13:45:54.845566597 +0200 +@@ -449,7 +449,7 @@ def create_makefiles(macros): if sys.platform == 'win32': mod = 'sip.lib' if opts.static else 'sip.pyd' else: diff --git a/sip.spec b/sip.spec index 078fc9d..1f4dc72 100644 --- a/sip.spec +++ b/sip.spec @@ -46,8 +46,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.24 -Release: 6%{?dist} +Version: 4.19.25 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -468,6 +468,9 @@ popd %changelog +* Thu Oct 21 2021 Sandro Mani - 4.19.25-1 +- Update to 4.19.25 + * Fri Jul 23 2021 Fedora Release Engineering - 4.19.24-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index f458ce7..bd8dd5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.24.tar.gz) = c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0 +SHA512 (sip-4.19.25.tar.gz) = 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001 From 36f2068ec1b5c7c29ce073860c5651b6da015b37 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 8 Nov 2021 19:19:43 -0500 Subject: [PATCH 05/24] Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 Unfortunately, sip 6.4.0 introduced a new directive, py_ssite_t_clean, and PyQt 5.15.6 makes use of this directive. sip 4 doesn't recognize this directive, so any packages that use PyQt5 and still use sip 4 now FTBFS. In order to work around this problem, cherry pick a patch from Debian which adds the new directive to sip 4 (but doesn't do anything) to resolve this FTBFS. This fixes FTBFS for scidavis and krita, at least. --- sip-4.19.25-py_ssize_t_clean.patch | 52 ++++++++++++++++++++++++++++++ sip.spec | 12 ++++++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 sip-4.19.25-py_ssize_t_clean.patch diff --git a/sip-4.19.25-py_ssize_t_clean.patch b/sip-4.19.25-py_ssize_t_clean.patch new file mode 100644 index 0000000..a6f10db --- /dev/null +++ b/sip-4.19.25-py_ssize_t_clean.patch @@ -0,0 +1,52 @@ +From: Jochen Sprickerhof +Date: Fri, 5 Nov 2021 09:13:14 +0100 +Subject: Make parser not break on py_ssize_t_clean directive from SIP v6.4 + +--- + sipgen/metasrc/lexer.l | 1 + + sipgen/metasrc/parser.y | 13 +++++++++++++ + 2 files changed, 14 insertions(+) + +diff --git a/sipgen/metasrc/lexer.l b/sipgen/metasrc/lexer.l +index a52b018..c328202 100644 +--- a/sipgen/metasrc/lexer.l ++++ b/sipgen/metasrc/lexer.l +@@ -174,6 +174,7 @@ SIP_QOBJECT {return TK_QOBJECT;} + timestamp {return TK_TIMESTAMP;} + type {return TK_TYPE;} + use_argument_names {return TK_USEARGNAMES;} ++py_ssize_t_clean {return TK_PYSSIZETCLEAN;} + use_limited_api {return TK_USELIMITEDAPI;} + all_raise_py_exception {return TK_ALLRAISEPYEXC;} + call_super_init {return TK_CALLSUPERINIT;} +diff --git a/sipgen/metasrc/parser.y b/sipgen/metasrc/parser.y +index 5623dca..2d98380 100644 +--- a/sipgen/metasrc/parser.y ++++ b/sipgen/metasrc/parser.y +@@ -389,6 +389,7 @@ static scopedNameDef *fullyQualifiedName(scopedNameDef *snd); + %token TK_TIMESTAMP + %token TK_TYPE + %token TK_USEARGNAMES ++%token TK_PYSSIZETCLEAN + %token TK_USELIMITEDAPI + %token TK_ALLRAISEPYEXC + %token TK_CALLSUPERINIT +@@ -2012,6 +2013,18 @@ module_arg: TK_KWARGS '=' TK_STRING_VALUE { + $$.call_super_init = -1; + $$.def_error_handler = NULL; + } ++ | TK_PYSSIZETCLEAN '=' bool_value { ++ $$.token = TK_PYSSIZETCLEAN; ++ ++ $$.c_module = FALSE; ++ $$.kwargs = defaultKwArgs; ++ $$.name = NULL; ++ $$.use_arg_names = FALSE; ++ $$.use_limited_api = FALSE; ++ $$.all_raise_py_exc = FALSE; ++ $$.call_super_init = -1; ++ $$.def_error_handler = NULL; ++ } + | TK_USELIMITEDAPI '=' bool_value { + $$.token = TK_USELIMITEDAPI; + diff --git a/sip.spec b/sip.spec index 1f4dc72..49c8c05 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -68,6 +68,8 @@ Patch51: sip-4.18-no_rpath.patch #Patch52: sip-4.19.3-python3_sip_bin.patch # Avoid hardcoding sip.so (needed for wxpython's siplib.so) Patch53: sip-4.19.18-no_hardcode_sip_so.patch +# Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 +Patch54: sip-4.19.25-py_ssize_t_clean.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -78,6 +80,8 @@ Source1: macros.sip BuildRequires: make BuildRequires: gcc-c++ BuildRequires: sed +BuildRequires: bison +BuildRequires: flex Obsoletes: sip-macros < %{version}-%{release} Provides: sip-macros = %{version}-%{release} @@ -216,9 +220,12 @@ This is the Python 3 build of wx-siplib. %patch50 -p1 -b .no_strip %patch51 -p1 -b .no_rpath %patch53 -p1 -b .no_sip_so +%patch54 -p1 -b .py_ssize_t_clean %build +flex --outfile=sipgen/lexer.c sipgen/metasrc/lexer.l +bison --yacc --defines=sipgen/parser.h --output=sipgen/parser.c sipgen/metasrc/parser.y %if %{with python2} %if 0%{?no_namespace} mkdir %{_target_platform}-python2 @@ -468,6 +475,9 @@ popd %changelog +* Mon Nov 08 2021 Scott Talbert - 4.19.25-2 +- Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 + * Thu Oct 21 2021 Sandro Mani - 4.19.25-1 - Update to 4.19.25 From 40ebbaa6f43856d52415a2f60531c279cd885806 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:01:16 +0000 Subject: [PATCH 06/24] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 49c8c05..ac60d63 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -475,6 +475,9 @@ popd %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.19.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Nov 08 2021 Scott Talbert - 4.19.25-2 - Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 From 842c544b1eaa091433a4472f68c712d6a410ede0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:17:57 +0200 Subject: [PATCH 07/24] Rebuilt for Python 3.11 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index ac60d63..67fa005 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 3%{?dist} +Release: 4%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -475,6 +475,9 @@ popd %changelog +* Mon Jun 13 2022 Python Maint - 4.19.25-4 +- Rebuilt for Python 3.11 + * Sat Jan 22 2022 Fedora Release Engineering - 4.19.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 2aa40956d602c67cef14515a48344efaf40d943e Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 17 Jun 2022 12:58:36 +0200 Subject: [PATCH 08/24] Fix error: invalid use of undefined type 'struct _frame' --- sip-4.19.25-pyframe_getback.patch | 13 +++++++++++++ sip.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 sip-4.19.25-pyframe_getback.patch diff --git a/sip-4.19.25-pyframe_getback.patch b/sip-4.19.25-pyframe_getback.patch new file mode 100644 index 0000000..30bab23 --- /dev/null +++ b/sip-4.19.25-pyframe_getback.patch @@ -0,0 +1,13 @@ +diff --git a/siplib/siplib.c b/siplib/siplib.c +index db52b68..8019e97 100644 +--- a/siplib/siplib.c ++++ b/siplib/siplib.c +@@ -13747,7 +13747,7 @@ static struct _frame *sip_api_get_frame(int depth) + + while (frame != NULL && depth > 0) + { +- frame = frame->f_back; ++ frame = PyFrame_GetBack(frame); + --depth; + } + diff --git a/sip.spec b/sip.spec index 67fa005..1156a49 100644 --- a/sip.spec +++ b/sip.spec @@ -70,6 +70,8 @@ Patch51: sip-4.18-no_rpath.patch Patch53: sip-4.19.18-no_hardcode_sip_so.patch # Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 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 # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -221,6 +223,7 @@ This is the Python 3 build of wx-siplib. %patch51 -p1 -b .no_rpath %patch53 -p1 -b .no_sip_so %patch54 -p1 -b .py_ssize_t_clean +%patch55 -p1 -b .pyframe_getback %build From 91d37abf48edecc3b4ab1847adddb646fb79c883 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:43:59 +0000 Subject: [PATCH 09/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 1156a49..62847d3 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 4%{?dist} +Release: 5%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -478,6 +478,9 @@ popd %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.19.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 4.19.25-4 - Rebuilt for Python 3.11 From 0ad5d9db3ad6556ef1378af0b547b6404006cbeb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:23:11 +0000 Subject: [PATCH 10/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 62847d3..31c86e4 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 5%{?dist} +Release: 6%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -478,6 +478,9 @@ popd %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.19.25-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 4.19.25-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b6a303041046e1fd39c657c656e21e22f041812f Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 7 Mar 2023 20:20:56 +0100 Subject: [PATCH 11/24] fixed bz#2154988, fails to build with Python 3.12: ModuleNotFoundError: No module named 'distutils' --- sip.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 31c86e4..be6c403 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 6%{?dist} +Release: 7%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -85,6 +85,8 @@ BuildRequires: sed BuildRequires: bison BuildRequires: flex +BuildRequires: python-setuptools + Obsoletes: sip-macros < %{version}-%{release} Provides: sip-macros = %{version}-%{release} @@ -478,6 +480,9 @@ popd %changelog +* Tue Mar 07 2023 Than Ngo - 4.19.25-7 +- fixed bz#2154988, fails to build with Python 3.12: ModuleNotFoundError: No module named 'distutils' + * Sat Jan 21 2023 Fedora Release Engineering - 4.19.25-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0c2f14c4519d1b8ea9241c3fdb2ddadc9203425f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:50:10 +0200 Subject: [PATCH 12/24] Rebuilt for Python 3.12 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index be6c403..33d875d 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 7%{?dist} +Release: 8%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Tue Jun 13 2023 Python Maint - 4.19.25-8 +- Rebuilt for Python 3.12 + * Tue Mar 07 2023 Than Ngo - 4.19.25-7 - fixed bz#2154988, fails to build with Python 3.12: ModuleNotFoundError: No module named 'distutils' From ecd053a61b179f82eb2cdaacfc433fe0304ebbc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:49:05 +0000 Subject: [PATCH 13/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 33d875d..4d9db0c 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 8%{?dist} +Release: 9%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.19.25-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 4.19.25-8 - Rebuilt for Python 3.12 From 675d011e68f0345227da9558f81728099acb712b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:23:33 +0000 Subject: [PATCH 14/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 4d9db0c..f6164b2 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 9%{?dist} +Release: 10%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.19.25-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 4.19.25-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0b47969ef1682dd5eba14dcd1e4327c1addd0bd3 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 15/24] Eliminate use of obsolete %patchN syntax (#2283636) --- sip.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sip.spec b/sip.spec index f6164b2..d21300a 100644 --- a/sip.spec +++ b/sip.spec @@ -221,11 +221,11 @@ This is the Python 3 build of wx-siplib. %setup -q -n %{name}-%{version}%{?snap:.%{snap}} -%patch50 -p1 -b .no_strip -%patch51 -p1 -b .no_rpath -%patch53 -p1 -b .no_sip_so -%patch54 -p1 -b .py_ssize_t_clean -%patch55 -p1 -b .pyframe_getback +%patch -P50 -p1 -b .no_strip +%patch -P51 -p1 -b .no_rpath +%patch -P53 -p1 -b .no_sip_so +%patch -P54 -p1 -b .py_ssize_t_clean +%patch -P55 -p1 -b .pyframe_getback %build From 5e32c23bbebe935e68561426beae2fbc955cdf39 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:00:39 +0200 Subject: [PATCH 16/24] Rebuilt for Python 3.13 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index d21300a..5361726 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 10%{?dist} +Release: 11%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Fri Jun 07 2024 Python Maint - 4.19.25-11 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 4.19.25-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e70f79adba6ada151aed940d671b729c6ebad7b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:43:23 +0000 Subject: [PATCH 17/24] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 5361726..4559c9d 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 11%{?dist} +Release: 12%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.19.25-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 4.19.25-11 - Rebuilt for Python 3.13 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 18/24] 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 19/24] 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 20/24] 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 21/24] 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 22/24] 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 23/24] 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 24/24] =?UTF-8?q?Fix=20rhbz#2414555=20-=20error:=20implici?= =?UTF-8?q?t=20declaration=20of=20function=20=E2=80=98PyWeakref=5FGetObjec?= =?UTF-8?q?t=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