summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Ports/AvailablePorts.md2
-rw-r--r--Ports/python3/patches/define-have-sigset-t.patch4
-rw-r--r--Ports/python3/patches/define-py-force-utf8-locale.patch4
-rw-r--r--Ports/python3/patches/fix-autoconf.patch20
-rw-r--r--Ports/python3/patches/include-sys-uio.patch4
-rw-r--r--Ports/python3/patches/tweak-setup-py.patch6
-rw-r--r--Ports/python3/version.sh4
7 files changed, 22 insertions, 22 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md
index 059b83e0d6..b4c4d5c097 100644
--- a/Ports/AvailablePorts.md
+++ b/Ports/AvailablePorts.md
@@ -131,7 +131,7 @@ Please make sure to keep this list up to date when adding and updating ports. :^
| [`SDLPoP`](SDLPoP/) | Prince of Persia game | | https://github.com/NagyD/SDLPoP |
| [`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 |
-| [`python3`](python3/) | Python | 3.10.0rc1 | https://www.python.org/ |
+| [`python3`](python3/) | Python | 3.10.0rc2 | https://www.python.org/ |
| [`quake`](quake/) | Quake | 0.65 | https://github.com/SerenityOS/SerenityQuake |
| [`quake2`](quake2/) | QuakeII | 0.1 | https://github.com/SerenityOS/SerenityQuakeII |
| [`r0`](r0/) | r0 (minimalistic commandline hexadecimal editor) | 0.8 | https://github.com/radareorg/r0 |
diff --git a/Ports/python3/patches/define-have-sigset-t.patch b/Ports/python3/patches/define-have-sigset-t.patch
index f4025d8604..70c7b98318 100644
--- a/Ports/python3/patches/define-have-sigset-t.patch
+++ b/Ports/python3/patches/define-have-sigset-t.patch
@@ -1,5 +1,5 @@
---- Python-3.10.0rc1/Modules/posixmodule.h 2021-08-03 19:01:36.368000000 +0100
-+++ Python-3.10.0rc1/Modules/posixmodule.h 2021-08-03 19:01:54.120205211 +0100
+--- Python-3.10.0rc2/Modules/posixmodule.h 2021-08-03 19:01:36.368000000 +0100
++++ Python-3.10.0rc2/Modules/posixmodule.h 2021-08-03 19:01:54.120205211 +0100
@@ -19,7 +19,8 @@
#endif /* MS_WINDOWS */
diff --git a/Ports/python3/patches/define-py-force-utf8-locale.patch b/Ports/python3/patches/define-py-force-utf8-locale.patch
index ae6f944ac2..6f1d91a5ef 100644
--- a/Ports/python3/patches/define-py-force-utf8-locale.patch
+++ b/Ports/python3/patches/define-py-force-utf8-locale.patch
@@ -1,5 +1,5 @@
---- Python-3.10.0rc1/Include/pyport.h 2021-08-03 18:40:05.313000000 +0100
-+++ Python-3.10.0rc1/Include/pyport.h 2021-08-03 18:40:28.722351782 +0100
+--- Python-3.10.0rc2/Include/pyport.h 2021-08-03 18:40:05.313000000 +0100
++++ Python-3.10.0rc2/Include/pyport.h 2021-08-03 18:40:28.722351782 +0100
@@ -843,7 +843,7 @@
# error "Py_TRACE_REFS ABI is not compatible with release and debug ABI"
#endif
diff --git a/Ports/python3/patches/fix-autoconf.patch b/Ports/python3/patches/fix-autoconf.patch
index cf087a8198..21e21ca4f2 100644
--- a/Ports/python3/patches/fix-autoconf.patch
+++ b/Ports/python3/patches/fix-autoconf.patch
@@ -1,5 +1,5 @@
---- Python-3.10.0rc1/config.sub 2021-08-03 19:03:07.361000000 +0100
-+++ Python-3.10.0rc1/config.sub 2021-08-03 19:04:06.425786525 +0100
+--- Python-3.10.0rc2/config.sub 2021-08-03 19:03:07.361000000 +0100
++++ Python-3.10.0rc2/config.sub 2021-08-03 19:04:06.425786525 +0100
@@ -1485,6 +1485,8 @@
-oss*)
os=-sysv3
@@ -9,8 +9,8 @@
-svr4*)
os=-sysv4
;;
---- Python-3.10.0rc1/configure.ac 2021-08-03 19:04:59.784000000 +0100
-+++ Python-3.10.0rc1/configure.ac 2021-08-03 19:08:42.069896469 +0100
+--- Python-3.10.0rc2/configure.ac 2021-08-03 19:04:59.784000000 +0100
++++ Python-3.10.0rc2/configure.ac 2021-08-03 19:08:42.069896469 +0100
@@ -391,6 +391,9 @@
# a lot of different things including 'define_xopen_source'
# in the case statement below.
@@ -48,9 +48,9 @@
# -u libsys_s pulls in all symbols in libsys
Darwin/*)
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
---- Python-3.10.0rc1/configure 2021-08-03 19:06:33.593000000 +0100
-+++ Python-3.10.0rc1/configure 2021-08-03 19:08:53.870858123 +0100
-@@ -3697,6 +3697,9 @@
+--- Python-3.10.0rc2/configure 2021-09-07 15:18:28.000000000 +0200
++++ Python-3.10.0rc2/configure 2021-09-18 17:01:57.104963183 +0200
+@@ -3325,6 +3325,9 @@
# a lot of different things including 'define_xopen_source'
# in the case statement below.
case "$host" in
@@ -60,7 +60,7 @@
*-*-linux-android*)
ac_sys_system=Linux-android
;;
-@@ -3735,6 +3738,7 @@
+@@ -3363,6 +3366,7 @@
linux*) MACHDEP="linux";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
@@ -68,7 +68,7 @@
'') MACHDEP="unknown";;
esac
fi
-@@ -3744,6 +3748,9 @@
+@@ -3372,6 +3376,9 @@
if test "$cross_compiling" = yes; then
case "$host" in
@@ -78,7 +78,7 @@
*-*-linux*)
case "$host_cpu" in
arm*)
-@@ -10788,7 +10795,7 @@
+@@ -9768,7 +9775,7 @@
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/include-sys-uio.patch b/Ports/python3/patches/include-sys-uio.patch
index 841027d37d..d7a724764b 100644
--- a/Ports/python3/patches/include-sys-uio.patch
+++ b/Ports/python3/patches/include-sys-uio.patch
@@ -1,5 +1,5 @@
---- Python-3.10.0rc1/Modules/socketmodule.c 2021-09-09 01:14:41.120232921 +0800
-+++ Python-3.10.0rc1/Modules/socketmodule.c 2021-08-03 03:53:59.000000000 +0800
+--- Python-3.10.0rc2/Modules/socketmodule.c 2021-09-09 01:14:41.120232921 +0800
++++ Python-3.10.0rc2/Modules/socketmodule.c 2021-08-03 03:53:59.000000000 +0800
@@ -171,7 +171,7 @@
# undef HAVE_GETHOSTBYNAME_R_6_ARG
#endif
diff --git a/Ports/python3/patches/tweak-setup-py.patch b/Ports/python3/patches/tweak-setup-py.patch
index 047bb7dff7..af1673f044 100644
--- a/Ports/python3/patches/tweak-setup-py.patch
+++ b/Ports/python3/patches/tweak-setup-py.patch
@@ -1,5 +1,5 @@
---- Python-3.10.0rc1/setup.py.orig 2021-08-02 20:53:59.000000000 +0100
-+++ Python-3.10.0rc1/setup.py 2021-09-10 20:13:51.191781791 +0100
+--- Python-3.10.0rc2/setup.py 2021-09-18 16:58:59.857000000 +0200
++++ Python-3.10.0rc2/setup.py 2021-09-18 16:59:10.448465217 +0200
@@ -832,8 +832,8 @@
add_dir_to_list(self.compiler.include_dirs,
sysconfig.get_config_var("INCLUDEDIR"))
@@ -25,7 +25,7 @@
panel_library = 'panel'
if curses_library == 'ncursesw':
curses_defines.append(('HAVE_NCURSESW', '1'))
-@@ -1847,7 +1852,12 @@
+@@ -1849,7 +1854,12 @@
def detect_uuid(self):
# Build the _uuid module if possible
diff --git a/Ports/python3/version.sh b/Ports/python3/version.sh
index f51c30b8fa..45750c71ff 100644
--- a/Ports/python3/version.sh
+++ b/Ports/python3/version.sh
@@ -1,5 +1,5 @@
-PYTHON_VERSION="3.10.0rc1"
+PYTHON_VERSION="3.10.0rc2"
PYTHON_VERSION_WITHOUT_SUFFIX="3.10.0" # 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="797061692282d0e573a0093476e57e39cf52cad56782ab2dfb79afadb3c1e638"
+PYTHON_ARCHIVE_SHA256SUM="e75b56088548b7b9ad1f2571e6f5a2315e4808cb6b5fbe8288502afc802b2f24"