RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 17:07:34 +00:00
Code Issues Activity Actions

Ports: Update Python to 3.11.5

Browse source 
Released on 2023-08-24.
https://www.python.org/downloads/release/python-3115/
This commit is contained in:
Linus Groh 2023-08-29 22:03:39 +02:00 • committed by Andrew Kaster
parent 4d26e4650f
commit ebb7079795
8 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ports/AvailablePorts.md
View file

@ -246,7 +246,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`printf`](printf/) | printf (OpenBSD) | 6.6 | https://github.com/ibara/libpuffy |
| [`pt2-clone`](pt2-clone/) | ProTracker 2 clone | 1.49 | https://github.com/8bitbubsy/pt2-clone |
| [`pv`](pv/) | Pipe Viewer | 1.6.20 | http://www.ivarch.com/programs/pv.shtml |
| [`python3`](python3/) | Python | 3.11.3 | https://www.python.org/ |
| [`python3`](python3/) | Python | 3.11.5 | https://www.python.org/ |
| [`qemu`](qemu/) | QEMU | 8.0.3 | https://qemu.org |
| [`qoi`](qoi/) | Quite OK Image Format for fast, lossless image compression | edb8d7b | https://github.com/phoboslab/qoi |
| [`qt6-qt5compat`](qt6-qt5compat/) | Qt6 Qt5Compat | 6.4.0 | https://doc.qt.io/qt-6/qtcore5-index.html |

14
Ports/python3/patches/0002-Tweak-configure-and-configure.ac.patch
View file

