<pre style='margin:0'>
Mark Anderson (markemer) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/11fad010a5e07e9fdf2c839c2d2ca84bd0ce2a15">https://github.com/macports/macports-ports/commit/11fad010a5e07e9fdf2c839c2d2ca84bd0ce2a15</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 11fad01 iTerm2: update to 3.2.7 and fix version strings (#3616)
</span>11fad01 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 11fad010a5e07e9fdf2c839c2d2ca84bd0ce2a15
</span>Author: Chih-Hsuan Yen <yen@chyen.cc>
AuthorDate: Thu Feb 14 01:03:35 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> iTerm2: update to 3.2.7 and fix version strings (#3616)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * iTerm2: update to 3.2.7 and fix version strings
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Upstream iTerm2 ships a script tools/updateVersion.py to write version
</span><span style='display:block; white-space:pre;color:#404040;'> strings to Info.plist. However, with at least Xcode 10, the correct
</span><span style='display:block; white-space:pre;color:#404040;'> version strings are later overwritten by the step
</span><span style='display:block; white-space:pre;color:#404040;'> "builtin-infoPlistUtility". Writing the version strings out at the
</span><span style='display:block; white-space:pre;color:#404040;'> post-destroot stage can make sure they are not overwritten.
</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/57625
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Try to use Xcode 10.1 on Azure Pipelines
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Call xcode-select as suggested [1] according to current installation
</span><span style='display:block; white-space:pre;color:#404040;'> paths [2].
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azdevops&tabs=yaml#xcode
</span><span style='display:block; white-space:pre;color:#404040;'> [2] https://github.com/Microsoft/azure-pipelines-image-generation/blob/master/images/macos/macos-Readme.md#xcode
</span>---
aqua/iTerm2/Portfile | 20 +++++++++++---------
azure-pipelines.yml | 3 +++
2 files changed, 14 insertions(+), 9 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 846d3f2..5c97e9d 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;'>@@ -12,11 +12,11 @@ if {[vercmp ${os.version} 17.0.0] < 0} {
</span> size 11969144
patchfiles patch-Makefile.diff
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.2.7
</span> checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 e591606dd31528da470522dbdb1ee728472dfef8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c79e6faaa0a852571d7112ca2eb85276b789a29bb06dc42c2788988cc18928f5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11834219
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 82b3f206a23189319281c2512b456bb00a498b4d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e798eb994638c30d8500b0f085c3edaf4bc51066b47df8f85153a9ec1275972f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11849614
</span> patchfiles patch-Makefile-XC10.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,11 +41,6 @@ github.livecheck.regex {(\d+(?:\.\d+)*)}
</span>
post-patch {
reinplace "s|CODE_SIGN_IDENTITY = \".*\";|CODE_SIGN_IDENTITY = \"\";|g" ${worksrcpath}/iTerm2.xcodeproj/project.pbxproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix version number
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set versionfd [open ${worksrcpath}/version.txt "w"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- puts $versionfd "${version}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close $versionfd
</span> }
compiler.cpath
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,6 +52,13 @@ build.target prod
</span>
destroot.destdir APPS=${destroot}${applications_dir}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fix version number; see iTerm2/tools/updateVersion.py for version keys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach {key} {CFBundleGetInfoString CFBundleShortVersionString CFBundleVersion} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "/usr/libexec/PlistBuddy -c \"Set :${key} ${version}\" ${destroot}${applications_dir}/iTerm2.app/Contents/Info.plist"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> minimum_xcodeversions {16 9.0 17 10.0}
if {${os.platform} eq "darwin" && ${os.major} < 16} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/azure-pipelines.yml b/azure-pipelines.yml
</span><span style='display:block; white-space:pre;color:#808080;'>index 953c760..478ac30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/azure-pipelines.yml
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/azure-pipelines.yml
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +11,9 @@ jobs:
</span> - checkout: self
fetchDepth: 64
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ - script: /bin/bash -c "sudo xcode-select -s /Applications/Xcode_10.1.app/Contents/Developer"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ displayName: 'Use Xcode 10.1'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> - script: ./_ci/bootstrap.sh
displayName: 'Run bootstrap script'
</pre><pre style='margin:0'>
</pre>