<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/4b43a62994a22c90be7dd0c96d570ad42accb48d">https://github.com/macports/macports-ports/commit/4b43a62994a22c90be7dd0c96d570ad42accb48d</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 4b43a62994a iTerm2: change Makefile patch to fix linking issue
</span>4b43a62994a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4b43a62994a22c90be7dd0c96d570ad42accb48d
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Wed Apr 28 23:47:57 2021 +0800
<span style='display:block; white-space:pre;color:#404040;'> iTerm2: change Makefile patch to fix linking issue
</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/62769
</span>---
aqua/iTerm2/Portfile | 4 ++--
aqua/iTerm2/files/patch-Makefile-XC10.diff | 28 +++++++---------------------
2 files changed, 9 insertions(+), 23 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 2888286eee5..240b8d461d0 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,7 +7,7 @@ PortGroup xcodeversion 1.0
</span>
if {${os.major} > 17} {
version 3.4.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums rmd160 699ffdb3fb911c0cc2ee3e274253694345aaf8df \
sha256 c6bd43aa2b1f2ff09e3180b7e2f2107ea42f4eaee48a27daf7a8889288a6cfb5 \
size 28916294
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ if {${os.major} > 17} {
</span> patch-nsur.diff
} elseif {${os.major} > 16} {
version 3.3.12
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> checksums rmd160 37d4204f97ac42431c5774a943ca0ab8f9a4c669 \
sha256 6eeeb3215d6725aa789d39108a8ebedbe1aa9f6d058dd33056d72471ecd02e14 \
size 20602868
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/iTerm2/files/patch-Makefile-XC10.diff b/aqua/iTerm2/files/patch-Makefile-XC10.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b2011d0c91..7a683d0bffe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/iTerm2/files/patch-Makefile-XC10.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/iTerm2/files/patch-Makefile-XC10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +1,12 @@
</span> Declare dependencies so we don't unnecessarily rebuild when running "make install"
--- Makefile.orig 2018-10-29 12:31:47.000000000 -0400
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile 2018-11-04 14:07:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2021-04-28 23:26:11.000000000 +0800
</span> @@ -21,7 +21,7 @@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ TAGS:
</span> find . -name "*.[mhMH]" -exec etags -o ./TAGS -a '{}' +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install: | Deployment backup-old-iterm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -R build/Deployment/iTerm2.app $(APPS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -R DerivedData/Build/Products/Deployment/iTerm2.app $(APPS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-install: | Deployment backup-old-iterm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -R build/Deployment/iTerm2.app $(APPS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> Development:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Using PATH for build: $(PATH)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,9 +36,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xcodebuild -parallelizeTargets -target iTerm2 -configuration Beta && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- chmod -R go+rX build/Beta
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Deployment:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xcodebuild -parallelizeTargets -target iTerm2 -configuration Deployment && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- chmod -R go+rX build/Deployment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Deployment: build/Deployment/iTerm2.app/Contents/MacOS/iTerm2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+build/Deployment/iTerm2.app/Contents/MacOS/iTerm2:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xcodebuild -parallelizeTargets -target iTerm2 -configuration Deployment -scheme iTerm2 -derivedDataPath ./DerivedData && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ chmod -R go+rX DerivedData/Build/Products/Deployment
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Nightly: force
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp plists/nightly-iTerm2.plist plists/iTerm2.plist
</span></pre><pre style='margin:0'>
</pre>