diff --git a/dev-lang/python/patches/python3-3.7.14.patchset b/dev-lang/python/patches/python3.7-3.7.16.patchset similarity index 95% rename from dev-lang/python/patches/python3-3.7.14.patchset rename to dev-lang/python/patches/python3.7-3.7.16.patchset index 519e0eb62..578580ea8 100644 --- a/dev-lang/python/patches/python3-3.7.14.patchset +++ b/dev-lang/python/patches/python3.7-3.7.16.patchset @@ -1,4 +1,4 @@ -From 81ff2eec69f0338cc9edd62c1662f15ba380fe41 Mon Sep 17 00:00:00 2001 +From 6ea6afaf1824029349bcb6062acedbf2aaac532f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 10 Apr 2014 16:03:33 +0000 Subject: initial Haiku patch @@ -575,7 +575,7 @@ index bf90600..397acca 100644 2.37.3 -From a4f568304810ac91cef6201f9849ec43ed84f510 Mon Sep 17 00:00:00 2001 +From 7f828bd25fddc36738de71ee3230e9fc567281f6 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 16 Apr 2017 10:05:42 +0200 Subject: fix for negative errnos @@ -613,7 +613,7 @@ index 3cf0683..adf3608 100644 2.37.3 -From 841d1e34987d273a3f08e786449153ccaaab87de Mon Sep 17 00:00:00 2001 +From ea1faf74d8d8aecfb2c1bc89e4892482367f4a71 Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 24 May 2017 11:09:43 +0000 Subject: Implement CTypes's find_library for Haiku @@ -697,7 +697,7 @@ index 0c2510e..2b4f04c 100644 2.37.3 -From edf4baf89b8f25f3b74ed5d52ac0fdf62b32f9cc Mon Sep 17 00:00:00 2001 +From 94c0d14700210da6b6a7fc02ace7adf993acc9e3 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 @@ -723,7 +723,7 @@ index b04ec7b..c59cdee 100755 2.37.3 -From 0ecdde0fd8915fad5a55b3765bc54a8ddc92ab43 Mon Sep 17 00:00:00 2001 +From c036846d1c95ade8d07dd000808682b255a2c159 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 30 Nov 2019 23:26:57 +0100 Subject: don't reinit locks on fork. @@ -746,7 +746,7 @@ index b596f80..431f750 100644 2.37.3 -From 48c2782e9f65a281472a3b2722a26c6059301dd0 Mon Sep 17 00:00:00 2001 +From 4e486232baa904b50d61351bec659b547cff1cd5 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() @@ -779,7 +779,7 @@ index 3173b3b..88b66ed 100644 2.37.3 -From f2e4edc4fa209f8d2cdebf97056379ee62b727d8 Mon Sep 17 00:00:00 2001 +From a06387c6ac774b39f6918a680c710bd9239723cc Mon Sep 17 00:00:00 2001 From: begasus Date: Mon, 23 May 2022 14:53:35 +0200 Subject: Fix search paths for tcl/tk @@ -809,7 +809,7 @@ index dc3c9ae..e331924 100644 2.37.3 -From a73ff1680867da8938b1edf5b1e8b6120fc6a3c7 Mon Sep 17 00:00:00 2001 +From a0b7dcafcdb0983535c0e0538c788f64a8557034 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 7 Mar 2023 17:59:04 +0100 Subject: sysconfig: add haiku schemes @@ -868,3 +868,32 @@ index d15cec8..8a12ac0 100644 -- 2.37.3 + +From a07cd76ade629a59e1d094943cd5f73e3b41848b Mon Sep 17 00:00:00 2001 +From: Oscar Lesta +Date: Fri, 10 Mar 2023 15:14:25 -0300 +Subject: syncronize both _getuserbase() copies on site.py and sysconfig.py. + + +diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py +index 8a12ac0..5f533d7 100644 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py +@@ -233,6 +233,14 @@ def _getuserbase(): + return joinuser("~", "Library", sys._framework, + "%d.%d" % sys.version_info[:2]) + ++ if sys.platform.startswith('haiku'): ++ try: ++ import subprocess ++ return subprocess.run(['finddir', 'B_USER_NONPACKAGED_DIRECTORY'], ++ stdout=subprocess.PIPE, check=True).stdout.rstrip().decode('utf-8') ++ except: ++ pass ++ + return joinuser("~", ".local") + + +-- +2.37.3 + diff --git a/dev-lang/python/patches/python3_x86-3.7.14.patchset b/dev-lang/python/patches/python3.7_x86-3.7.16.patchset similarity index 100% rename from dev-lang/python/patches/python3_x86-3.7.14.patchset rename to dev-lang/python/patches/python3.7_x86-3.7.16.patchset diff --git a/dev-lang/python/python3.7-3.7.14.recipe b/dev-lang/python/python3.7-3.7.16.recipe similarity index 96% rename from dev-lang/python/python3.7-3.7.14.recipe rename to dev-lang/python/python3.7-3.7.16.recipe index 3d229f3d0..93a137cff 100644 --- a/dev-lang/python/python3.7-3.7.14.recipe +++ b/dev-lang/python/python3.7-3.7.16.recipe @@ -9,14 +9,14 @@ OSI-approved open source license." HOMEPAGE="https://www.python.org" LICENSE="Python" COPYRIGHT="1990-2022 Python Software Foundation" -REVISION="2" +REVISION="1" SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz" -CHECKSUM_SHA256="4157ae31eb81af19e81c36882610491b0fb8f50e00fa8a17b095c88908b9c45c" +CHECKSUM_SHA256="8338f0c2222d847e904c955369155dc1beeeed806e8d5ef04b00ef4787238bfd" SOURCE_DIR="Python-$portVersion" -PATCHES="python3-$portVersion.patchset" +PATCHES="python3.7-$portVersion.patchset" if [ "$secondaryArchSuffix" = _x86 ] ; then PATCHES+=" - python3_x86-$portVersion.patchset + python3.7_x86-$portVersion.patchset " fi