From b4725a384c3433d6eab10827655c4ca4323df1bd Mon Sep 17 00:00:00 2001 From: OscarL Date: Wed, 8 Apr 2026 02:35:30 -0300 Subject: [PATCH] python3.10: update to version 3.10.20. (#13927) --- ...9.patchset => python3.10-3.10.20.patchset} | 88 +++++++++++++------ ...10.19.recipe => python3.10-3.10.20.recipe} | 9 +- 2 files changed, 63 insertions(+), 34 deletions(-) rename dev-lang/python/patches/{python3.10-3.10.19.patchset => python3.10-3.10.20.patchset} (96%) rename dev-lang/python/{python3.10-3.10.19.recipe => python3.10-3.10.20.recipe} (98%) diff --git a/dev-lang/python/patches/python3.10-3.10.19.patchset b/dev-lang/python/patches/python3.10-3.10.20.patchset similarity index 96% rename from dev-lang/python/patches/python3.10-3.10.19.patchset rename to dev-lang/python/patches/python3.10-3.10.20.patchset index 776d342d4..79aa35c8a 100644 --- a/dev-lang/python/patches/python3.10-3.10.19.patchset +++ b/dev-lang/python/patches/python3.10-3.10.20.patchset @@ -1,4 +1,4 @@ -From 30f21bc69b71e48be142ffc33d602cb7dbcd8081 Mon Sep 17 00:00:00 2001 +From 0e98928209f35a4af62b33e932c33897613adbc6 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Thu, 25 Jul 2024 17:26:26 -0300 Subject: Initial Haiku patch (re-worked a bit). @@ -281,14 +281,14 @@ index ac3be38..d8ce1f1 100644 esac AC_MSG_CHECKING(for --with-libm=STRING) diff --git a/setup.py b/setup.py -index a39610a..82b06a1 100644 +index a39610a..16a38ac 100644 --- a/setup.py +++ b/setup.py @@ -86,6 +86,7 @@ CYGWIN = (HOST_PLATFORM == 'cygwin') MACOS = (HOST_PLATFORM == 'darwin') AIX = (HOST_PLATFORM.startswith('aix')) VXWORKS = ('vxworks' in HOST_PLATFORM) -+HAIKU = (HOST_PLATFORM == 'haiku1') ++HAIKU = (HOST_PLATFORM == 'haiku') CC = os.environ.get("CC") if not CC: CC = sysconfig.get_config_var("CC") @@ -374,10 +374,10 @@ index a39610a..82b06a1 100644 return -- -2.45.2 +2.52.0 -From 9353350b58fc16e86614aa693135c48317224297 Mon Sep 17 00:00:00 2001 +From 5053d645d38bc5845b619245c3b9ed4550a380d8 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 16 Apr 2017 10:05:42 +0200 Subject: fix for negative errnos @@ -412,10 +412,10 @@ index b852ad7..60d4a6e 100644 *--cur = Py_hexdigits[saved_errno % 16]; saved_errno /= 16; -- -2.45.2 +2.52.0 -From 8d385fd7d9b1002fd758338737c6e2e914bd2f13 Mon Sep 17 00:00:00 2001 +From 2e26b1f952d295a1b55eca5a181ccfef03942e71 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sat, 6 Apr 2024 23:49:30 -0300 Subject: Implement CTypes's find_library for Haiku @@ -509,10 +509,10 @@ index 0c2510e..6b88fc8 100644 print(cdll.LoadLibrary("libm.so")) print(cdll.LoadLibrary("libcrypt.so")) -- -2.45.2 +2.52.0 -From 1e0351ab8bc5f9a9f0c767ed710ec9bbbdeff27f Mon Sep 17 00:00:00 2001 +From 1c41bf066d871e71dd0f0ffea8f06f9082828883 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 @@ -535,10 +535,10 @@ index ec3cece..6a29d2a 100755 # Prefer X browsers if present if os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"): -- -2.45.2 +2.52.0 -From 8360548757463a20e42e1ff801cf9f129562244d Mon Sep 17 00:00:00 2001 +From 95099fd39a25604c16fa4b4cf7193a216179f788 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. @@ -558,10 +558,10 @@ index d1d4333..bfe60ca 100644 pass # no-op when os.register_at_fork does not exist. else: -- -2.45.2 +2.52.0 -From 21640d7a8974b2f91511952fe10f9f94f4084ffd Mon Sep 17 00:00:00 2001 +From c815ce87954dcc3e09bec0c67168a883f65dee19 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() @@ -591,10 +591,10 @@ index a4c555c..abdaea7 100644 return PyLong_FromLong((long) res); -- -2.45.2 +2.52.0 -From 3f37360704b6b950af6d6b0c65f00902d8510117 Mon Sep 17 00:00:00 2001 +From 68ce785d42449edea979ee91528f2306d9020024 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 @@ -621,10 +621,10 @@ index feffa43..895f84c 100644 if (buffer == NULL) { return PyErr_NoMemory(); -- -2.45.2 +2.52.0 -From 4302967b4fef908dcc195b847a3c4085db99927a Mon Sep 17 00:00:00 2001 +From c57783361d6151cdcc5eb7cd33568999d95c1c17 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Thu, 25 Jul 2024 17:27:04 -0300 Subject: Miscellaneous "Lib/test/" fixes for Haiku. @@ -690,10 +690,10 @@ index 307e2b9..afc1772 100644 'test requires %s bytes and a long time to run' % str(0x180000000)) f = open(TESTFN, 'w+b') -- -2.45.2 +2.52.0 -From 41559b8460f2ec627ca4fabf1ab4861f48e383d0 Mon Sep 17 00:00:00 2001 +From a2d456f207db9bddc09ad448e0780717cb559228 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Thu, 25 Jul 2024 17:27:17 -0300 Subject: _getuserbase(), getsitepackages(), and INSTALL_SCHEMES for Haiku @@ -1002,10 +1002,10 @@ index 5ee9839..35727c6 100644 @skip_unless_symlink -- -2.45.2 +2.52.0 -From ada6f48416a77d08a52d5b63ac9fd9dfb1bcf464 Mon Sep 17 00:00:00 2001 +From 1dcb4b7bdb240a2eb95fe2110ab91562b39b1a5d Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Thu, 25 Jul 2024 17:27:28 -0300 Subject: Fix location of REPL's history file. @@ -1036,10 +1036,10 @@ index 69d96a3..16c4ae7 100644 readline.read_history_file(history) except OSError: -- -2.45.2 +2.52.0 -From 0f5296fa14fa7c050726d5fafeb330ff957c04fc Mon Sep 17 00:00:00 2001 +From 1a0d18af31b94d08687b90b5a4ca4c3cc56eea30 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sat, 27 Jan 2024 08:14:52 -0300 Subject: Apply gh-109191 from Python upstream. @@ -1129,10 +1129,10 @@ index 57c84e5..6d4f5fc 100644 #undef HAVE_RL_COMPLETION_APPEND_CHARACTER -- -2.45.2 +2.52.0 -From 587abdbe7d31393a35d5c95b824195a0eda30ec8 Mon Sep 17 00:00:00 2001 +From 8415f57bac9846caa6a71068ef5207c157c9a878 Mon Sep 17 00:00:00 2001 From: Oscar Lesta Date: Sat, 10 Feb 2024 06:01:25 -0300 Subject: Fix build on nightlies, following the addition of kqueue. @@ -1195,10 +1195,10 @@ index 3afcb0e..b7a2681 100644 /* NETDEV filter flags */ -- -2.45.2 +2.52.0 -From 64a219635baa9f6ca8f42739317657060f6fc2e0 Mon Sep 17 00:00:00 2001 +From 4e8d4dac45dab187840ef5aa7148ac7a74fc903f 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 @@ -1225,5 +1225,37 @@ index e81d3ae..366429c 100755 SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE -- -2.45.2 +2.52.0 + + +From 52235f94447d7bd885f6d087ee26d3e53e8ccfeb Mon Sep 17 00:00:00 2001 +From: Oscar Lesta +Date: Tue, 7 Apr 2026 23:25:31 -0300 +Subject: configure.ac: add Haiku to the MACHDEP cases. + + +diff --git a/configure.ac b/configure.ac +index 8ac83da..765f004 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -400,6 +400,9 @@ then + *-*-cygwin*) + ac_sys_system=Cygwin + ;; ++ *-*-haiku*) ++ ac_sys_system=Haiku ++ ;; + *-*-vxworks*) + ac_sys_system=VxWorks + ;; +@@ -429,6 +432,7 @@ then + linux*) MACHDEP="linux";; + cygwin*) MACHDEP="cygwin";; + darwin*) MACHDEP="darwin";; ++ haiku*) MACHDEP="haiku";; + '') MACHDEP="unknown";; + esac + fi +-- +2.52.0 diff --git a/dev-lang/python/python3.10-3.10.19.recipe b/dev-lang/python/python3.10-3.10.20.recipe similarity index 98% rename from dev-lang/python/python3.10-3.10.19.recipe rename to dev-lang/python/python3.10-3.10.20.recipe index 77bc77756..9690080a0 100644 --- a/dev-lang/python/python3.10-3.10.19.recipe +++ b/dev-lang/python/python3.10-3.10.20.recipe @@ -23,7 +23,7 @@ LICENSE="Python" COPYRIGHT="1990-2025 Python Software Foundation" REVISION="1" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" -CHECKSUM_SHA256="c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076" +CHECKSUM_SHA256="de6517421601e39a9a3bc3e1bc4c7b2f239297423ee05e282598c83ec0647505" SOURCE_DIR="Python-$portVersion" pyShortVer="${portVersion%.*}" @@ -271,7 +271,8 @@ BUILD() --with-ensurepip=no \ --with-readline=editline \ --with-system-expat \ - --with-tzpath=$(findpaths -c : B_FIND_PATH_DATA_DIRECTORY zoneinfo) + --with-tzpath=$(findpaths -c : B_FIND_PATH_DATA_DIRECTORY zoneinfo) \ + --without-static-libpython # --with-lto # this one is too CPU/RAM intensive. # Uncomment when doing repeated builds (for testing different flags/options). @@ -292,10 +293,6 @@ INSTALL() rm $libDir/libpython3.so - # remove some cruft: - rm $prefix/lib/python$pyShortVer/config-$pyShortVer/libpython$pyShortVer.a - rm $prefix/lib/python$pyShortVer/config-$pyShortVer/python.o - # No point in having this if we don't have a working tkinter. if ! $enableTkinter; then rm $prefix/bin/idle$pyShortVer