<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9b960634754ff10df61f120a88f6491fe2e7cf8a">https://github.com/macports/macports-ports/commit/9b960634754ff10df61f120a88f6491fe2e7cf8a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9b960634754ff10df61f120a88f6491fe2e7cf8a
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sat Oct 21 05:23:04 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> TeXShop3: fix Sierra build, take 2
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fix dist_subdir regression
</span>---
aqua/TeXShop3/Portfile | 6 ++--
.../TeXShop3/files/patch-Sources-TSDocument.m.diff | 11 +++++++
.../patch-TeXShop.xcodeproj-project.pbxproj.diff | 37 ----------------------
3 files changed, 14 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TeXShop3/Portfile b/aqua/TeXShop3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 80e6c71..c787486 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/TeXShop3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TeXShop3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup xcodeversion 1.0
</span> name TeXShop3
conflicts TeXShop
version 3.88
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
set major [lindex [split ${version} .] 0]
categories aqua editors
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,12 +29,12 @@ worksrcdir texshopsource[strsed ${version} {/\.//}]
</span> set propername TeXShop
# stealth update to fix some Xcode 9 issues
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${name}/${version}_1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir TeXShop/${version}_1
</span>
checksums rmd160 4e9496f08c1ef989ff4a2754c79984510505484d \
sha256 e9e4eeaec00456930589871cbca803897637f6a194faaaa318fc0c9163c46637
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-TeXShop.xcodeproj-project.pbxproj.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Sources-TSDocument.m.diff
</span>
minimum_xcodeversions {16 9}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/TeXShop3/files/patch-Sources-TSDocument.m.diff b/aqua/TeXShop3/files/patch-Sources-TSDocument.m.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3388b9d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/TeXShop3/files/patch-Sources-TSDocument.m.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Sources/TSDocument.m.orig 2017-09-21 02:08:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Sources/TSDocument.m 2017-10-20 20:32:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1790,7 +1790,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (dispatch_source != NULL) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dispatch_source_cancel(dispatch_source);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- dispatch_release(dispatch_source);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // dispatch_release(dispatch_source);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dispatch_source = NULL;
</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;color:#808080;'>diff --git a/aqua/TeXShop3/files/patch-TeXShop.xcodeproj-project.pbxproj.diff b/aqua/TeXShop3/files/patch-TeXShop.xcodeproj-project.pbxproj.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e3032fc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/TeXShop3/files/patch-TeXShop.xcodeproj-project.pbxproj.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- TeXShop.xcodeproj/project.pbxproj.orig 2017-09-17 17:29:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ TeXShop.xcodeproj/project.pbxproj 2017-10-20 12:48:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -254,7 +254,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 407881900519249A006979EA /* MyPDFView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4068429B0405969B00000009 /* MyPDFView.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 407881920519249A006979EA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A7FEA54F5311CA2CBB /* Cocoa.framework */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 407881930519249A006979EA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F506285400F4F04801000001 /* Carbon.framework */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 407F694E11E65D4F00FD4359 /* TSDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 407F694D11E65D4F00FD4359 /* TSDocument.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 407F694E11E65D4F00FD4359 /* TSDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = 407F694D11E65D4F00FD4359 /* TSDocument.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 40839129060963C800266FAB /* TextFinder.h in Headers */ = {isa = PBXBuildFile; fileRef = 40839127060963C800266FAB /* TextFinder.h */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 4083912A060963C800266FAB /* TextFinder.m in Sources */ = {isa = PBXBuildFile; fileRef = 40839128060963C800266FAB /* TextFinder.m */; settings = {COMPILER_FLAGS = "-fobjc-arc"; }; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 408B6DD00F3D516C0098CCED /* TSLogWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 408B6DCE0F3D516C0098CCED /* TSLogWindow.h */; };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,6 +347,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- isEditable = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- outputFiles = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ script = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* End PBXBuildRule section */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2285,7 +2286,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildSettings = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUNDLE_VERSION = 3.14;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLANG_ENABLE_OBJC_ARC = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CODE_SIGN_IDENTITY = "Mac Developer";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CODE_SIGN_IDENTITY = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMBINE_HIDPI_IMAGES = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COPY_PHASE_STRIP = NO;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FRAMEWORK_SEARCH_PATHS = (
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2330,7 +2331,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildSettings = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUNDLE_VERSION = 3.14;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CLANG_ENABLE_OBJC_ARC = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CODE_SIGN_IDENTITY = "Mac Developer";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CODE_SIGN_IDENTITY = "";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMBINE_HIDPI_IMAGES = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COPY_PHASE_STRIP = YES;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FRAMEWORK_SEARCH_PATHS = (
</span></pre><pre style='margin:0'>
</pre>