diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 557ba64f99..19a5633928 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -154,7 +154,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^ | [`printf`](printf/) | printf (OpenBSD) | 6.6 | https://github.com/ibara/libpuffy | | [`pt2-clone`](pt2-clone/) | ProTracker 2 clone | 1.28 | https://github.com/8bitbubsy/pt2-clone | | [`pv`](pv/) | Pipe Viewer | 1.6.20 | http://www.ivarch.com/programs/pv.shtml | -| [`python3`](python3/) | Python | 3.10.1 | https://www.python.org/ | +| [`python3`](python3/) | Python | 3.10.2 | https://www.python.org/ | | [`qt6-qtbase`](qt6-qtbase/) | Qt6 QtBase | 6.2.2 | https://qt.io | | [`qt6-serenity`](qt6-serenity/) | QSerenityPlatform | | https://github.com/SerenityPorts/QSerenityPlatform | | [`quake`](quake/) | Quake | 0.65 | https://github.com/SerenityOS/SerenityQuake | diff --git a/Ports/python3/patches/0001-Enforce-UTF-8-as-the-locale-encoding.patch b/Ports/python3/patches/0001-Enforce-UTF-8-as-the-locale-encoding.patch index 6c2eec9fd4..26308b5b37 100644 --- a/Ports/python3/patches/0001-Enforce-UTF-8-as-the-locale-encoding.patch +++ b/Ports/python3/patches/0001-Enforce-UTF-8-as-the-locale-encoding.patch @@ -1,4 +1,4 @@ -From 88be19427b96ec99d861b7b6eae7bdad0c7f3bd5 Mon Sep 17 00:00:00 2001 +From 9f78eb848cce77cfb7c706ceb548b5802cc2d1fb Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 14 Jan 2022 23:35:20 +0330 Subject: [PATCH 1/4] Enforce UTF-8 as the locale encoding diff --git a/Ports/python3/patches/0002-Tweak-configure-and-configure.ac.patch b/Ports/python3/patches/0002-Tweak-configure-and-configure.ac.patch index 5663babf64..7a2afdc53a 100644 --- a/Ports/python3/patches/0002-Tweak-configure-and-configure.ac.patch +++ b/Ports/python3/patches/0002-Tweak-configure-and-configure.ac.patch @@ -1,4 +1,4 @@ -From ede554ba7adc8533d1089bf9d153009c0566ebac Mon Sep 17 00:00:00 2001 +From 90ab7a9c6b230961f5be4de7d41d34062b27eba5 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 14 Jan 2022 23:35:57 +0330 Subject: [PATCH 2/4] Tweak configure and configure.ac @@ -12,7 +12,7 @@ As usual, make the `configure` script recognize Serenity. Also set 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 2e7e0b7..f62120f 100755 +index a7d2975..5d0f410 100755 --- a/configure +++ b/configure @@ -3335,6 +3335,9 @@ then @@ -43,7 +43,7 @@ index 2e7e0b7..f62120f 100755 *-*-linux*) case "$host_cpu" in arm*) -@@ -9875,7 +9882,7 @@ then +@@ -9886,7 +9893,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 2e7e0b7..f62120f 100755 Darwin/*) LINKFORSHARED="$extra_undefs -framework CoreFoundation" diff --git a/configure.ac b/configure.ac -index 0c06914..383031e 100644 +index 5aa91cb..55bd7a0 100644 --- a/configure.ac +++ b/configure.ac @@ -391,6 +391,9 @@ then @@ -84,7 +84,7 @@ index 0c06914..383031e 100644 *-*-linux*) case "$host_cpu" in arm*) -@@ -2802,7 +2809,7 @@ then +@@ -2807,7 +2814,7 @@ then LINKFORSHARED="-Wl,-E -Wl,+s";; # LINKFORSHARED="-Wl,-E -Wl,+s -Wl,+b\$(BINLIBDEST)/lib-dynload";; Linux-android*) LINKFORSHARED="-pie -Xlinker -export-dynamic";; diff --git a/Ports/python3/patches/0003-Include-sys-uio.h-in-socketmodule.c.patch b/Ports/python3/patches/0003-Include-sys-uio.h-in-socketmodule.c.patch index 9098c8bd7c..ca115e6f59 100644 --- a/Ports/python3/patches/0003-Include-sys-uio.h-in-socketmodule.c.patch +++ b/Ports/python3/patches/0003-Include-sys-uio.h-in-socketmodule.c.patch @@ -1,4 +1,4 @@ -From d8533ba9c81ffdd11f39aa2d9fb89fd3564d4d44 Mon Sep 17 00:00:00 2001 +From 88b42a9eb046b60493c3723cbc0f81fde0181b0c Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 14 Jan 2022 23:36:28 +0330 Subject: [PATCH 3/4] Include `sys/uio.h` in `socketmodule.c` diff --git a/Ports/python3/patches/0004-Tweak-setup.py.patch b/Ports/python3/patches/0004-Tweak-setup.py.patch index 19ef44f3b0..7ea057a86e 100644 --- a/Ports/python3/patches/0004-Tweak-setup.py.patch +++ b/Ports/python3/patches/0004-Tweak-setup.py.patch @@ -1,4 +1,4 @@ -From 2654555e3b0f4ddce9da96eafebd74449892e713 Mon Sep 17 00:00:00 2001 +From bd79f48415f3e3982d8d5b96cb22b2b87de4abc4 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Fri, 14 Jan 2022 23:36:52 +0330 Subject: [PATCH 4/4] Tweak `setup.py` diff --git a/Ports/python3/version.sh b/Ports/python3/version.sh index 9c9c2be02f..0fb47bdf77 100644 --- a/Ports/python3/version.sh +++ b/Ports/python3/version.sh @@ -1,5 +1,5 @@ -PYTHON_VERSION="3.10.1" -PYTHON_VERSION_WITHOUT_SUFFIX="3.10.1" # PYTHON_VERSION but without the a1/b1/rc1/... suffix +PYTHON_VERSION="3.10.2" +PYTHON_VERSION_WITHOUT_SUFFIX="3.10.2" # 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="a7f1265b6e1a5de1ec5c3ec7019ab53413469934758311e9d240c46e5ae6e177" +PYTHON_ARCHIVE_SHA256SUM="17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7"