<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/953b34e55199168649e3c6aaa6b5429f0e0b921a">https://github.com/macports/macports-ports/commit/953b34e55199168649e3c6aaa6b5429f0e0b921a</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 953b34e5519 iTerm2: do not execute python script at all
</span>953b34e5519 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 953b34e55199168649e3c6aaa6b5429f0e0b921a
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Tue Jun 14 03:19:19 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> iTerm2: do not execute python script at all
</span>---
aqua/iTerm2/Portfile | 18 ++-------
aqua/iTerm2/files/patch-python3.diff | 73 ------------------------------------
2 files changed, 4 insertions(+), 87 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/iTerm2/Portfile b/aqua/iTerm2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ead56e9c00..9ddaa6b531f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/iTerm2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/iTerm2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,14 +7,13 @@ PortGroup xcodeversion 1.0
</span>
if {${os.major} > 17} {
version 3.4.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span> checksums rmd160 a5319483e324f6408952d6db41a45860bd90cb20 \
sha256 2348fa198a36cd003a124573cb547f2da8266252479db70e60e17cdcfe32d89d \
size 29047663
patchfiles patch-Makefile-XC10.diff \
patch-remove-sparkle-3.4.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-nsur.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-nsur.diff
</span> } elseif {${os.major} > 16} {
version 3.3.12
revision 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,20 +49,11 @@ long_description \
</span>
homepage https://iterm2.com/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> github.livecheck.regex {(\d+(?:\.\d+)*)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# manually fix python interpreter before upstream has a fix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 21} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python310 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-pyobjc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#!/usr/bin/python3|#!${prefix}/bin/python3.10|" ${worksrcpath}/tools/updateVersion.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch the python script out since it does not set the correct version and may cause trouble
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|exec tools/updateVersion.py|exec /usr/bin/true|g" ${worksrcpath}/iTerm2.xcodeproj/project.pbxproj
</span> # macOS 13/Xcode 14 seems to be requiring code signing
if {[vercmp ${xcodeversion} 14] >= 0} {
reinplace "s|CODE_SIGN_IDENTITY = \".*\";|CODE_SIGN_IDENTITY = \"-\";|g" ${worksrcpath}/iTerm2.xcodeproj/project.pbxproj
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/iTerm2/files/patch-python3.diff b/aqua/iTerm2/files/patch-python3.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 73eee337536..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/iTerm2/files/patch-python3.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,73 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/sources/PTYSession.m b/sources/PTYSession.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 28724c40c3..8132d872b3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- sources/PTYSession.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ sources/PTYSession.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2261,7 +2261,7 @@ - (NSDictionary *)environmentForNewJobFromEnvironment:(NSDictionary *)environmen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- substitutions:(NSDictionary *)substitutions {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DLog(@"environmentForNewJobFromEnvironment:%@ substitutions:%@",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- environment, substitutions);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSMutableDictionary *env = [[environment mutableCopy] autorelease];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSMutableDictionary *env = environment ? [[environment mutableCopy] autorelease] : [NSMutableDictionary dictionary];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (env[TERM_ENVNAME] == nil) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- env[TERM_ENVNAME] = _termVariable;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/tools/updateVersion.py b/tools/updateVersion.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 82ec7ce5c5..e5c58aff9f 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- tools/updateVersion.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ tools/updateVersion.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,41 +1,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!/usr/bin/python3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import commands
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import time
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import subprocess
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- del os.environ["MACOSX_DEPLOYMENT_TARGET"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ del os.environ["MACOSX_DEPLOYMENT_TARGET"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except KeyError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from Foundation import NSMutableDictionary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.environ["CONFIGURATION"] == "Development":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cmd = "git log -1 --format=\"%H\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- status, output = commands.getstatusoutput(cmd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if status != 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sys.exit(status)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cmd = "git log -1 --format=\"%H\""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ output = subprocess.check_output(cmd, shell=True).decode("utf-8")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- revision = "git.unknown"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- for line in output.split("\n"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if len(line.strip()) > 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- revision = "git." + line.strip()[:10]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- break
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ revision = "git.unknown"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for line in output.split("\n"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if len(line.strip()) > 0:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ revision = "git." + line.strip()[:10]
</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;'>- elif os.environ["CONFIGURATION"] == "Nightly":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- revision = time.strftime("%Y%m%d-nightly")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ revision = time.strftime("%Y%m%d-nightly")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- revision = time.strftime("%Y%m%d")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ revision = time.strftime("%Y%m%d")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildDir = os.environ["BUILT_PRODUCTS_DIR"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- infoFile = os.environ["INFOPLIST_PATH"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path = os.path.join(buildDir, infoFile)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plist = NSMutableDictionary.dictionaryWithContentsOfFile_(path)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version = open("version.txt").read().strip() % {"extra": revision}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--print "Updating versions:", infoFile, version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+print("Updating versions:", infoFile, version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plist["CFBundleShortVersionString"] = version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plist["CFBundleGetInfoString"] = version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plist["CFBundleVersion"] = version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- plist.writeToFile_atomically_(path, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span></pre><pre style='margin:0'>
</pre>