@ -12,10 +12,10 @@ As usual, make the `configure` script recognize Serenity. Also set
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 784f8d306092afb980dc7730eccaac1b134c52df..143ff27f07a8605510bca258bee3e621c95d34b8 100755
index af4a5bbfdfa1a4cc8069f67f4e4fe20a35fd27ee..c358ca4e8ba46155550c4ce8a25c8486dc45e2aa 100755
--- a/configure
+++ b/configure
@@ -3811,6 +3811,9 @@ then
@@ -3814,6 +3814,9 @@ then
# a lot of different things including 'define_xopen_source'
# in the case statement below.
case "$host" in
@ -25,7 +25,7 @@ index 784f8d306092afb980dc7730eccaac1b134c52df..143ff27f07a8605510bca258bee3e621
*-*-linux-android*)
ac_sys_system=Linux-android
;;
@@ -3855,6 +3858,7 @@ then
@@ -3858,6 +3861,7 @@ then
linux*) MACHDEP="linux";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
@ -33,7 +33,7 @@ index 784f8d306092afb980dc7730eccaac1b134c52df..143ff27f07a8605510bca258bee3e621
'') MACHDEP="unknown";;
esac
fi
@@ -3864,6 +3868,9 @@ $as_echo "\"$MACHDEP\"" >&6; }
@@ -3867,6 +3871,9 @@ $as_echo "\"$MACHDEP\"" >&6; }
if test "$cross_compiling" = yes; then
case "$host" in
@ -43,7 +43,7 @@ index 784f8d306092afb980dc7730eccaac1b134c52df..143ff27f07a8605510bca258bee3e621
*-*-linux*)
case "$host_cpu" in
arm*)
@@ -10834,7 +10841,7 @@ then
@@ -11065,7 +11072,7 @@ then
LINKFORSHARED="-Wl,-E -Wl,+s";;
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;
@ -53,7 +53,7 @@ index 784f8d306092afb980dc7730eccaac1b134c52df..143ff27f07a8605510bca258bee3e621
Darwin/*)
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
diff --git a/configure.ac b/configure.ac
index ab5e1de6fabd38ad468ad57392b232de2101011d..17f93fdf69007f322c29b4fbdb4fe16e75ca2520 100644
index e1cbb7c7fbe9d94d72ac9ce001f284ba5d0a7dcd..818044ad846dd47cd7d425e8870dc446971cb77a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -536,6 +536,9 @@ then
@ -84,7 +84,7 @@ index ab5e1de6fabd38ad468ad57392b232de2101011d..17f93fdf69007f322c29b4fbdb4fe16e
*-*-linux*)
case "$host_cpu" in
arm*)
@@ -3247,7 +3254,7 @@ then
@@ -3289,7 +3296,7 @@ then
LINKFORSHARED="-Wl,-E -Wl,+s";;
# LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";;
Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";;

2
Ports/python3/patches/0003-Include-sys-uio.h-in-socketmodule.c.patch
View file

@ -10,7 +10,7 @@ the `socket` module.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 14af496a45f4788dc55ec3d959c2de45147725bc..9dcad434af405f0a6f6233f36ef1e1062086050e 100644
index e6d983afa7da85622c0f0e2032e0cb41adc337a2..e29c4b432aed97a99311fe37d8c4b16be3eb4962 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -175,7 +175,7 @@ shutdown(how) -- shut down traffic in one or both directions\n\

4
Ports/python3/patches/0004-Tweak-setup.py.patch
View file

@ -17,7 +17,7 @@ Make some tweaks to Python's `setup.py`:
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
index 15d0d4576a4772e9920ac2d7c1a9dee75c29b341..e651ac7627e8b796f8b9b4d60f592bc9261b6540 100644
index 4f122b62e0e708fa4feff0ae94cf9949805b35d2..382950a814c06bda1b9a2dc4bb7ade39f16823ca 100644
--- a/setup.py
+++ b/setup.py
@@ -868,8 +868,8 @@ class PyBuildExt(build_ext):
@ -31,7 +31,7 @@ index 15d0d4576a4772e9920ac2d7c1a9dee75c29b341..e651ac7627e8b796f8b9b4d60f592bc9
# lib_dirs and inc_dirs are used to search for files;
# if a file is found in one of those directories, it can
# be assumed that no additional -I,-L directives are needed.
@@ -1117,7 +1117,12 @@ class PyBuildExt(build_ext):
@@ -1120,7 +1120,12 @@ class PyBuildExt(build_ext):
# Curses support, requiring the System V version of curses, often
# provided by the ncurses library.
curses_defines = []

2
Ports/python3/patches/0005-Tweak-setup.py-sysroot-detection.patch
View file

@ -15,7 +15,7 @@ in the detection code.
1 file changed, 2 insertions(+)
diff --git a/setup.py b/setup.py
index e651ac7627e8b796f8b9b4d60f592bc9261b6540..c4c4e92309a952a88d9de1b853a9535cb86913cc 100644
index 382950a814c06bda1b9a2dc4bb7ade39f16823ca..ceac9cbdad9f9a7bc1fd1ee5d4626e3ff0728c3d 100644
--- a/setup.py
+++ b/setup.py
@@ -166,6 +166,8 @@ def sysroot_paths(make_vars, subdirs):

4
Ports/python3/patches/0006-Workaround-for-unsupported-socket-option.patch
View file

@ -12,10 +12,10 @@ For now, it can be safely ignored until it's supported in the kernel.
1 file changed, 2 insertions(+)
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 9dcad434af405f0a6f6233f36ef1e1062086050e..a53a510b0c779dfbba7428229b34e8a23c69ee9e 100644
index e29c4b432aed97a99311fe37d8c4b16be3eb4962..bcd6233ad6a5f11a34b515630dbadf14ab43854d 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -3043,6 +3043,8 @@ sock_setsockopt(PySocketSockObject *s, PyObject *args)
@@ -3045,6 +3045,8 @@ sock_setsockopt(PySocketSockObject *s, PyObject *args)
PyBuffer_Release(&optval);
done:

4
Ports/python3/patches/0007-Set-name-of-shared-libpython.patch
View file

@ -8,10 +8,10 @@ Subject: [PATCH] Set name of shared libpython
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure b/configure
index 143ff27f07a8605510bca258bee3e621c95d34b8..1d30d0acfacfeeb31b4953e6512c51741cf9554c 100755
index c358ca4e8ba46155550c4ce8a25c8486dc45e2aa..db10d497b4719543be8ffc65b16f3931c229dad9 100755
--- a/configure
+++ b/configure
@@ -6737,7 +6737,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
@@ -6750,7 +6750,7 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>confdefs.h
PY3LIBRARY=libpython3.so
fi
;;

6
Ports/python3/version.sh
View file

@ -1,5 +1,5 @@
PYTHON_VERSION="3.11.3"
PYTHON_VERSION_WITHOUT_SUFFIX="3.11.3" # PYTHON_VERSION but without the a1/b1/rc1/... suffix
PYTHON_VERSION="3.11.5"
PYTHON_VERSION_WITHOUT_SUFFIX="3.11.5" # PYTHON_VERSION but without the a1/b1/rc1/... suffix
PYTHON_ARCHIVE="Python-${PYTHON_VERSION}.tar.xz"
PYTHON_ARCHIVE_URL="https://www.python.org/ftp/python/${PYTHON_VERSION_WITHOUT_SUFFIX}/${PYTHON_ARCHIVE}"
PYTHON_ARCHIVE_SHA256SUM="8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e"
PYTHON_ARCHIVE_SHA256SUM="85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f"