<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/50634e55d08f4d0521fd26eab0ab239556360aab">https://github.com/macports/macports-ports/commit/50634e55d08f4d0521fd26eab0ab239556360aab</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 50634e55d08 python37: update to 3.7.8
</span>50634e55d08 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 50634e55d08f4d0521fd26eab0ab239556360aab
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Mon Jun 29 22:52:53 2020 +1000
<span style='display:block; white-space:pre;color:#404040;'> python37: update to 3.7.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/60515
</span>---
lang/python37/Portfile | 13 ++-
lang/python37/files/patch-_osx_support.py.diff | 105 -------------------------
python/py-gdbm/Portfile | 10 +--
python/py-tkinter/Portfile | 10 +--
4 files changed, 16 insertions(+), 122 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37/Portfile b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 51d67b7b5da..cde3daa203a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/python37/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,14 +6,14 @@ PortGroup select 1.0
</span> name python37
# Remember to keep py37-tkinter and py37-gdbm's versions sync'd with this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.7.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.7.8
</span>
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
license PSF
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {jmr @jmroot} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {jmr @jmroot}
</span>
description An interpreted, object-oriented programming language
long_description Python is an interpreted, interactive, object-oriented \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,17 +24,16 @@ master_sites ${homepage}ftp/python/${version}/
</span>
distname Python-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 172c650156f7bea68ce31b2fd01fa766 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b36217d3ee4566d69e02076c8ff7bfa0de387b4f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 a224ef2249a18824f48fba9812f4006f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 67af3c8cbdfbadd49bbbb56690b3da90799dc687 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 43a543404b363f0037f89df8478f19db2dbc0d6f3ffee310bc2997fa71854a63
</span>
patchfiles patch-setup.py.diff \
patch-Lib-cgi.py.diff \
patch-configure.diff \
patch-Lib-ctypes-macholib-dyld.py.diff \
patch-libedit.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-xcode4bug.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure-xcode4bug.diff
</span>
depends_build port:pkgconfig
depends_lib port:bzip2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python37/files/patch-_osx_support.py.diff b/lang/python37/files/patch-_osx_support.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 72cd61ee637..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python37/files/patch-_osx_support.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/_osx_support.py.orig 2019-12-19 05:48:49.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/_osx_support.py 2019-12-21 22:05:08.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags = re.sub(r'-arch\s+\w+\s', ' ', flags, flags=re.ASCII)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- flags = re.sub('-isysroot [^ \t]*', ' ', flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags = re.sub(r'-isysroot\s*\S+', ' ', flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _config_vars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -287,7 +287,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to /usr and /System/Library by either a standalone CLT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # package or the CLT component within Xcode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = _config_vars.get('CFLAGS', '')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sdk = m.group(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not os.path.exists(sdk):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -295,7 +295,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Do not alter a config var explicitly overridden by env var
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if cv in _config_vars and cv not in os.environ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flags = _config_vars[cv]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- flags = re.sub(r'-isysroot\s+\S+(?:\s|$)', ' ', flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ flags = re.sub(r'-isysroot\s*\S+(?:\s|$)', ' ', flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _save_modified_value(_config_vars, cv, flags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _config_vars
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -320,7 +320,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stripArch = stripSysroot = True
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- stripArch = '-arch' in cc_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- stripSysroot = '-isysroot' in cc_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ stripSysroot = any(arg for arg in cc_args if arg.find('-isysroot') == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if stripArch or 'ARCHFLAGS' in os.environ:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while True:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,23 +338,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if stripSysroot:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while True:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- index = compiler_so.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not indices:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ index = indices[0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if compiler_so[index] == '-isysroot':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Strip this argument and the next one:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- del compiler_so[index:index+2]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except ValueError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # It's '-isysroot/some/path' in one arg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ del compiler_so[index:index+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check if the SDK that is used during compilation actually exists,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the universal build requires the usage of a universal SDK and not all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # users have that installed by default.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sysroot = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if '-isysroot' in cc_args:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- idx = cc_args.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sysroot = cc_args[idx+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif '-isysroot' in compiler_so:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- idx = compiler_so.index('-isysroot')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sysroot = compiler_so[idx+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ argvar = cc_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ indices = [i for i,x in enumerate(cc_args) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not indices:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ argvar = compiler_so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ indices = [i for i,x in enumerate(compiler_so) if x.find('-isysroot') == 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for idx in indices:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if argvar[idx] == '-isysroot':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sysroot = argvar[idx+1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sysroot = argvar[idx][len('-isysroot'):]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sysroot and not os.path.isdir(sysroot):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from distutils import log
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/unixccompiler.py.orig 2019-12-19 05:48:49.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/unixccompiler.py 2019-12-21 22:05:08.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,7 +288,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # vs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /usr/lib/libedit.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = sysconfig.get_config_var('CFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sysroot = '/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2019-12-21 22:01:50.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2019-12-21 22:05:08.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -110,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return MACOS_SDK_ROOT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags = sysconfig.get_config_var('CFLAGS')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r'-isysroot\s+(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r'-isysroot\s*(\S+)', cflags)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MACOS_SDK_ROOT = m.group(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</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 ded15696a49..258e3247924 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;'>@@ -110,14 +110,14 @@ subport py36-gdbm {
</span> livecheck.regex {Python (3\.6\.[0-9]+)}
}
subport py37-gdbm {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers {jmr @jmroot} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.7.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maintainers {jmr @jmroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.7.8
</span> revision 0
homepage https://docs.python.org/release/${version}/library/dbm.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 172c650156f7bea68ce31b2fd01fa766 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b36217d3ee4566d69e02076c8ff7bfa0de387b4f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 a224ef2249a18824f48fba9812f4006f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 67af3c8cbdfbadd49bbbb56690b3da90799dc687 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 43a543404b363f0037f89df8478f19db2dbc0d6f3ffee310bc2997fa71854a63
</span> set setup_py "setup-py3k.py"
set extract_files "Modules/_gdbmmodule.c Modules/clinic/_gdbmmodule.c.h"
livecheck.regex {Python (3\.7\.[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 cc3a7c7a1b7..0d671ed2764 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;'>@@ -104,14 +104,14 @@ subport py36-tkinter {
</span> set module_name tkinter
}
subport py37-tkinter {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers {jmr @jmroot} openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.7.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ maintainers {jmr @jmroot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.7.8
</span> revision 0
homepage https://docs.python.org/release/${version}/library/tkinter.html
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 172c650156f7bea68ce31b2fd01fa766 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b36217d3ee4566d69e02076c8ff7bfa0de387b4f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums md5 a224ef2249a18824f48fba9812f4006f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 67af3c8cbdfbadd49bbbb56690b3da90799dc687 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 43a543404b363f0037f89df8478f19db2dbc0d6f3ffee310bc2997fa71854a63
</span> append extract_files " Modules/tkinter.h Modules/clinic/_tkinter.c.h"
set module_name tkinter
}
</pre><pre style='margin:0'>
</pre>