<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/32c5c1e4a77f9a7437e74be6fb25551fd2e17e6e">https://github.com/macports/macports-ports/commit/32c5c1e4a77f9a7437e74be6fb25551fd2e17e6e</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 32c5c1e4a77 aquaterm: fix xcode build
</span>32c5c1e4a77 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 32c5c1e4a77f9a7437e74be6fb25551fd2e17e6e
</span>Author: Colin Gilgenbach <colin@gilgenbach.net>
AuthorDate: Tue Oct 25 13:45:23 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> aquaterm: fix xcode build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes aquaterm build. A file was specified in the bundle twice,
</span><span style='display:block; white-space:pre;color:#404040;'> which newer versions of xcode seem to error out on. In the past
</span><span style='display:block; white-space:pre;color:#404040;'> this was fixed using '-UseNewBuildSystem=NO' on xcode >=10, but
</span><span style='display:block; white-space:pre;color:#404040;'> this fix no longer works.
</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/65749
</span><span style='display:block; white-space:pre;color:#404040;'> References: https://trac.macports.org/ticket/56895
</span>---
aqua/aquaterm/Portfile | 2 +-
aqua/aquaterm/files/project-copyfiles.patch | 38 +++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/aquaterm/Portfile b/aqua/aquaterm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6b78b4255d4..6469620bb60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/aquaterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/aquaterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums rmd160 007db0806a2b1b1263043647035fa428b15560e3 \
</span>
build.dir ${worksrcpath}/aquaterm
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles no-NSMailDelivery.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles no-NSMailDelivery.patch project-copyfiles.patch
</span>
xcode.target AquaTerm
xcode.configuration Default
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/aquaterm/files/project-copyfiles.patch b/aqua/aquaterm/files/project-copyfiles.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b0eb8ac4b5e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/aquaterm/files/project-copyfiles.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,38 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aquaterm/AquaTerm.xcodeproj/project.pbxproj.orig 2013-08-09 08:08:35 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aquaterm/AquaTerm.xcodeproj/project.pbxproj 2022-10-25 13:36:48 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,7 +28,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CB3949DA0E8D7A5B00BA7404 /* AquaTerm.bridgesupport in Resources */ = {isa = PBXBuildFile; fileRef = CB3949D90E8D7A5B00BA7404 /* AquaTerm.bridgesupport */; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CB58A20006F9A60900AF8A5E /* AQTAdapter.html in Resources */ = {isa = PBXBuildFile; fileRef = CB58A1FE06F9A60900AF8A5E /* AQTAdapter.html */; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CB58A20106F9A60900AF8A5E /* help.html in Resources */ = {isa = PBXBuildFile; fileRef = CB58A1FF06F9A60900AF8A5E /* help.html */; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CB58A20206F9A62300AF8A5E /* help.html in CopyFiles */ = {isa = PBXBuildFile; fileRef = CB58A1FF06F9A60900AF8A5E /* help.html */; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CB58A23B06FA0FB600AF8A5E /* ReadMe.rtf in Resources */ = {isa = PBXBuildFile; fileRef = CB58A23A06FA0FB600AF8A5E /* ReadMe.rtf */; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CB72184906072CF6008DCEAD /* ReleaseNotes in Resources */ = {isa = PBXBuildFile; fileRef = CB72184806072CF6008DCEAD /* ReleaseNotes */; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CB91252B07CB488C001D5EAF /* AQTAdapter.h in Headers */ = {isa = PBXBuildFile; fileRef = CBF3082D04D51B9300EBD329 /* AQTAdapter.h */; settings = {ATTRIBUTES = (Public, ); }; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,19 +111,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* End PBXContainerItemProxy section */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* Begin PBXCopyFilesBuildPhase section */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CB58A1F406F9A53300AF8A5E /* CopyFiles */ = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- isa = PBXCopyFilesBuildPhase;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- buildActionMask = 2147483647;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dstPath = "";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dstSubfolderSpec = 7;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- files = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CB58A20206F9A62300AF8A5E /* help.html in CopyFiles */,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- runOnlyForDeploymentPostprocessing = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* End PBXCopyFilesBuildPhase section */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Begin PBXFileReference section */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -546,7 +532,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CBC4B43205E4C784001BE8D7 /* Resources */,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CBC4B43B05E4C784001BE8D7 /* Sources */,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CBC4B44505E4C784001BE8D7 /* Frameworks */,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CB58A1F406F9A53300AF8A5E /* CopyFiles */,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ buildRules = (
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ );
</span></pre><pre style='margin:0'>
</pre>