summaryrefslogtreecommitdiff
path: root/dev-python/sip
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/sip')
-rw-r--r--dev-python/sip/files/sip-6.17.0-abi-int.patch33
-rw-r--r--dev-python/sip/sip-6.17.0-r1.ebuild (renamed from dev-python/sip/sip-6.17.0.ebuild)0
2 files changed, 28 insertions, 5 deletions
diff --git a/dev-python/sip/files/sip-6.17.0-abi-int.patch b/dev-python/sip/files/sip-6.17.0-abi-int.patch
index c30a55e137f4..475e0285edc3 100644
--- a/dev-python/sip/files/sip-6.17.0-abi-int.patch
+++ b/dev-python/sip/files/sip-6.17.0-abi-int.patch
@@ -1,8 +1,31 @@
https://github.com/Python-SIP/sip/issues/118
--- a/sipbuild/project.py
+++ b/sipbuild/project.py
-@@ -1009,3 +1009,3 @@
- # ABI v14 requires Python v3.15 as a minimum.
-- if self.abi_version[0] >= 14 and version < (3, 15, 0):
-+ if int(self.abi_version[0]) >= 14 and version < (3, 15, 0):
- version = (3, 15, 0)
+@@ -248,4 +248,13 @@
+ super().apply_user_defaults(tool)
+
++ # Get the provisional ABI version to target. If it is not specified
++ # then the major number will be 0 which is interpreted as being any ABI
++ # prior to v14 (ie. v12 or v13). The parser will finalise the actual
++ # target ABI.
++ if self.abi_version:
++ self.abi_version = parse_abi_version(self.abi_version)
++ else:
++ self.abi_version = (0, None)
++
+ # Adjust the list of bindings according to what has been explicitly
+ # enabled and disabled.
+@@ -777,13 +786,4 @@
+ self.py_major_version, self.py_minor_version))
+
+- # Get the provisional ABI version to target. If it is not specified
+- # then the major number will be 0 which is interpreted as being any ABI
+- # prior to v14 (ie. v12 or v13). The parser will finalise the actual
+- # target ABI.
+- if self.abi_version:
+- self.abi_version = parse_abi_version(self.abi_version)
+- else:
+- self.abi_version = (0, None)
+-
+ # We know enough about the ABI to create an appropriate backend.
+ self.backend = AbstractBackend.factory(self)
diff --git a/dev-python/sip/sip-6.17.0.ebuild b/dev-python/sip/sip-6.17.0-r1.ebuild
index c04b456185d7..c04b456185d7 100644
--- a/dev-python/sip/sip-6.17.0.ebuild
+++ b/dev-python/sip/sip-6.17.0-r1.ebuild