<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aa18d2dabf117408afd31ea102bea59d3a577d2f">https://github.com/macports/macports-ports/commit/aa18d2dabf117408afd31ea102bea59d3a577d2f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new aa18d2dabf1 python311: update to 3.11.3
</span>aa18d2dabf1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit aa18d2dabf117408afd31ea102bea59d3a577d2f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Apr 8 09:52:21 2023 +1000
<span style='display:block; white-space:pre;color:#404040;'> python311: update to 3.11.3
</span>---
lang/python311/Portfile | 8 ++++----
lang/python311/files/static_assert.patch | 26 +++++++++++++++-----------
python/py-gdbm/Portfile | 8 ++++----
python/py-tkinter/Portfile | 8 ++++----
4 files changed, 27 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python311/Portfile b/lang/python311/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5b84410a16f..03dc89a38a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python311/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python311/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup select 1.0
</span> name python311
# Remember to keep py311-tkinter and py311-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.11.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.11.3
</span>
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,9 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 a957cffb58a89303b62124896881950b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6c6250f45f9892456896834d336bcbfd97f90f8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 c8d52fc4fb8ad9932a11d86d142ee73a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2ab568c92e89a095ecc5add44a6a18ee2c5a2358 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python311/files/static_assert.patch b/lang/python311/files/static_assert.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index bc5c22b1ea2..8d0cec0b274 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python311/files/static_assert.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python311/files/static_assert.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Include/pymacro.h.orig 2023-02-08 00:37:51
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/pymacro.h 2023-02-10 17:41:54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3,20 +3,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/python/cpython/pull/103282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Include/pymacro.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Include/pymacro.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,20 +3,23 @@
</span>
// gh-91782: On FreeBSD 12, if the _POSIX_C_SOURCE and _XOPEN_SOURCE macros are
// defined, <sys/cdefs.h> disables C11 support and <assert.h> does not define
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +15,11 @@
</span> -
-// static_assert is defined in glibc from version 2.16. Before it requires
-// compiler support (gcc >= 4.6) and is called _Static_assert.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-// In C++ 11 static_assert is a keyword, redefining is undefined behaviour.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (defined(__GLIBC__) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 16)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && !(defined(__cplusplus) && __cplusplus >= 201103L) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- && !defined(static_assert))
</span> +//
+// macOS <= 10.10 doesn't define static_assert in assert.h at all despite
+// having C11 compiler support.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,16 +27,14 @@
</span> +// static_assert is defined in glibc from version 2.16. Compiler support for
+// the C11 _Static_assert keyword is in gcc >= 4.6.
+//
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+// MSVC makes static_assert a keyword, contrary to the C standard.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// MSVC makes static_assert a keyword in C11-17, contrary to the standards.
</span> +//
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // In C++ 11 static_assert is a keyword, redefining is undefined behaviour.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if (defined(__GLIBC__) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 16)) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && !(defined(__cplusplus) && __cplusplus >= 201103L) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- && !defined(static_assert))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// So only define if building as C (if __STDC_VERSION__ is defined), not C++.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// In C++11 and C2x, static_assert is a keyword, redefining is undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// behaviour. So only define if building as C (if __STDC_VERSION__ is defined),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// not C++, and only for C11-17.
</span> +#if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__)) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ && __STDC_VERSION__ <= 201710L
</span> # define static_assert _Static_assert
#endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdbm/Portfile b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86b6cedc132..ab6b90ab520 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,12 +134,12 @@ subport py310-gdbm {
</span> }
subport py311-gdbm {
maintainers {jmr @jmroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.11.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.11.3
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 a957cffb58a89303b62124896881950b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6c6250f45f9892456896834d336bcbfd97f90f8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 c8d52fc4fb8ad9932a11d86d142ee73a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2ab568c92e89a095ecc5add44a6a18ee2c5a2358 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
</span> livecheck.regex {Python (3\.11\.[0-9]+)}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tkinter/Portfile b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 590c4ebbe74..7d205b2744e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,12 +124,12 @@ subport py310-tkinter {
</span> }
subport py311-tkinter {
maintainers {jmr @jmroot}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.11.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.11.3
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 a957cffb58a89303b62124896881950b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6c6250f45f9892456896834d336bcbfd97f90f8e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29e4b8f5f1658542a8c13e2dd277358c9c48f2b2f7318652ef1675e402b9d2af
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 c8d52fc4fb8ad9932a11d86d142ee73a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2ab568c92e89a095ecc5add44a6a18ee2c5a2358 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
</span> }
master_sites https://www.python.org/ftp/python/${version}/
</pre><pre style='margin:0'>
</pre>