Compare commits
24 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74b108992c | ||
|
|
b3992326f1 | ||
|
|
6eb1208d37 | ||
|
|
28a355063e | ||
|
|
ad62c005a3 | ||
|
|
9a1f1a1a55 | ||
|
|
36cdf9d256 | ||
|
|
7f3c4ff630 | ||
|
|
79b2996e10 | ||
|
|
6d8e3c9268 | ||
|
|
65e8c5a6c2 | ||
|
|
b2c552c89d | ||
|
|
fc387ae5fe | ||
|
|
967cd34363 | ||
|
|
b769227485 | ||
|
|
b2f85aac64 | ||
|
|
7c0f355005 | ||
|
|
eb7c0ebce6 | ||
|
|
7c322c4f69 | ||
|
|
797df90a0b | ||
|
|
07e662f6d6 | ||
|
|
abae643ad3 | ||
|
|
daa3574f6d | ||
|
|
2f97bd3f0c |
4 changed files with 236 additions and 6 deletions
4
.gitignore
vendored
4
.gitignore
vendored
|
|
@ -29,3 +29,7 @@ swig-2.0.0.tar.gz
|
|||
/swig-4.1.1.tar.gz
|
||||
/swig-4.2.0.tar.gz
|
||||
/swig-4.2.1.tar.gz
|
||||
/swig-4.3.0.tar.gz
|
||||
/swig-4.3.1.tar.gz
|
||||
/swig-4.4.0.tar.gz
|
||||
/swig-4.4.1.tar.gz
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (swig-4.2.1.tar.gz) = 019dee5a46d57e1030eef47cd5d007ccaadbdcd4e53cd30d7c795f0118ecf4406a78185534502c81c5f6d7bac0713256e7e19b20b5a2d14e2c552219edbaf5cf
|
||||
SHA512 (swig-4.4.1.tar.gz) = 103ddb4a5914f28e6739a006d35042c701e55ba05066acff3f3609befb5f43f253ea717fc41d06c93d8fb187ded4399c12c94665b93dc06d0fb835069391c7c7
|
||||
|
|
|
|||
153
swig-python-Python-3.14-support.patch
Normal file
153
swig-python-Python-3.14-support.patch
Normal file
|
|
@ -0,0 +1,153 @@
|
|||
From 50e1cc8bc0d090164762ec166439f8b0f3855308 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Schueller <schueller@phimeca.com>
|
||||
Date: Thu, 10 Apr 2025 17:22:15 +0200
|
||||
Subject: [PATCH 1/3] Python: Handle __package__ removal
|
||||
|
||||
Closes #2967
|
||||
---
|
||||
Doc/Manual/Python.html | 6 +++---
|
||||
Source/Modules/python.cxx | 8 +++++---
|
||||
2 files changed, 8 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/Doc/Manual/Python.html b/Doc/Manual/Python.html
|
||||
index 23587e5dbcc..01fc449a68a 100644
|
||||
--- a/Doc/Manual/Python.html
|
||||
+++ b/Doc/Manual/Python.html
|
||||
@@ -6552,7 +6552,7 @@ <H4><a name="Python_package_search_both_package_modules">33.11.6.1 Both modules
|
||||
|
||||
<p>
|
||||
In this configuration, the pure Python module, foo.py, tries to load the C/C++ module, _foo, from the same package foo.py is
|
||||
-located in. The package name is determined from the <tt>__package__</tt>
|
||||
+located in. The package name is determined from the <tt>__spec__.parent</tt> (or <tt>__package__</tt> before Python 3.4)
|
||||
attribute if available, see <a href="https://www.python.org/dev/peps/pep-0366/">PEP 366</a>. Otherwise it is derived from the <tt>__name__</tt>
|
||||
attribute given to foo.py by the Python loader that imported foo.py.
|
||||
The interface file for this configuration would contain:
|
||||
@@ -6675,7 +6675,7 @@ <H4><a name="Python_custom_module_import">33.11.6.4 More on customizing the modu
|
||||
|
||||
<div class="targetlang">
|
||||
<pre>
|
||||
-if __package__ or '.' in __name__:
|
||||
+if getattr(__spec__, "parent", None) or '.' in __name__:
|
||||
from . import _foo
|
||||
else:
|
||||
import _foo
|
||||
@@ -6760,7 +6760,7 @@ <H4><a name="Python_custom_module_import">33.11.6.4 More on customizing the modu
|
||||
|
||||
<div class="targetlang">
|
||||
<pre>
|
||||
-if __package__ or '.' in __name__:
|
||||
+if getattr(__spec__, "parent", None) or '.' in __name__:
|
||||
from ._foo import *
|
||||
else:
|
||||
from _foo import *
|
||||
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
|
||||
index 86daf131c8b..a71fc3cdb25 100644
|
||||
--- a/Source/Modules/python.cxx
|
||||
+++ b/Source/Modules/python.cxx
|
||||
@@ -703,20 +703,22 @@ class PYTHON:public Language {
|
||||
* onwards (implicit relative imports raised a DeprecationWarning in 2.6,
|
||||
* and fail in 2.7 onwards).
|
||||
*
|
||||
- * First check for __package__ which is available from 2.6 onwards, see PEP366.
|
||||
+ * First check for __spec__.parent which is available from 3.4 onwards,
|
||||
+ * see https://docs.python.org/3/reference/import.html#spec. If not,
|
||||
+ * check for __package__, which was set before 3.14.
|
||||
* Next try determine the shadow wrapper's package based on the __name__ it
|
||||
* was given by the importer that loaded it.
|
||||
* If the module is in a package, load the low-level C/C++ module from the
|
||||
* same package, otherwise load it as a global module.
|
||||
*/
|
||||
Printv(default_import_code, "# Import the low-level C/C++ module\n", NULL);
|
||||
- Printv(default_import_code, "if __package__ or \".\" in __name__:\n", NULL);
|
||||
+ Printv(default_import_code, "if getattr(globals().get(\"__spec__\"), \"parent\", None) or globals().get(\"__package__\") or \".\" in __name__:\n", NULL);
|
||||
Printv(default_import_code, tab4, "from . import ", module, "\n", NULL);
|
||||
Printv(default_import_code, "else:\n", NULL);
|
||||
Printv(default_import_code, tab4, "import ", module, "\n", NULL);
|
||||
} else {
|
||||
Printv(default_import_code, "# Pull in all the attributes from the low-level C/C++ module\n", NULL);
|
||||
- Printv(default_import_code, "if __package__ or \".\" in __name__:\n", NULL);
|
||||
+ Printv(default_import_code, "if getattr(globals().get(\"__spec__\"), \"parent\", None) or globals().get(\"__package__\") or \".\" in __name__:\n", NULL);
|
||||
Printv(default_import_code, tab4, "from .", module, " import *\n", NULL);
|
||||
Printv(default_import_code, "else:\n", NULL);
|
||||
Printv(default_import_code, tab4, "from ", module, " import *\n", NULL);
|
||||
|
||||
From 3bfdf13c602f877860a9949ba751a5b5a9ba70aa Mon Sep 17 00:00:00 2001
|
||||
From: Julien Schueller <schueller@phimeca.com>
|
||||
Date: Thu, 10 Apr 2025 18:35:25 +0200
|
||||
Subject: [PATCH 2/3] Python: Add ht_token
|
||||
|
||||
---
|
||||
Source/Modules/python.cxx | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/Source/Modules/python.cxx b/Source/Modules/python.cxx
|
||||
index a71fc3cdb25..3070a94face 100644
|
||||
--- a/Source/Modules/python.cxx
|
||||
+++ b/Source/Modules/python.cxx
|
||||
@@ -4374,6 +4374,11 @@ class PYTHON:public Language {
|
||||
Printv(f, "#if PY_VERSION_HEX >= 0x030b0000\n", NIL);
|
||||
printSlot(f, getSlot(n, "feature:python:_ht_tpname"), "_ht_tpname", "char *");
|
||||
|
||||
+ // void *ht_token;
|
||||
+ Printv(f, "#if PY_VERSION_HEX >= 0x030e0000\n", NIL);
|
||||
+ printSlot(f, getSlot(n, "feature:python:ht_token"), "ht_token", "void *");
|
||||
+ Printv(f, "#endif\n", NIL);
|
||||
+
|
||||
// struct _specialization_cache _spec_cache;
|
||||
Printf(f, " {\n");
|
||||
printSlot(f, getSlot(n, "feature:python:getitem"), "getitem", "PyObject *");
|
||||
|
||||
From 55237efa7219f65a04e0ffc69a81c574b5f5e162 Mon Sep 17 00:00:00 2001
|
||||
From: Julien Schueller <schueller@phimeca.com>
|
||||
Date: Thu, 10 Apr 2025 17:47:59 +0200
|
||||
Subject: [PATCH 3/3] Python: Amend annotations test
|
||||
|
||||
---
|
||||
.../python_annotations_variable_c_runme.py | 24 +++++++++++++------
|
||||
1 file changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/Examples/test-suite/python/python_annotations_variable_c_runme.py b/Examples/test-suite/python/python_annotations_variable_c_runme.py
|
||||
index 153852d05e6..d1f359bbbd0 100644
|
||||
--- a/Examples/test-suite/python/python_annotations_variable_c_runme.py
|
||||
+++ b/Examples/test-suite/python/python_annotations_variable_c_runme.py
|
||||
@@ -1,4 +1,17 @@
|
||||
import sys
|
||||
+import inspect
|
||||
+
|
||||
+
|
||||
+def get_annotations(cls):
|
||||
+ # Python >=3.14 removed the __annotations__ attribute
|
||||
+ # retrieve it via inspect (see also annotationlib)
|
||||
+ if hasattr(inspect, "get_annotations"):
|
||||
+ # Python >=3.10
|
||||
+ return inspect.get_annotations(cls)
|
||||
+ else:
|
||||
+ # Python <3.10
|
||||
+ return getattr(cls, "__annotations__", {})
|
||||
+
|
||||
|
||||
# Variable annotations for properties is only supported in python-3.6 and later (PEP 526)
|
||||
if sys.version_info[0:2] >= (3, 6):
|
||||
@@ -8,17 +21,14 @@
|
||||
annotations_supported = not(is_python_builtin() or is_python_fastproxy())
|
||||
|
||||
if annotations_supported:
|
||||
- ts = TemplateShort()
|
||||
- anno = ts.__annotations__
|
||||
+ anno = get_annotations(TemplateShort)
|
||||
if anno != {'member_variable': 'int'}:
|
||||
raise RuntimeError("annotations mismatch: {}".format(anno))
|
||||
|
||||
- ts = StructWithVar()
|
||||
- anno = ts.__annotations__
|
||||
+ anno = get_annotations(StructWithVar)
|
||||
if anno != {'member_variable': 'int'}:
|
||||
raise RuntimeError("annotations mismatch: {}".format(anno))
|
||||
|
||||
- ts = StructWithVarNotAnnotated()
|
||||
- if getattr(ts, "__annotations__", None) != None:
|
||||
- anno = ts.__annotations__
|
||||
+ anno = get_annotations(StructWithVarNotAnnotated)
|
||||
+ if anno != {}:
|
||||
raise RuntimeError("annotations mismatch: {}".format(anno))
|
||||
|
||||
83
swig.spec
83
swig.spec
|
|
@ -19,9 +19,17 @@
|
|||
%{!?tcl:%global tcl 1}
|
||||
%{!?lualang:%global lualang 1}
|
||||
%{!?perllang:%global perllang 1}
|
||||
%{!?phplang:%global phplang 1}
|
||||
%{!?rubylang:%global rubylang 1}
|
||||
%{!?python3lang:%global python3lang 1}
|
||||
|
||||
# PHP drop support for 32-bit builds since Fedora 41.
|
||||
%if 0%{?fedora} >= 41 || 0%{?rhel} >= 11
|
||||
%ifarch %{ix86}
|
||||
%global phplang 0
|
||||
%endif
|
||||
%endif
|
||||
%{!?phplang:%global phplang 1}
|
||||
|
||||
# OCaml packages not built on i686 since OCaml 5 / Fedora 39.
|
||||
%ifarch %{ix86}
|
||||
%{!?ocamllang:%global ocamllang 0}
|
||||
|
|
@ -38,13 +46,16 @@
|
|||
%else
|
||||
%{!?guile:%global guile 1}
|
||||
%{!?octave:%global octave 1}
|
||||
%{!?Rlang:%global Rlang 1}
|
||||
# R-core requires tcl < 9.0.0
|
||||
%{!?Rlang:%global Rlang 0}
|
||||
%bcond_without build_ccache_swig
|
||||
%endif
|
||||
|
||||
%ifarch i686
|
||||
%ifarch %{ix86}
|
||||
%{!?javalang:%global javalang 0}
|
||||
%else
|
||||
# Temporary disable java tests, because they doesn't pass with java-21-openjdk
|
||||
# https://github.com/swig/swig/issues/2767
|
||||
%{!?javalang:%global javalang 1}
|
||||
%endif
|
||||
|
||||
|
|
@ -57,7 +68,7 @@
|
|||
|
||||
Summary: Connects C/C++/Objective C to some high-level programming languages
|
||||
Name: swig
|
||||
Version: 4.2.1
|
||||
Version: 4.4.1
|
||||
Release: 1%{?dist}
|
||||
License: GPL-3.0-or-later AND BSD-3-Clause
|
||||
URL: https://www.swig.org/
|
||||
|
|
@ -94,7 +105,7 @@ BuildRequires: boost-devel
|
|||
# Need when Source/CParse/parser.y is patched
|
||||
BuildRequires: bison
|
||||
%if %{tcl}
|
||||
BuildRequires: tcl-devel
|
||||
BuildRequires: tcl-devel >= 9.0.0
|
||||
%endif
|
||||
%if %{guile}
|
||||
BuildRequires: guile-devel
|
||||
|
|
@ -352,6 +363,68 @@ install -pm 644 Tools/swig.gdb %{buildroot}%{_datadir}/%{name}/gdb
|
|||
%{_datadir}/%{name}/gdb
|
||||
|
||||
%changelog
|
||||
* Mon Dec 08 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.4.1-1
|
||||
- 4.4.1 bump (rhbz#2419819, rhbz#2415440)
|
||||
|
||||
* Tue Oct 21 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.4.0-1
|
||||
- 4.4.0 bump (rhbz#2405182)
|
||||
|
||||
* Mon Oct 13 2025 Richard W.M. Jones <rjones@redhat.com> - 4.3.1-6
|
||||
- OCaml 5.4.0 rebuild
|
||||
|
||||
* Thu Aug 07 2025 Orion Poplawski <orion@nwra.com> - 4.3.1-5
|
||||
- Rebuild for Octave 10.2
|
||||
|
||||
* Thu Jul 31 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.1-4
|
||||
- Fix Python DeprecationWarning
|
||||
|
||||
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||
|
||||
* Wed Jun 25 2025 Yaakov Selkowitz <yselkowi@redhat.com> - 4.3.1-2
|
||||
- Add Python 3.14 support
|
||||
|
||||
* Wed Apr 16 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.1-1
|
||||
- 4.3.1 bump (rhbz#2360009)
|
||||
|
||||
* Mon Feb 17 2025 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.0-5
|
||||
- Disable R tests, because they need tcl < 9
|
||||
|
||||
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.3.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||
|
||||
* Thu Nov 14 2024 Orion Poplawski <orion@nwra.com> - 4.3.0-3
|
||||
- Rebuild for octave 9.2
|
||||
|
||||
* Tue Oct 29 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.0-2
|
||||
- Fix precedence of casts
|
||||
|
||||
* Mon Oct 21 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.3.0-1
|
||||
- 4.3.0 bump (rhbz#2320047)
|
||||
|
||||
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||
|
||||
* Sun Jun 23 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 4.2.1-7
|
||||
- Rebuild for Python 3.13
|
||||
|
||||
* Wed Jun 19 2024 Richard W.M. Jones <rjones@redhat.com> - 4.2.1-6
|
||||
- OCaml 5.2.0 ppc64le fix
|
||||
|
||||
* Wed May 29 2024 Richard W.M. Jones <rjones@redhat.com> - 4.2.1-5
|
||||
- OCaml 5.2.0 for Fedora 41
|
||||
|
||||
* Mon Apr 29 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.2.1-4
|
||||
- Fix gcc's -Wformat-security warning in R Raise function (rhbz#2277767)
|
||||
|
||||
* Fri Apr 12 2024 Remi Collet <remi@remirepo.net> - 4.2.1-3
|
||||
- disable PHP support on 32-bit
|
||||
https://fedoraproject.org/wiki/Changes/php_no_32_bit
|
||||
|
||||
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 4.2.1-2
|
||||
- Rebuilt for java-21-openjdk as system jdk
|
||||
- Temporary disable java tests (rhbz#2266693)
|
||||
|
||||
* Mon Feb 26 2024 Jitka Plesnikova <jplesnik@redhat.com> - 4.2.1-1
|
||||
- 4.2.1 bump (rhbz#2265786)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue