diff --git a/dev-lang/python/patches/python3.13-3.13.0.patchset b/dev-lang/python/patches/python3.13-3.13.1.patchset similarity index 94% rename from dev-lang/python/patches/python3.13-3.13.0.patchset rename to dev-lang/python/patches/python3.13-3.13.1.patchset index de10ebfa5..20c67e23f 100644 --- a/dev-lang/python/patches/python3.13-3.13.0.patchset +++ b/dev-lang/python/patches/python3.13-3.13.1.patchset @@ -1,4 +1,4 @@ -From 2ea18286a0f1c4e3efab9587ac4fed7eb6887afc Mon Sep 17 00:00:00 2001 +From c390e5ddb4dcd7ee5fe33f9f0bfee3663112bba5 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 2ba81a4..8ba7902 100644 // See PyUnicode_DecodeFSDefaultAndSize(), PyUnicode_EncodeFSDefault(), // Py_DecodeLocale() and Py_EncodeLocale(). diff --git a/Makefile.pre.in b/Makefile.pre.in -index 5382292..edb2c80 100644 +index 03ca4cb..300f4c2 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -149,7 +149,7 @@ BINDIR= @bindir@ @@ -148,10 +148,10 @@ index 09fd70f..97e15d2 100644 #include #include diff --git a/configure.ac b/configure.ac -index 24e28a1..c973793 100644 +index a764028..f77214b 100644 --- a/configure.ac +++ b/configure.ac -@@ -1570,6 +1570,16 @@ if test $enable_shared = "yes"; then +@@ -1573,6 +1573,16 @@ if test $enable_shared = "yes"; then PY3LIBRARY=libpython3.so fi ;; @@ -168,7 +168,7 @@ index 24e28a1..c973793 100644 hp*|HP*) case `uname -m` in ia64) -@@ -1717,6 +1727,7 @@ AC_PROG_MKDIR_P +@@ -1720,6 +1730,7 @@ AC_PROG_MKDIR_P AC_SUBST([LN]) if test -z "$LN" ; then case $ac_sys_system in @@ -176,7 +176,7 @@ index 24e28a1..c973793 100644 CYGWIN*) LN="ln -s";; *) LN=ln;; esac -@@ -3584,7 +3595,7 @@ then +@@ -3587,7 +3598,7 @@ then LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; @@ -185,7 +185,7 @@ index 24e28a1..c973793 100644 # -u libsys_s pulls in all symbols in libsys Darwin/*|iOS/*) LINKFORSHARED="$extra_undefs -framework CoreFoundation" -@@ -5801,6 +5812,7 @@ AC_CHECK_FUNC([__fpu_control], +@@ -5804,6 +5815,7 @@ AC_CHECK_FUNC([__fpu_control], AC_SUBST([LIBM]) case $ac_sys_system in Darwin) ;; @@ -197,7 +197,7 @@ index 24e28a1..c973793 100644 2.45.2 -From de6c1970d9c5a41839918d51c6015937a787aa37 Mon Sep 17 00:00:00 2001 +From 6ff61441a930b2e3dc5ed1cbe6cff0012a7fd8e5 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 daec4ad..1647199 100644 2.45.2 -From 6bdb0c9c94d7d6d36e634e438346646eb7e026d6 Mon Sep 17 00:00:00 2001 +From f97a10b6431b381ed13acc2dcb3b618694920f1c 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 117bf06..6301aa2 100644 2.45.2 -From df5ebb5f3a241f5904aa7faeeb6fe43f6453e3e9 Mon Sep 17 00:00:00 2001 +From b438ba3f454c40ef6f0b86ab86e206750782baac 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 2f9555a..90bea57 100755 2.45.2 -From a7ad362e3182e0f6840f0fce6039b6fa5f78c925 Mon Sep 17 00:00:00 2001 +From 4c8eaa2208b385ec1b7031a7d046a05ca83799a1 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 aa9b79d..b99e1e0 100644 2.45.2 -From 696f4d504599a5996d9d3ebad472a0ea97bed8df Mon Sep 17 00:00:00 2001 +From 3150dfbd38f1d63d318b80f13caf1eb1d6391ee6 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() @@ -390,10 +390,10 @@ Subject: handle errors returned by internal_connect() upstream bug #40628 by Ryan C. Gordon diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index daec560..fc29753 100644 +index 1c0bc79..e8d1cf2 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c -@@ -3480,7 +3480,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro) +@@ -3483,7 +3483,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro) } res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1); @@ -402,7 +402,7 @@ index daec560..fc29753 100644 return NULL; Py_RETURN_NONE; -@@ -3511,7 +3511,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro) +@@ -3514,7 +3514,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro) } res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 0); @@ -415,17 +415,17 @@ index daec560..fc29753 100644 2.45.2 -From 23d12c793b79734bfa6813dd6cf8e5c3cb0dc1f0 Mon Sep 17 00:00:00 2001 +From 202daa413c01b94425fd55d54a82995055530d40 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 diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index 51e34b5..d36b811 100644 +index a09305c..75a52c8 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c -@@ -3309,11 +3309,14 @@ static PyObject * +@@ -3311,11 +3311,14 @@ static PyObject * os_ttyname_impl(PyObject *module, int fd) /*[clinic end generated code: output=c424d2e9d1cd636a input=9ff5a58b08115c55]*/ { @@ -445,7 +445,7 @@ index 51e34b5..d36b811 100644 2.45.2 -From d1b1ee86528892976e15e272c613fc779b7c9151 Mon Sep 17 00:00:00 2001 +From 72ccb71a32892d02853877b4a64d05cb1b79fa00 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. @@ -456,7 +456,7 @@ This avoids needing several GBs of storage to run the tests (unless the "largefile" resource usage flag is enabled). diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py -index aa1b826..ae9a334 100644 +index f1f8ce5..895815e 100644 --- a/Lib/test/test_io.py +++ b/Lib/test/test_io.py @@ -628,7 +628,7 @@ class IOTest(unittest.TestCase): @@ -498,7 +498,7 @@ index a1cf538..c04d9e3 100644 2.45.2 -From db4bc582b40289b0b24c0bf8aecf1d7da22b47eb Mon Sep 17 00:00:00 2001 +From 666d402e3361e08604e5b7ffe4bdb4ed846bfd36 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. @@ -525,7 +525,7 @@ by me, plus: The idea was to have all _getuserbase()/INSTALL_SCHEMES related changes in "one place". diff --git a/Lib/site.py b/Lib/site.py -index 0a0dc47..ff10f92 100644 +index 89a81c5..3477bf6 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -306,6 +306,14 @@ def _getuserbase(): @@ -577,7 +577,7 @@ index 0a0dc47..ff10f92 100644 if sys.platlibdir != "lib": libdirs.append("lib") diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py -index 80aef34..0098893 100644 +index ec3b638..e6bbe86 100644 --- a/Lib/sysconfig/__init__.py +++ b/Lib/sysconfig/__init__.py @@ -48,6 +48,36 @@ _INSTALL_SCHEMES = { @@ -674,7 +674,7 @@ index 80aef34..0098893 100644 'osx_framework_user': { 'stdlib': '{userbase}/lib/{implementation_lower}', 'platstdlib': '{userbase}/lib/{implementation_lower}', -@@ -280,6 +339,18 @@ def _expand_vars(scheme, vars): +@@ -278,6 +337,18 @@ def _expand_vars(scheme, vars): def _get_preferred_schemes(): @@ -694,10 +694,10 @@ index 80aef34..0098893 100644 return { 'prefix': 'nt', diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py -index 1ade492..8d9d5d3 100644 +index bf53413..80daae7 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -377,9 +377,10 @@ class TestSysConfig(unittest.TestCase): +@@ -386,9 +386,10 @@ class TestSysConfig(unittest.TestCase): self.assertTrue(os.path.isfile(config_h), config_h) def test_get_scheme_names(self): @@ -714,7 +714,7 @@ index 1ade492..8d9d5d3 100644 2.45.2 -From 1daf1760725d67aec9c518d33a887230def19bd6 Mon Sep 17 00:00:00 2001 +From 69371788003ea8cacfdac3b4b84fe37dfcefef28 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. @@ -725,10 +725,10 @@ Content-Transfer-Encoding: 8bit Adapted from previous patches by Jérôme Duval. diff --git a/Lib/site.py b/Lib/site.py -index ff10f92..13f2cd3 100644 +index 3477bf6..cfd4e49 100644 --- a/Lib/site.py +++ b/Lib/site.py -@@ -504,8 +504,18 @@ def gethistoryfile(): +@@ -505,8 +505,18 @@ def gethistoryfile(): history = os.environ.get("PYTHON_HISTORY") if history: return history @@ -753,7 +753,7 @@ index ff10f92..13f2cd3 100644 2.45.2 -From 5d7ccbdf9dd629886cd1a2f05018d45ce26aa877 Mon Sep 17 00:00:00 2001 +From 8441eae6b0dc39ed2dbd2042e96e65553e6c2086 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sun, 8 Oct 2023 17:02:19 -0300 Subject: Use spawn instead of fork for multiprocessing. @@ -806,7 +806,7 @@ index de8a264..02a301e 100644 2.45.2 -From 96f5d5a1d9a06dd459f60ae2f6e0144fb9119462 Mon Sep 17 00:00:00 2001 +From ff34d5fc9aba3529e5663524a8be683dee64597f 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. @@ -817,10 +817,10 @@ Content-Transfer-Encoding: 8bit test_fileio.py fix from "initial Haiku patch" by Jérôme Duval. diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py -index d0ee974..3c5e359 100644 +index a2ed99a..e8449b9 100644 --- a/Lib/test/datetimetester.py +++ b/Lib/test/datetimetester.py -@@ -6033,6 +6033,9 @@ def pairs(iterable): +@@ -6080,6 +6080,9 @@ def pairs(iterable): class ZoneInfo(tzinfo): zoneroot = '/usr/share/zoneinfo' @@ -846,7 +846,7 @@ index 0611d17..ce7c87d 100644 2.45.2 -From d838fc32a01d70d86e0b1410add643fa47a8659d Mon Sep 17 00:00:00 2001 +From 61910a330dad56e9371b5cd60f5f8d5a027111e2 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. @@ -912,7 +912,7 @@ index 5bd9b77..88e29a4 100644 2.45.2 -From b8e068f57b022e62a2c3327f474fc055c26970cf Mon Sep 17 00:00:00 2001 +From 0460e4a82df9299e97aecaae76e0f0674875e681 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Thu, 14 Mar 2024 12:54:33 -0500 Subject: config.guess: Update to universal haiku arch guessing @@ -942,7 +942,7 @@ index e81d3ae..366429c 100755 2.45.2 -From d703280151a132b8dc643e4052bf93b66fdb23a1 Mon Sep 17 00:00:00 2001 +From 61f60797b4daad8bda46fa207e44a78bb1e6b0d0 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 13:38:28 -0300 Subject: fix test_utf8_mode. @@ -965,7 +965,7 @@ index f668810..a55a8e4 100644 2.45.2 -From 4430dd71f5fd4005ac6af33e90b714f91d338ad9 Mon Sep 17 00:00:00 2001 +From 9b4391f96d34fde5979575ff6c8783aeba6a21a8 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Fri, 9 Aug 2024 14:35:04 -0300 Subject: Fix test_site. @@ -983,7 +983,7 @@ Lib/site.py changes should eventually be merged with previous commits. Leaving the changes here now for easier review. diff --git a/Lib/site.py b/Lib/site.py -index 13f2cd3..3d8f866 100644 +index cfd4e49..b414150 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -307,12 +307,8 @@ def _getuserbase(): @@ -1055,17 +1055,17 @@ index 2df17b9..332063b 100644 2.45.2 -From b509c83f8c479a9f486a36ae4eb23aaf273a5b80 Mon Sep 17 00:00:00 2001 +From 7304af9e5a5dd2f6a5fb7f367db6ff712cc18acf 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 8d9d5d3..93890ab 100644 +index 80daae7..5194c47 100644 --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py -@@ -212,6 +212,19 @@ class TestSysConfig(unittest.TestCase): +@@ -221,6 +221,19 @@ class TestSysConfig(unittest.TestCase): sysconfig.get_path('purelib', scheme='venv'), sysconfig.get_path('purelib', scheme='nt_venv') ) @@ -1085,7 +1085,7 @@ index 8d9d5d3..93890ab 100644 else: self.assertEqual( sysconfig.get_path('scripts', scheme='venv'), -@@ -378,7 +391,7 @@ class TestSysConfig(unittest.TestCase): +@@ -387,7 +400,7 @@ class TestSysConfig(unittest.TestCase): def test_get_scheme_names(self): wanted = ['nt', 'posix_home', 'posix_prefix', 'posix_venv', 'nt_venv', 'venv', 'haiku', @@ -1098,7 +1098,7 @@ index 8d9d5d3..93890ab 100644 2.45.2 -From ae85d6759a2cb226828984885ad127d15d1d900e Mon Sep 17 00:00:00 2001 +From 3517fc45c182c10aeee265cdd99b01a977bc5aac 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 @@ -1134,7 +1134,7 @@ index 812ff5e..834474b 100644 2.45.2 -From 190e238f1fec99d033cf2914e07bc4e695e9b1af Mon Sep 17 00:00:00 2001 +From c1bc7f41c445834aa126df4ddb539ddf9167ebbf 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. @@ -1147,7 +1147,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 edb2c80..e36f96c 100644 +index 300f4c2..fdbb877 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -752,7 +752,7 @@ profile-run-stamp: @@ -1185,17 +1185,17 @@ index 4d3fb65..be95e7d 100644 2.45.2 -From 056c2574200a6c9865439e3c567c2a7d444cb7d8 Mon Sep 17 00:00:00 2001 +From d74c91e332059ee3672703f7b7d9d195f26f20c9 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 c973793..5e601ad 100644 +index f77214b..27003df 100644 --- a/configure.ac +++ b/configure.ac -@@ -2066,7 +2066,9 @@ if test "$Py_LTO" = 'true' ; then +@@ -2069,7 +2069,9 @@ if test "$Py_LTO" = 'true' ; then then # bpo-30345: Add -g to LDFLAGS when compiling with LTO # to get debug symbols. diff --git a/dev-lang/python/python3.13-3.13.0.recipe b/dev-lang/python/python3.13-3.13.1.recipe similarity index 97% rename from dev-lang/python/python3.13-3.13.0.recipe rename to dev-lang/python/python3.13-3.13.1.recipe index 627e33584..2b722bb50 100644 --- a/dev-lang/python/python3.13-3.13.0.recipe +++ b/dev-lang/python/python3.13-3.13.1.recipe @@ -13,7 +13,7 @@ LICENSE="Python" COPYRIGHT="1990-2024 Python Software Foundation" REVISION="1" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" -CHECKSUM_SHA256="086de5882e3cb310d4dca48457522e2e48018ecd43da9cdf827f6a0759efb07d" +CHECKSUM_SHA256="9cf9427bee9e2242e3877dd0f6b641c1853ca461f39d6503ce260a59c80bf0d9" SOURCE_DIR="Python-$portVersion" pyShortVer="${portVersion%.*}" @@ -288,10 +288,10 @@ INSTALL() # "hp --test"'s chroot. (test_sysconfig.MakefileTests.test_parse_makefile, for example). # Problem is "os.getcwd()" will return wrong data, causing some file operations to fail. -# For reference, results on hrev58174 (64 bits VBox): -# Total duration: 14 min 56 sec -# Total tests: run=36,985 failures=224 skipped=1,403 -# Total test files: run=421/409 failed=17 skipped=28 resource_denied=5 rerun=17 +# For reference, results on hrev57937+125 (64 bits bare-metal): +# Total tests: run=37,204 failures=596 skipped=1,415 +# Total test files: run=426/409 failed=22 skipped=28 resource_denied=5 rerun=22 +# (a few more failures than usual, possibly due to having ran the tests from ramfs) TEST() { # Remove tests data left-overs, if any: