diff --git a/dev-lang/python/patches/python3.14-3.14.0~rc3.patchset b/dev-lang/python/patches/python3.14-3.14.0.patchset similarity index 96% rename from dev-lang/python/patches/python3.14-3.14.0~rc3.patchset rename to dev-lang/python/patches/python3.14-3.14.0.patchset index b1a25a118..26e82390e 100644 --- a/dev-lang/python/patches/python3.14-3.14.0~rc3.patchset +++ b/dev-lang/python/patches/python3.14-3.14.0.patchset @@ -1,4 +1,4 @@ -From 4a584c41aa8b9c9bc25eb98300864095f637db92 Mon Sep 17 00:00:00 2001 +From 5736ecb92172c3b312c53fb7a316c2ae3968e2bc Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 8 Oct 2023 01:02:25 -0300 Subject: initial Haiku patch @@ -22,7 +22,7 @@ index 3eac119..1e5df7e 100644 // See PyUnicode_DecodeFSDefaultAndSize(), PyUnicode_EncodeFSDefault(), // Py_DecodeLocale() and Py_EncodeLocale(). diff --git a/Makefile.pre.in b/Makefile.pre.in -index 764eef5..c5d8a08 100644 +index ba03979..97d95a8 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -156,7 +156,7 @@ BINDIR= @bindir@ @@ -148,7 +148,7 @@ index 63624d5..3692640 100644 #include #include diff --git a/configure.ac b/configure.ac -index 42d9477..a2104fe 100644 +index af7a962..5e79105 100644 --- a/configure.ac +++ b/configure.ac @@ -1585,6 +1585,16 @@ if test $enable_shared = "yes"; then @@ -197,7 +197,7 @@ index 42d9477..a2104fe 100644 2.50.1 -From 53f5060bb30f940ce8b9e0b45c6c29b2fe9af7ff Mon Sep 17 00:00:00 2001 +From 34d64f860ffd9c3d16275181e7b5e74f850faaa5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 16 Apr 2017 10:05:42 +0200 Subject: fix for negative errnos @@ -235,7 +235,7 @@ index b542f86..a996ebf 100644 2.50.1 -From 2b323e031f8b87f6b58e96d93f5becd0f5d20baf Mon Sep 17 00:00:00 2001 +From 135871ffc134ca7660561c610845fbd096f687b3 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 8 Oct 2023 20:06:31 -0300 Subject: Implement CTypes's find_library for Haiku @@ -332,7 +332,7 @@ index 378f121..a9136ad 100644 2.50.1 -From d1bb17f54da1180df9f3e9b4636f28e19e058ef0 Mon Sep 17 00:00:00 2001 +From 067d57c338bfe5239531cc46112b6aecba580eb8 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Mon, 23 Sep 2019 09:14:58 +0200 Subject: webbrowser: Support for default browsers on Haiku @@ -359,7 +359,7 @@ index f2e2394..b937321 100644 2.50.1 -From 8e3afd4f26c274c571cda3fb565efd1edd937aee Mon Sep 17 00:00:00 2001 +From c859187ff35670b6358d6f8987235465e7038d51 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 4 Oct 2019 22:02:35 +0200 Subject: since 3.8, don't reinit locks on fork. @@ -382,7 +382,7 @@ index b95c3aa..1652f93 100644 2.50.1 -From 01ad34a1700fc0b46f427b65ab121a85f52b19fa Mon Sep 17 00:00:00 2001 +From 76dd6f6f1e0b0a24400348b4cc653c2a84510d2a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 15 May 2020 15:20:57 +0200 Subject: handle errors returned by internal_connect() @@ -406,7 +406,7 @@ index 92c9aa8..82cdf0e 100644 2.50.1 -From 9ccaa1390792115cba9eb4277e5752ded8162de2 Mon Sep 17 00:00:00 2001 +From 6af7c9bc7808652629425065d2414bf75ad2604a Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 19 Oct 2020 18:03:09 +0200 Subject: ttyname_r can use MAXPATHLEN @@ -436,7 +436,7 @@ index e1576f8..4a459ef 100644 2.50.1 -From 7d264143256fbb72d7c03d3f1b696eec416e5c95 Mon Sep 17 00:00:00 2001 +From 86d413d5002f45b381287c61c7feca5ab484f42e Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Mon, 24 Oct 2022 20:04:10 -0300 Subject: Lib/test: require the "largefile" usage flag for I/O heavy tests. @@ -489,7 +489,7 @@ index b2a299e..c80ad75 100644 2.50.1 -From dcf6da5ec91db7fa703b0a2bf0475d065c1c207b Mon Sep 17 00:00:00 2001 +From 83f440d48e22dc660c533e611b32c975d42df614 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sat, 27 Jul 2024 04:51:52 -0300 Subject: _getuserbase(), getsitepackages(), and INSTALL_SCHEMES for Haiku. @@ -568,7 +568,7 @@ index f932719..c1fe2a4 100644 if sys.platlibdir != "lib": libdirs.append("lib") diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index f93b98d..8744f83 100644 +index 2ecbff2..71bcd11 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -48,6 +48,36 @@ _INSTALL_SCHEMES = { @@ -685,10 +685,10 @@ index f93b98d..8744f83 100644 return { 'prefix': 'nt', diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index 9faabc2..72125dc 100644 +index 09eff11..5ef7055 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -388,9 +388,10 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): +@@ -395,9 +395,10 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): self.assertTrue(os.path.isfile(config_h), config_h) def test_get_scheme_names(self): @@ -705,7 +705,7 @@ index 9faabc2..72125dc 100644 2.50.1 -From 850ee9715bbe2afe19d0857c772f117a0511c150 Mon Sep 17 00:00:00 2001 +From e5ea703ead5239ecbecf1a122334cd3936b23848 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Mon, 12 Feb 2024 08:39:38 -0300 Subject: Fix location of REPL's history file. @@ -744,7 +744,7 @@ index c1fe2a4..c304121 100644 2.50.1 -From d21df9ebeaa9b223fd452b79de24221ca26753b8 Mon Sep 17 00:00:00 2001 +From 8a5ea0645cb8a2b6c906eb6b90bdee82626d4244 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 10 Dec 2023 19:50:22 -0300 Subject: Miscellaneous "Lib/test/" fixes for Haiku. @@ -784,7 +784,7 @@ index e3d54f6..efb4d03 100644 2.50.1 -From b43f969d6b4ab72761e3fb8693b10390a20c604f Mon Sep 17 00:00:00 2001 +From 04b0f95dc0a55853f3d025b18d080daba8a983e0 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Mon, 12 Feb 2024 10:50:34 -0300 Subject: Fix build on nightlies, following the addition of kqueue. @@ -850,7 +850,7 @@ index d234d50..6e16247 100644 2.50.1 -From 420d4c0fa021636ba08b52c7af76ff95d5134137 Mon Sep 17 00:00:00 2001 +From 16529399df0341c3ec33ca35a4b1627b26fbf95d Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 13:38:28 -0300 Subject: fix test_utf8_mode. @@ -873,7 +873,7 @@ index f668810..a55a8e4 100644 2.50.1 -From 533ad2f62c6493c95e4b01e0072ea636551aa8d0 Mon Sep 17 00:00:00 2001 +From 653478fff90aa34d203795024997368b5de48e85 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 14:35:04 -0300 Subject: Fix test_site. @@ -963,14 +963,14 @@ index d0e3294..1452e42 100644 2.50.1 -From 3be070ff90af41963a9db0af4f1189c002fe6f1b Mon Sep 17 00:00:00 2001 +From dece042a33479b54f25d391694aadd1d9b7b80c8 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 15:37:13 -0300 Subject: Fix test_sysconfig. diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index 72125dc..ff2ac59 100644 +index 5ef7055..18b1e8f 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -223,6 +223,19 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): @@ -993,7 +993,7 @@ index 72125dc..ff2ac59 100644 else: self.assertEqual( sysconfig.get_path('scripts', scheme='venv'), -@@ -389,7 +402,7 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): +@@ -396,7 +409,7 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin): def test_get_scheme_names(self): wanted = ['nt', 'posix_home', 'posix_prefix', 'posix_venv', 'nt_venv', 'venv', 'haiku', @@ -1006,7 +1006,7 @@ index 72125dc..ff2ac59 100644 2.50.1 -From 79d90d04ec78385c3cbf11c7f5d0460585cf4349 Mon Sep 17 00:00:00 2001 +From 40197bf740f1b96f5245862f528cab9600d18614 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 29 Sep 2024 03:01:27 -0300 Subject: Partially fix test_compileall by skipping tests that need hardlink @@ -1042,7 +1042,7 @@ index 8384c18..d7e19ec 100644 2.50.1 -From cbbb3958aa8f4345b9b002b6c23dc1d529db61c8 Mon Sep 17 00:00:00 2001 +From d876c8c47b25d3ab1c3f792295a50e1d02598a7e Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Thu, 9 May 2024 15:16:26 -0300 Subject: Fix 3.13.0 build. @@ -1055,7 +1055,7 @@ Previous Python versions had both the time out and the "|| true". Some of the test run in that PGO stage sadly still fail on Haiku. diff --git a/Makefile.pre.in b/Makefile.pre.in -index c5d8a08..c84d55b 100644 +index 97d95a8..cedbc83 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -856,7 +856,7 @@ profile-run-stamp: @@ -1093,14 +1093,14 @@ index 1598eba..88b94b6 100644 2.50.1 -From 846abf6f5fbbf739953d22b4ae6df57dbd62461c Mon Sep 17 00:00:00 2001 +From e040d48e71628cf607b352cf187206e00e88b123 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sat, 5 Oct 2024 07:32:17 -0300 Subject: Avoid forcing "-g" on LTO builds, unless Py_DEBUG is defined. diff --git a/configure.ac b/configure.ac -index a2104fe..d2b5b63 100644 +index 5e79105..f61ffc9 100644 --- a/configure.ac +++ b/configure.ac @@ -2018,7 +2018,9 @@ if test "$Py_LTO" = 'true' ; then @@ -1118,7 +1118,7 @@ index a2104fe..d2b5b63 100644 2.50.1 -From fe0850d805374943a6238cd8c812df9a0061e49f Mon Sep 17 00:00:00 2001 +From be97f7d8ef678637761b58eb1e130b879c68d947 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Thu, 13 Feb 2025 13:30:03 -0300 Subject: Make sure we use 'spawn' on Haiku and not 'forkserver'. diff --git a/dev-lang/python/python3.14-3.14.0~rc3.recipe b/dev-lang/python/python3.14-3.14.0.recipe similarity index 98% rename from dev-lang/python/python3.14-3.14.0~rc3.recipe rename to dev-lang/python/python3.14-3.14.0.recipe index ff10a895f..71186fbe1 100644 --- a/dev-lang/python/python3.14-3.14.0~rc3.recipe +++ b/dev-lang/python/python3.14-3.14.0.recipe @@ -19,13 +19,12 @@ HOMEPAGE="https://www.python.org" LICENSE="Python" COPYRIGHT="1990-2025 Python Software Foundation" REVISION="1" -SOURCE_URI="https://www.python.org/ftp/python/${portVersion%~rc3}/Python-${portVersion/'~'/}.tar.xz" -CHECKSUM_SHA256="646dc945e49c73a141896deda12d43f3f293fd69426774c16fc43496180e8fcd" -SOURCE_DIR="Python-${portVersion/'~'/}" +SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" +CHECKSUM_SHA256="2299dae542d395ce3883aca00d3c910307cd68e0b2f7336098c8e7b7eee9f3e9" +SOURCE_DIR="Python-$portVersion" -pyShortVer="${portVersion%~rc3}" -pyShortVer="${pyShortVer%.*}" -pyVersionCompat="${portVersion%~rc3} compat >= $pyShortVer" +pyShortVer="${portVersion%.*}" +pyVersionCompat="$portVersion compat >= $pyShortVer" PATCHES="python$pyShortVer-$portVersion.patchset"