<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/76465fb062420eadfcf79b6806a40a4ea90de9c1">https://github.com/macports/macports-ports/commit/76465fb062420eadfcf79b6806a40a4ea90de9c1</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 76465fb0624 python38: update to 3.8.20
</span>76465fb0624 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 76465fb062420eadfcf79b6806a40a4ea90de9c1
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Sep 7 16:32:22 2024 +1000
<span style='display:block; white-space:pre;color:#404040;'> python38: update to 3.8.20
</span>---
lang/python38/Portfile | 33 ++++++++++++++++++---------------
lang/python38/files/implicit-int.patch | 11 +++++++++++
python/py-gdbm/Portfile | 8 ++++----
python/py-tkinter/Portfile | 8 ++++----
4 files changed, 37 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/Portfile b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf1adf635a1..1e9a5cdc959 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ name python38
</span>
epoch 1
# Remember to keep py38-tkinter, py38-htmldocs, and py38-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.8.20
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,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 2532d25930266546822c144b99652254 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9eede506febbecb73e4ffe0974fda791a23d9b96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 745478c81d6382cf46b5e7ad89e56008 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1d03db4e018f2133f2b279a3a44f0c7c759c50cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,8 @@ patchfiles patch-setup.py.diff \
</span> patch-configure-xcode4bug.diff \
sysconfig.py.diff \
distutils_spawn.py.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libedit-types.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libedit-types.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit-int.patch
</span>
if {${os.platform} eq "darwin" && ${os.major} <= 10} {
# work around no copyfile and/or pthread_threadid_np on older systems
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +46,7 @@ if {${os.platform} eq "darwin" && ${os.major} <= 10} {
</span> patch-threadid-older-systems.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build path:bin/pkg-config:pkgconfig
</span> depends_lib port:bzip2 \
port:expat \
port:gettext-runtime \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,9 +102,7 @@ test.target test
</span> destroot.target frameworkinstall maninstall
platform darwin {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewpath ${frameworks_dir}/Python.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewdir ${framewpath}/Versions/${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set confdir config-${branch}-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set abiflags {}
</span>
post-configure {
# poll() misbehaves on 10.8 and older
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,6 +115,10 @@ platform darwin {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framewpath ${frameworks_dir}/Python.framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set framewdir ${framewpath}/Versions/${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set confdir config-${branch}${abiflags}-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach dir { Headers Resources Python Versions/Current } {
file delete ${destroot}${framewpath}/${dir}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,15 +137,15 @@ platform darwin {
</span> set lfs_pattern {^([[:space:]]*'LINKFORSHARED':).*}
set lfs_replacement "\\1 '-L${framewdir}/lib/python${branch}/${confdir} -lpython${branch} -ldl -framework CoreFoundation',"
reinplace -E s|${lfs_pattern}|${lfs_replacement}| \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libdir}/_sysconfigdata__darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py
</span>
# remove -arch flags from the config
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libdir}/_sysconfigdata__darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py
</span>
# also remove gettext overlinking
reinplace "s|-lintl||" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${libdir}/_sysconfigdata__darwin_darwin.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py
</span>
# recompile the modified file
set python_for_build python.exe
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,9 +153,9 @@ platform darwin {
</span> if {![file exists ${worksrcpath}/${python_for_build}]} {
set python_for_build python
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata__darwin_darwin.py]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -O -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata__darwin_darwin.py]"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -OO -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata__darwin_darwin.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -O -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "env DYLD_FRAMEWORK_PATH=. ./${python_for_build} -E -OO -m compileall -d [shellescape ${framewdir}/lib/python${branch}] [shellescape ${libdir}/_sysconfigdata_${abiflags}_darwin_darwin.py]"
</span>
# Also make the sysconfig changes in the Makefile
reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION)$(ABIFLAGS) $(LIBS) $(SYSLIBS)|} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python38/files/implicit-int.patch b/lang/python38/files/implicit-int.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b2a56a3f2d3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python38/files/implicit-int.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2024-09-07 16:16:41
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2024-09-07 16:26:08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10949,7 +10949,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void *foo(void *parm) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int main(void) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_attr_t attr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_t id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (pthread_attr_init(&attr)) return (-1);
</span><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 6ff2cdf8403..f82b9245baa 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;'>@@ -104,12 +104,12 @@ subport py37-gdbm {
</span> }
subport py38-gdbm {
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.8.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.8.20
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 2532d25930266546822c144b99652254 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9eede506febbecb73e4ffe0974fda791a23d9b96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 745478c81d6382cf46b5e7ad89e56008 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1d03db4e018f2133f2b279a3a44f0c7c759c50cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4
</span> livecheck.regex {Python (3\.8\.[0-9]+)}
}
subport py39-gdbm {
<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 f7ad69fbafb..bf766b4f312 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;'>@@ -98,12 +98,12 @@ subport py37-tkinter {
</span> }
subport py38-tkinter {
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.8.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.8.20
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 2532d25930266546822c144b99652254 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 9eede506febbecb73e4ffe0974fda791a23d9b96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 745478c81d6382cf46b5e7ad89e56008 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1d03db4e018f2133f2b279a3a44f0c7c759c50cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6fb89a7124201c61125c0ab4cf7f6894df339a40c02833bfd28ab4d7691fafb4
</span> }
subport py39-tkinter {
maintainers {jmr @jmroot}
</pre><pre style='margin:0'>
</pre>