<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/12828a47e14958dc504061e5c4b40bc993ceb7aa">https://github.com/macports/macports-ports/commit/12828a47e14958dc504061e5c4b40bc993ceb7aa</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 12828a4 vim: fix test for SDK newer than 10.6
</span>12828a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 12828a47e14958dc504061e5c4b40bc993ceb7aa
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Oct 7 14:44:22 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> vim: fix test for SDK newer than 10.6
</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/56994
</span>---
editors/vim/Portfile | 3 ++
.../patch-vim-src-os_macosx-availability.diff | 40 ++++++++++++++++++++++
2 files changed, 43 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/Portfile b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b4af94..00e8538 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,9 @@ depends_lib port:ncurses \
</span> port:gettext \
port:libiconv
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix test macro for sdk check
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-vim-src-os_macosx-availability.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
set features [open ${worksrcpath}/src/feature.h a+]
puts $features "#define SYS_VIMRC_FILE \"${prefix}/etc/vimrc\""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/files/patch-vim-src-os_macosx-availability.diff b/editors/vim/files/patch-vim-src-os_macosx-availability.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..825ca41
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/files/patch-vim-src-os_macosx-availability.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/os_macosx.m src/os_macosx.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 752bdae..50ca361 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/os_macosx.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/os_macosx.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -63,7 +63,7 @@ clip_mch_request_selection(VimClipboard *cbd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSPasteboard *pb = [NSPasteboard generalPasteboard];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSPasteboardTypeString, nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -99,7 +99,7 @@ clip_mch_request_selection(VimClipboard *cbd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Use NSPasteboardTypeString. The motion type is detected automatically.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSMutableString *mstring =
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [[pb stringForType:NSPasteboardTypeString] mutableCopy];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -188,7 +188,7 @@ clip_mch_set_selection(VimClipboard *cbd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* See clip_mch_request_selection() for info on pasteboard types. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSPasteboard *pb = [NSPasteboard generalPasteboard];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *supportedTypes = [NSArray arrayWithObjects:VimPboardType,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSPasteboardTypeString, nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +201,7 @@ clip_mch_set_selection(VimClipboard *cbd)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSArray *plist = [NSArray arrayWithObjects:motion, string, nil];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [pb setPropertyList:plist forType:VimPboardType];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef AVAILABLE_MAC_OS_X_VERSION_10_6_AND_LATER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [pb setString:string forType:NSPasteboardTypeString];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [pb setString:string forType:NSStringPboardType];
</span></pre><pre style='margin:0'>
</pre>