haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-15 16:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

python3.8: update to 3.8.16, sync both _getuserbase() copies. (#7944)

Browse Source 
This addresses the "small caveat" issue mentioned on #7531 that
affects all python versions, by making sure that both site.py's
and sysconfig.py's copies of _getuserbase() have the same code.

Also: renamed the package to be consistent with the rest of the
Python versions.
This commit is contained in:
OscarL
2023-03-11 15:15:36 -03:00
committed by GitHub
parent 19dd8691d9
commit 6f08937c46
3 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
dev-lang/python/patches/python38-3.8.14.patchset → dev-lang/python/patches/python3.8-3.8.16.patchset
View File

@@ -1,4 +1,4 @@
From a8d70b56a1ad0e11567806ceac6015a03f8aaf7d Mon Sep 17 00:00:00 2001
From b58e0d07c6b56c27c986beb0c354bbde0dfb07b9 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 10 Apr 2014 16:03:33 +0000
Subject: initial Haiku patch
@@ -584,7 +584,7 @@ index 57be07a..7efc014 100644
2.37.3
From ed06d3879a06d1f7e29eeb3cca73b063c7496488 Mon Sep 17 00:00:00 2001
From 9ac70320ec1daa5ec086caa735674c185772d804 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 16 Apr 2017 10:05:42 +0200
Subject: fix for negative errnos
@@ -622,7 +622,7 @@ index 05c051c..c7ea3ef 100644
2.37.3
From 7c9d6da0ef616d12ed9dab1dcc9275cbe7975815 Mon Sep 17 00:00:00 2001
From fe98235d3a9505b0940502bb13a8a0ad0bd2fd3c Mon Sep 17 00:00:00 2001
From: Philippe Houdoin <philippe.houdoin@gmail.com>
Date: Wed, 24 May 2017 11:09:43 +0000
Subject: Implement CTypes's find_library for Haiku
@@ -706,7 +706,7 @@ index 0c2510e..2b4f04c 100644
2.37.3
From 108a6983cdd7d0768fbe6f02552c20698ebd4b93 Mon Sep 17 00:00:00 2001
From 0cc804f24254199919a549ddb27549508f8c9f7c Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Mon, 23 Sep 2019 09:14:58 +0200
Subject: webbrowser: Support for default browsers on Haiku
@@ -732,7 +732,7 @@ index 6023c1e..8359531 100755
2.37.3
From 15898feb95061bdabb754fd8d94e8a30b68dff2c Mon Sep 17 00:00:00 2001
From c6d49665caea0bd75adc63c1737ebe9189ce1292 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 4 Oct 2019 22:02:35 +0200
Subject: since 3.8, don't reinit locks on fork.
@@ -755,7 +755,7 @@ index b393ddd..9f6362f 100644
2.37.3
From 1a524f5b18450e5af52fb90220d19fb7771daeb1 Mon Sep 17 00:00:00 2001
From 0fe6ce11353db0f9ffd155c3608981a3c44368fa Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 15 May 2020 15:20:57 +0200
Subject: handle errors returned by internal_connect()
@@ -788,7 +788,7 @@ index 062ca45..ac29f71 100644
2.37.3
From 3cfab461717e4de619d0358ed40a14fb1e7f8880 Mon Sep 17 00:00:00 2001
From 02a862c6570271c80570a2754195ae7120ac3aad Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 23 May 2022 12:41:29 +0200
Subject: Fix search paths for tcl/tk
@@ -818,7 +818,7 @@ index c128963..8b4c4fa 100644
2.37.3
From 77f377467882fc1b3ad33b9769a70f8e4412e704 Mon Sep 17 00:00:00 2001
From 226db5798b42ec453f529caab6b849eda92d4f1a Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 7 Mar 2023 17:09:55 +0100
Subject: sysconfig: add haiku schemes
@@ -876,3 +876,32 @@ index 3f702d7..fb75ecf 100644
--
2.37.3
From 3c109d305645a614e4d2d5c8ac508507e957aa31 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 10 Mar 2023 18:02:16 -0300
Subject: syncronize both _getuserbase() copies on site.py and sysconfig.py.
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index fb75ecf..68d0f5c 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -239,6 +239,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

0
dev-lang/python/patches/python38_x86-3.8.14.patchset → dev-lang/python/patches/python3.8_x86-3.8.16.patchset
View File

13
dev-lang/python/python38-3.8.14.recipe → dev-lang/python/python3.8-3.8.16.recipe
View File

@@ -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="5d77e278271ba803e9909a41a4f3baca006181c93ada682a5e5fe8dc4a24c5f3"
CHECKSUM_SHA256="d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"
SOURCE_DIR="Python-$portVersion"
PATCHES="python38-$portVersion.patchset"
PATCHES="python3.8-$portVersion.patchset"
if [ "$secondaryArchSuffix" = _x86 ] ; then
PATCHES+="
python38_x86-$portVersion.patchset
python3.8_x86-$portVersion.patchset
"
fi
@@ -32,7 +32,7 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
fi
PROVIDES="
python38$secondaryArchSuffix = $portVersion compat >= 3.8
python3.8$secondaryArchSuffix = $portVersion compat >= 3.8
cmd:2to3_3.8 = $portVersion compat >= 3.8
cmd:idle3.8 = $portVersion compat >= 3.8
cmd:pydoc3.8 = $portVersion compat >= 3.8
@@ -56,6 +56,9 @@ REQUIRES="
lib:libssl$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
REPLACES="
python38$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libbz2$secondaryArchSuffix