mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 16:50:06 +02:00
python3.11: update to version 3.11.7 (#9874)
This commit is contained in:
OscarL
GitHub
@@ -1,4 +1,4 @@
|
||||
From c3b4b1afd5bc8991607aa93f7f9ce53b126a7b99 Mon Sep 17 00:00:00 2001
|
||||
From 03bcbc8084a4e2eb67a36152bdc4b1fc19cf5336 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
|
||||
@@ -218,7 +218,7 @@ index 5cc3d4b..6f53287 100644
|
||||
# Somehow /dev/tty appears seekable on some BSDs
|
||||
self.assertEqual(f.seekable(), False)
|
||||
diff --git a/Makefile.pre.in b/Makefile.pre.in
|
||||
index 0d0ac13..0262fe2 100644
|
||||
index c61b093..86ec08d 100644
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -146,7 +146,7 @@ BINDIR= @bindir@
|
||||
@@ -370,10 +370,10 @@ index 42123c9..60de40a 100644
|
||||
else
|
||||
PyErr_SetString(PyExc_KeyError, "getspnam(): name not found");
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 419df530c60c9b1ff9d537f979e362c03c342938 Mon Sep 17 00:00:00 2001
|
||||
From ce3528842c00cb3600f145306290c2d36f81ffbf 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
|
||||
@@ -408,10 +408,10 @@ index 072519c..1023c8a 100644
|
||||
*--cur = Py_hexdigits[saved_errno % 16];
|
||||
saved_errno /= 16;
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 0ca9b22dc9f39f1866eafb7bee7eb98d5f32acd6 Mon Sep 17 00:00:00 2001
|
||||
From 90213d89824d796d82fc5266f65c79a6787daaef 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
|
||||
@@ -492,10 +492,10 @@ index 0c2510e..2b4f04c 100644
|
||||
print(cdll.LoadLibrary("libm.so"))
|
||||
print(cdll.LoadLibrary("libcrypt.so"))
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 182fbe4efcec340ada0dc71d6c1b4201e372d0cc Mon Sep 17 00:00:00 2001
|
||||
From 90badefb931e909cb4ec993b9b097badcd66e4be 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
|
||||
@@ -518,10 +518,10 @@ index 44974d4..ce78f41 100755
|
||||
# Prefer X browsers if present
|
||||
if os.environ.get("DISPLAY") or os.environ.get("WAYLAND_DISPLAY"):
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From cf4eb8d61f5dd02a787c1a2af0eeb9889062347f Mon Sep 17 00:00:00 2001
|
||||
From 7e0b76caa0d03cc8f8761dd9edddd744dd67e300 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.
|
||||
@@ -541,10 +541,10 @@ index bcee2ba..46630a4 100644
|
||||
pass # no-op when os.register_at_fork does not exist.
|
||||
else:
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 44b1ed3fb034a0ad699190462e9b74779c713dd4 Mon Sep 17 00:00:00 2001
|
||||
From 8a3b2053eff0af149b8118045a1e5263479557b6 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()
|
||||
@@ -552,10 +552,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 db3e051..614c5a8 100644
|
||||
index 997df43..8b660b4 100644
|
||||
--- a/Modules/socketmodule.c
|
||||
+++ b/Modules/socketmodule.c
|
||||
@@ -3325,7 +3325,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro)
|
||||
@@ -3327,7 +3327,7 @@ sock_connect(PySocketSockObject *s, PyObject *addro)
|
||||
}
|
||||
|
||||
res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1);
|
||||
@@ -564,7 +564,7 @@ index db3e051..614c5a8 100644
|
||||
return NULL;
|
||||
|
||||
Py_RETURN_NONE;
|
||||
@@ -3356,7 +3356,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro)
|
||||
@@ -3358,7 +3358,7 @@ sock_connect_ex(PySocketSockObject *s, PyObject *addro)
|
||||
}
|
||||
|
||||
res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 0);
|
||||
@@ -574,17 +574,17 @@ index db3e051..614c5a8 100644
|
||||
|
||||
return PyLong_FromLong((long) res);
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From d5b4f946259e8061d365176bcac866a2627511a6 Mon Sep 17 00:00:00 2001
|
||||
From 06bddd0cdf4e2529a6cea35fc126ef5477f37b1c Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
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 2e4a66a..0a80ca7 100644
|
||||
index 9ac021f..c77ba68 100644
|
||||
--- a/Modules/posixmodule.c
|
||||
+++ b/Modules/posixmodule.c
|
||||
@@ -3112,11 +3112,14 @@ static PyObject *
|
||||
@@ -604,10 +604,10 @@ index 2e4a66a..0a80ca7 100644
|
||||
if (buffer == NULL) {
|
||||
return PyErr_NoMemory();
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 6a7904e4ae7fb1b1d58939189f1b25bd4000cc3f Mon Sep 17 00:00:00 2001
|
||||
From b5cd57a0b38a76ed5049e8335700df28580b649e Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Wed, 5 Oct 2022 16:09:41 -0300
|
||||
Subject: The rest of korli's "initial Haiku patch".
|
||||
@@ -648,10 +648,10 @@ index ebe3711..63e2742 100644
|
||||
# This is done to support downstream modifications where distributors change
|
||||
# the installation layout (eg. different site-packages directory).
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index e1cbb7c..7b261b5 100644
|
||||
index 52d5c1f..78567be 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1495,6 +1495,16 @@ if test $enable_shared = "yes"; then
|
||||
@@ -1503,6 +1503,16 @@ if test $enable_shared = "yes"; then
|
||||
PY3LIBRARY=libpython3.so
|
||||
fi
|
||||
;;
|
||||
@@ -668,7 +668,7 @@ index e1cbb7c..7b261b5 100644
|
||||
hp*|HP*)
|
||||
case `uname -m` in
|
||||
ia64)
|
||||
@@ -1651,6 +1661,7 @@ AC_PROG_MKDIR_P
|
||||
@@ -1659,6 +1669,7 @@ AC_PROG_MKDIR_P
|
||||
AC_SUBST(LN)
|
||||
if test -z "$LN" ; then
|
||||
case $ac_sys_system in
|
||||
@@ -676,7 +676,7 @@ index e1cbb7c..7b261b5 100644
|
||||
CYGWIN*) LN="ln -s";;
|
||||
*) LN=ln;;
|
||||
esac
|
||||
@@ -3256,7 +3267,7 @@ then
|
||||
@@ -3264,7 +3275,7 @@ then
|
||||
else CCSHARED="+z";
|
||||
fi;;
|
||||
Linux-android*) ;;
|
||||
@@ -685,7 +685,7 @@ index e1cbb7c..7b261b5 100644
|
||||
Emscripten*|WASI*)
|
||||
AS_VAR_IF([enable_wasm_dynamic_linking], [yes], [
|
||||
CCSHARED="-fPIC"
|
||||
@@ -3289,7 +3300,7 @@ then
|
||||
@@ -3297,7 +3308,7 @@ then
|
||||
LINKFORSHARED="-Wl,-E -Wl,+s";;
|
||||
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
|
||||
Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
|
||||
@@ -694,7 +694,7 @@ index e1cbb7c..7b261b5 100644
|
||||
# -u libsys_s pulls in all symbols in libsys
|
||||
Darwin/*)
|
||||
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
|
||||
@@ -5344,6 +5355,7 @@ AC_CHECK_FUNC(__fpu_control,
|
||||
@@ -5352,6 +5363,7 @@ AC_CHECK_FUNC(__fpu_control,
|
||||
AC_SUBST(LIBM)
|
||||
case $ac_sys_system in
|
||||
Darwin) ;;
|
||||
@@ -727,10 +727,10 @@ index 4f122b6..dc42f39 100644
|
||||
if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']:
|
||||
self.lib_dirs += ['/usr/ccs/lib']
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 264960853e6c4acdba649d6aeeb9e7d16002a86d Mon Sep 17 00:00:00 2001
|
||||
From 9bfff6217e20682d79cbc465a0aecf900ba355f0 Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Mon, 24 Oct 2022 20:04:10 -0300
|
||||
Subject: Lib/test: require the "largefile" usage flag for I/O heavy tests.
|
||||
@@ -741,10 +741,10 @@ 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 e54a13c..71d13e5 100644
|
||||
index 7853705..ffde3a7 100644
|
||||
--- a/Lib/test/test_io.py
|
||||
+++ b/Lib/test/test_io.py
|
||||
@@ -609,7 +609,7 @@ class IOTest(unittest.TestCase):
|
||||
@@ -613,7 +613,7 @@ class IOTest(unittest.TestCase):
|
||||
# On Windows and Mac OSX this test consumes large resources; It takes
|
||||
# a long time to build the >2 GiB file and takes >2 GiB of disk space
|
||||
# therefore the resource must be enabled to run this test.
|
||||
@@ -780,10 +780,10 @@ index dfcf303..611d3c8 100644
|
||||
'test requires %s bytes and a long time to run' % str(0x180000000))
|
||||
f = open(TESTFN, 'w+b')
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 1cbfe24473c33347afffab23635d87aa69b8f708 Mon Sep 17 00:00:00 2001
|
||||
From 4d17c9efbc6546f643d7f4f2d30c2b9de93dcf2d Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Tue, 7 Mar 2023 18:29:29 +0100
|
||||
Subject: default schemes for Haiku
|
||||
@@ -867,10 +867,10 @@ index 63e2742..6ba9d18 100644
|
||||
return {
|
||||
'prefix': 'nt',
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
|
||||
From 3a60e8925c496a98183eb7a6f3ec4c4a3b4faf1b Mon Sep 17 00:00:00 2001
|
||||
From da95612a7296813a2b12c4d82bb8fbd335560072 Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Fri, 10 Mar 2023 20:15:14 -0300
|
||||
Subject: syncronize both _getuserbase() copies on site.py and sysconfig.py.
|
||||
@@ -896,5 +896,5 @@ index 6ba9d18..c3e8dbc 100644
|
||||
|
||||
_HAS_USER_BASE = (_getuserbase() is not None)
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 5883f7abbe78fecb71a0dc1f9ea7752000aaca5c Mon Sep 17 00:00:00 2001
|
||||
From f85c391be71e71e7d07d579aef5e059bd3df3fe6 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sat, 3 Feb 2018 11:33:49 +0100
|
||||
Subject: Fix include paths for secondary x86
|
||||
@@ -37,5 +37,5 @@ index dc42f39..1c6db8f 100644
|
||||
if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']:
|
||||
self.lib_dirs += ['/usr/ccs/lib']
|
||||
--
|
||||
2.37.3
|
||||
2.42.1
|
||||
|
||||
@@ -13,7 +13,7 @@ LICENSE="Python"
|
||||
COPYRIGHT="1990-2023 Python Software Foundation"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="0fab78fa7f133f4f38210c6260d90d7c0d5c7198446419ce057ec7ac2e6f5f38"
|
||||
CHECKSUM_SHA256="18e1aa7e66ff3a58423d59ed22815a6954e53342122c45df20c96877c062b9b7"
|
||||
SOURCE_DIR="Python-$portVersion"
|
||||
|
||||
pyShortVer="${portVersion%.*}"
|
||||
@@ -285,6 +285,10 @@ TEST()
|
||||
# 3.11
|
||||
-x test_urllib2net
|
||||
-x test_venv
|
||||
|
||||
# 3.11.7, these take way too much time (hang?)
|
||||
-x test_builtin
|
||||
-x test_importlib
|
||||
)
|
||||
|
||||
local -x LOGNAME=buildbot # this skips tests_tools/test_freeze, copied from Gentoo's ebuild
|
||||
Reference in New Issue
Block a user