[145051] trunk/dports/editors/textmate2
and.damore at macports.org
and.damore at macports.org
Sun Jan 24 11:29:30 PST 2016
Revision: 145051
https://trac.macports.org/changeset/145051
Author: and.damore at macports.org
Date: 2016-01-24 11:29:30 -0800 (Sun, 24 Jan 2016)
Log Message:
-----------
port textmate2: upgrade to 2.0-beta8.5, avoid nag dialog at boot for outdated version; openmaintainer
Modified Paths:
--------------
trunk/dports/editors/textmate2/Portfile
Added Paths:
-----------
trunk/dports/editors/textmate2/files/patch-frameworks_license_target.diff
Removed Paths:
-------------
trunk/dports/editors/textmate2/files/3f5575cfe4016f2d8a34c6e506146b962f7aa083.patch
trunk/dports/editors/textmate2/files/75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch
trunk/dports/editors/textmate2/files/9e4e88ce76a334abe01f79e9d355623beac75831.patch
trunk/dports/editors/textmate2/files/bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch
trunk/dports/editors/textmate2/files/f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch
Modified: trunk/dports/editors/textmate2/Portfile
===================================================================
--- trunk/dports/editors/textmate2/Portfile 2016-01-24 19:07:10 UTC (rev 145050)
+++ trunk/dports/editors/textmate2/Portfile 2016-01-24 19:29:30 UTC (rev 145051)
@@ -5,7 +5,7 @@
PortGroup github 1.0
PortGroup xcodeversion 1.0
-github.setup textmate textmate 2.0-beta.8 v
+github.setup textmate textmate 2.0-beta.8.5 v
epoch 4
maintainers cal openmaintainer
@@ -35,11 +35,7 @@
patch-create_default_bundles_tbz-verbose.diff \
patch-bin__gen_build-avoid-ninja-pool-console.diff \
patch-target.diff \
- 9e4e88ce76a334abe01f79e9d355623beac75831.patch \
- f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch \
- 75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch \
- bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch \
- 3f5575cfe4016f2d8a34c6e506146b962f7aa083.patch
+ patch-frameworks_license_target.diff
# The build will fail with deployment target set to 10.8
macosx_deployment_target 10.7
Deleted: trunk/dports/editors/textmate2/files/3f5575cfe4016f2d8a34c6e506146b962f7aa083.patch
===================================================================
--- trunk/dports/editors/textmate2/files/3f5575cfe4016f2d8a34c6e506146b962f7aa083.patch 2016-01-24 19:07:10 UTC (rev 145050)
+++ trunk/dports/editors/textmate2/files/3f5575cfe4016f2d8a34c6e506146b962f7aa083.patch 2016-01-24 19:29:30 UTC (rev 145051)
@@ -1,24 +0,0 @@
-From 3f5575cfe4016f2d8a34c6e506146b962f7aa083 Mon Sep 17 00:00:00 2001
-From: Ronald Wampler <rdwampler at gmail.com>
-Date: Sat, 19 Sep 2015 10:14:07 -0400
-Subject: [PATCH] Directly convert the URL received from NSOpenPanel to a path
-Upstream-Status: Backport
-
-We call `fileURL` here but the method doesn't actually exists (it's actually a property with the getter `isFileURL`). The URLs we obtain from NSOpenPanel are paths so it's probably safe to get the path without checking if it's a proper file URL.
----
- Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm b/Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm
-index 17d2cc6..60e5c55 100644
---- ./Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm
-+++ ./Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm
-@@ -44,7 +44,7 @@ - (void)webView:(WebView*)sender runOpenPanelForFileButtonWithResultListener:(id
- NSOpenPanel* panel = [NSOpenPanel openPanel];
- [panel setDirectoryURL:[NSURL fileURLWithPath:NSHomeDirectory()]];
- if([panel runModal] == NSOKButton)
-- [resultListener chooseFilename:[[[[panel URLs] objectAtIndex:0] fileURL] path]];
-+ [resultListener chooseFilename:[[[panel URLs] objectAtIndex:0] path]];
- }
-
- - (WebView*)webView:(WebView*)sender createWebViewWithRequest:(NSURLRequest*)request
Deleted: trunk/dports/editors/textmate2/files/75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch
===================================================================
--- trunk/dports/editors/textmate2/files/75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch 2016-01-24 19:07:10 UTC (rev 145050)
+++ trunk/dports/editors/textmate2/files/75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch 2016-01-24 19:29:30 UTC (rev 145051)
@@ -1,48 +0,0 @@
-From 75d3c74f05c1260df71e5852dab5d7f0c8c4bf85 Mon Sep 17 00:00:00 2001
-From: Ronald Wampler <rdwampler at gmail.com>
-Date: Sat, 19 Sep 2015 10:14:03 -0400
-Subject: [PATCH] =?UTF-8?q?OFBOutlineView:=20Rename=20draggedItems=20?=
- =?UTF-8?q?=E2=86=92=20draggedOFBItems?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-Upstream-Status: Backport
-
-This property's name was conflicting with a private instance variable in our superclass (NSOutlineView) for the 10.11 SDK.
----
- Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm b/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
-index caaeb5d..487c5c0 100644
---- ./Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
-+++ ./Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
-@@ -19,7 +19,7 @@ @interface OFBOutlineView ()
- NSSize defaultIntercellSpacing;
- NSColor* defaultBackgroundColor;
- }
-- at property (nonatomic) NSArray* draggedItems;
-+ at property (nonatomic) NSArray* draggedOFBItems;
-
- - (void)performDoubleClick:(id)sender;
- @end
-@@ -210,15 +210,15 @@ - (NSImage*)dragImageForRowsWithIndexes:(NSIndexSet*)anIndexSet tableColumns:(NS
- if(id item = [self itemAtRow:index])
- [items addObject:item];
- }
-- self.draggedItems = items;
-+ self.draggedOFBItems = items;
- return [super dragImageForRowsWithIndexes:anIndexSet tableColumns:anArray event:anEvent offset:aPointPointer];
- }
-
- - (void)draggedImage:(NSImage*)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)aDragOperation
- {
-- if(self.draggedItems && [self.dataSource respondsToSelector:@selector(outlineView:draggedItems:endedWithOperation:)])
-- [(id <FSDataSourceDragSource>)self.dataSource outlineView:self draggedItems:self.draggedItems endedWithOperation:aDragOperation];
-- self.draggedItems = nil;
-+ if(self.draggedOFBItems && [self.dataSource respondsToSelector:@selector(outlineView:draggedItems:endedWithOperation:)])
-+ [(id <FSDataSourceDragSource>)self.dataSource outlineView:self draggedItems:self.draggedOFBItems endedWithOperation:aDragOperation];
-+ self.draggedOFBItems = nil;
-
- if([NSOutlineView respondsToSelector:@selector(draggedImage:endedAt:operation:)])
- [super draggedImage:anImage endedAt:aPoint operation:aDragOperation];
Deleted: trunk/dports/editors/textmate2/files/9e4e88ce76a334abe01f79e9d355623beac75831.patch
===================================================================
--- trunk/dports/editors/textmate2/files/9e4e88ce76a334abe01f79e9d355623beac75831.patch 2016-01-24 19:07:10 UTC (rev 145050)
+++ trunk/dports/editors/textmate2/files/9e4e88ce76a334abe01f79e9d355623beac75831.patch 2016-01-24 19:29:30 UTC (rev 145051)
@@ -1,103 +0,0 @@
-From 9e4e88ce76a334abe01f79e9d355623beac75831 Mon Sep 17 00:00:00 2001
-From: Ronald Wampler <rdwampler at gmail.com>
-Date: Sat, 19 Sep 2015 10:13:51 -0400
-Subject: [PATCH] Explicitly cast back to the CGEventFlags typedef
-Upstream-Status: Backport
-
-The SDK for 10.11 (Xcode 7 GM and Xcode 7.1 beta) declares this enum using CF_ENUM instead of CF_OPTIONS, which forces us to explicitly cast back to the typedef type. <rdar://22743357>
-
-Hopefully, we can revert this after OS 10.11 is officially released.
----
- Frameworks/ns/src/ns.mm | 30 +++++++++++++++---------------
- 1 file changed, 15 insertions(+), 15 deletions(-)
-
-diff --git a/Frameworks/ns/src/ns.mm b/Frameworks/ns/src/ns.mm
-index 0a0b0ea..d9f77f5 100644
---- ./Frameworks/ns/src/ns.mm
-+++ ./Frameworks/ns/src/ns.mm
-@@ -215,17 +215,17 @@ Remove numpad modifier unless key is among what is on standard numpad (incl. com
- CGEventRef cgEvent = [anEvent CGEvent];
- CGKeyCode key = (CGKeyCode)[anEvent keyCode];
- CGEventFlags flags = CGEventGetFlags(cgEvent);
-- flags &= kCGEventFlagMaskCommand | kCGEventFlagMaskShift | kCGEventFlagMaskAlternate | kCGEventFlagMaskControl | kCGEventFlagMaskNumericPad;
-+ flags = CGEventFlags(flags & (kCGEventFlagMaskCommand | kCGEventFlagMaskShift | kCGEventFlagMaskAlternate | kCGEventFlagMaskControl | kCGEventFlagMaskNumericPad));
-
- std::string keyString = NULL_STR;
-- std::string const keyStringNoFlags = string_for(key, 0);
-- CGEventFlags newFlags = flags & (kCGEventFlagMaskControl|kCGEventFlagMaskCommand);
-+ std::string const keyStringNoFlags = string_for(key, CGEventFlags(0));
-+ CGEventFlags newFlags = CGEventFlags(flags & (kCGEventFlagMaskControl|kCGEventFlagMaskCommand));
-
- if(flags & kCGEventFlagMaskNumericPad)
- {
- static std::string const numPadKeys = "0123456789=/*-+.,";
- if(preserveNumPadFlag && numPadKeys.find(keyStringNoFlags) != std::string::npos)
-- newFlags |= kCGEventFlagMaskNumericPad;
-+ newFlags = CGEventFlags(newFlags | kCGEventFlagMaskNumericPad);
- }
-
- std::string const keyStringCommand = string_for(key, kCGEventFlagMaskCommand);
-@@ -233,8 +233,8 @@ Remove numpad modifier unless key is among what is on standard numpad (incl. com
- {
- D(DBF_NSEvent, bug("command (⌘) changes key\n"););
-
-- newFlags |= flags & kCGEventFlagMaskAlternate;
-- flags &= ~kCGEventFlagMaskAlternate;
-+ newFlags = CGEventFlags(newFlags | (flags & kCGEventFlagMaskAlternate));
-+ flags = CGEventFlags(flags & ~kCGEventFlagMaskAlternate);
-
- if(flags & kCGEventFlagMaskShift)
- {
-@@ -246,7 +246,7 @@ Remove numpad modifier unless key is among what is on standard numpad (incl. com
- else
- {
- D(DBF_NSEvent, bug("shift (⇧) is literal\n"););
-- newFlags |= kCGEventFlagMaskShift;
-+ newFlags = CGEventFlags(newFlags | kCGEventFlagMaskShift);
- }
- }
- }
-@@ -256,29 +256,29 @@ Remove numpad modifier unless key is among what is on standard numpad (incl. com
- if((flags & kCGEventFlagMaskControl) && !is_ascii(keyStringNoFlags) && (ch = char_for_key_code(key, flags & kCGEventFlagMaskShift)))
- {
- keyString = std::string(1, ch);
-- newFlags |= flags & kCGEventFlagMaskAlternate;
-+ newFlags = CGEventFlags(newFlags | (flags & kCGEventFlagMaskAlternate));
- }
- else
- {
- if(flags & kCGEventFlagMaskAlternate)
- {
-- std::string const keyStringAlternate = string_for(key, flags & (kCGEventFlagMaskAlternate|kCGEventFlagMaskShift));
-+ std::string const keyStringAlternate = string_for(key, CGEventFlags(flags & (kCGEventFlagMaskAlternate|kCGEventFlagMaskShift)));
- if(!is_ascii(keyStringAlternate) || keyStringNoFlags == keyStringAlternate)
- {
- D(DBF_NSEvent, bug("option (⌥) is literal\n"););
-- newFlags |= kCGEventFlagMaskAlternate;
-- flags &= ~kCGEventFlagMaskAlternate;
-+ newFlags = CGEventFlags(newFlags | kCGEventFlagMaskAlternate);
-+ flags = CGEventFlags(flags & ~kCGEventFlagMaskAlternate);
- }
- }
-
- if(flags & kCGEventFlagMaskShift)
- {
-- std::string const keyStringShift = string_for(key, flags & (kCGEventFlagMaskAlternate|kCGEventFlagMaskShift));
-+ std::string const keyStringShift = string_for(key, CGEventFlags(flags & (kCGEventFlagMaskAlternate|kCGEventFlagMaskShift)));
- if(!is_ascii(keyStringShift) || keyStringNoFlags == keyStringShift)
- {
- D(DBF_NSEvent, bug("shift (⇧) is literal\n"););
-- newFlags |= kCGEventFlagMaskShift;
-- flags &= ~kCGEventFlagMaskShift;
-+ newFlags = CGEventFlags(newFlags | kCGEventFlagMaskShift);
-+ flags = CGEventFlags(flags & ~kCGEventFlagMaskShift);
- }
- else
- {
-@@ -289,5 +289,5 @@ Remove numpad modifier unless key is among what is on standard numpad (incl. com
- }
- }
-
-- return string_for(newFlags) + (keyString == NULL_STR ? string_for(key, flags & ~kCGEventFlagMaskControl) : keyString);
-+ return string_for(newFlags) + (keyString == NULL_STR ? string_for(key, CGEventFlags(flags & ~kCGEventFlagMaskControl)) : keyString);
- }
Deleted: trunk/dports/editors/textmate2/files/bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch
===================================================================
--- trunk/dports/editors/textmate2/files/bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch 2016-01-24 19:07:10 UTC (rev 145050)
+++ trunk/dports/editors/textmate2/files/bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch 2016-01-24 19:29:30 UTC (rev 145051)
@@ -1,26 +0,0 @@
-From bd63c0f54468c01ac3c8909e3f14aef31da0ed1f Mon Sep 17 00:00:00 2001
-From: Ronald Wampler <rdwampler at gmail.com>
-Date: Sat, 19 Sep 2015 10:25:00 -0400
-Subject: [PATCH] Adopt WebFrameLoadDelegate when building with 10.11 SDK
-Upstream-Status: Backport
-
----
- Commands/tooltip/TMDHTMLTips.mm | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Commands/tooltip/TMDHTMLTips.mm b/Commands/tooltip/TMDHTMLTips.mm
-index 662ab2f..ff07bc5 100644
---- PlugIns/dialog/Commands/tooltip/TMDHTMLTips.mm
-+++ PlugIns/dialog/Commands/tooltip/TMDHTMLTips.mm
-@@ -13,7 +13,11 @@
-
- NSString* const TMDTooltipPreferencesIdentifier = @"TM Tooltip";
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
- @interface TMDHTMLTip ()
-+#else
-+ at interface TMDHTMLTip () <WebFrameLoadDelegate>
-+#endif
- {
- WebView* webView;
- WebPreferences* webPreferences;
Deleted: trunk/dports/editors/textmate2/files/f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch
===================================================================
--- trunk/dports/editors/textmate2/files/f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch 2016-01-24 19:07:10 UTC (rev 145050)
+++ trunk/dports/editors/textmate2/files/f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch 2016-01-24 19:29:30 UTC (rev 145051)
@@ -1,112 +0,0 @@
-From f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f Mon Sep 17 00:00:00 2001
-From: Ronald Wampler <rdwampler at gmail.com>
-Date: Sat, 19 Sep 2015 10:14:00 -0400
-Subject: [PATCH] Declare new protocols when building for 10.11
-Upstream-Status: Backport
-
-These were informal protocols prior to 10.11.
----
- Applications/TextMate/src/AboutWindowController.mm | 4 ++++
- Frameworks/HTMLOutput/src/browser/HOBrowserView.h | 4 ++++
- Frameworks/HTMLOutput/src/browser/HOBrowserView.mm | 4 ++++
- Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.h | 4 ++++
- Frameworks/OakAppKit/src/OakPasteboardChooser.mm | 4 ++++
- Frameworks/OakFilterList/src/OakChooser.mm | 4 ++++
- 6 files changed, 24 insertions(+)
-
-diff --git a/Applications/TextMate/src/AboutWindowController.mm b/Applications/TextMate/src/AboutWindowController.mm
-index 9e89443..0e5481c 100644
---- ./Applications/TextMate/src/AboutWindowController.mm
-+++ ./Applications/TextMate/src/AboutWindowController.mm
-@@ -242,7 +242,11 @@ - (void)addLicense
-
- // ============================
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
- @interface AboutWindowController () <NSWindowDelegate, NSToolbarDelegate>
-+#else
-+ at interface AboutWindowController () <NSWindowDelegate, NSToolbarDelegate, WebFrameLoadDelegate, WebPolicyDelegate>
-+#endif
- @property (nonatomic) NSToolbar* toolbar;
- @property (nonatomic) WebView* webView;
- @property (nonatomic) NSString* selectedPage;
-diff --git a/Frameworks/HTMLOutput/src/browser/HOBrowserView.h b/Frameworks/HTMLOutput/src/browser/HOBrowserView.h
-index 1054683..de5419b 100644
---- ./Frameworks/HTMLOutput/src/browser/HOBrowserView.h
-+++ ./Frameworks/HTMLOutput/src/browser/HOBrowserView.h
-@@ -2,7 +2,11 @@
-
- @class HOStatusBar;
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
- @interface HOBrowserView : NSView
-+#else
-+ at interface HOBrowserView : NSView <WebFrameLoadDelegate>
-+#endif
- @property (nonatomic, readonly) WebView* webView;
- @property (nonatomic, readonly) BOOL needsNewWebView;
- @property (nonatomic, readonly) HOStatusBar* statusBar;
-diff --git a/Frameworks/HTMLOutput/src/browser/HOBrowserView.mm b/Frameworks/HTMLOutput/src/browser/HOBrowserView.mm
-index ed3ef93..6ed0377 100644
---- ./Frameworks/HTMLOutput/src/browser/HOBrowserView.mm
-+++ ./Frameworks/HTMLOutput/src/browser/HOBrowserView.mm
-@@ -16,7 +16,11 @@ static void ShowLoadErrorForURL (WebFrame* frame, NSURL* url, NSError* error)
- [frame loadHTMLString:errorMsg baseURL:[NSURL fileURLWithPath:NSTemporaryDirectory()]];
- }
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
- @interface HOBrowserView ()
-+#else
-+ at interface HOBrowserView () <WebPolicyDelegate, WebUIDelegate, WebResourceLoadDelegate>
-+#endif
- @property (nonatomic, readwrite) WebView* webView;
- @property (nonatomic, readwrite) HOStatusBar* statusBar;
- @property (nonatomic) HOWebViewDelegateHelper* webViewDelegateHelper;
-diff --git a/Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.h b/Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.h
-index 6946743..16d1c43 100644
---- ./Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.h
-+++ ./Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.h
-@@ -2,7 +2,11 @@
- @property (nonatomic) NSString* statusText;
- @end
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
- @interface HOWebViewDelegateHelper : NSObject
-+#else
-+ at interface HOWebViewDelegateHelper : NSObject <WebResourceLoadDelegate, WebUIDelegate>
-+#endif
- @property (nonatomic, weak) id /*<HOWebViewDelegateHelperProtocol>*/ delegate;
- @property (nonatomic) BOOL needsNewWebView;
- @end
-diff --git a/Frameworks/OakAppKit/src/OakPasteboardChooser.mm b/Frameworks/OakAppKit/src/OakPasteboardChooser.mm
-index 9461824..9759f1a 100644
---- ./Frameworks/OakAppKit/src/OakPasteboardChooser.mm
-+++ ./Frameworks/OakAppKit/src/OakPasteboardChooser.mm
-@@ -45,7 +45,11 @@ - (NSAttributedString*)displayString
- }
- @end
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
- @interface OakPasteboardChooser () <NSWindowDelegate, NSTextFieldDelegate, NSTableViewDelegate>
-+#else
-+ at interface OakPasteboardChooser () <NSWindowDelegate, NSTextFieldDelegate, NSTableViewDelegate, NSSearchFieldDelegate>
-+#endif
- @property (nonatomic) OakPasteboard* pasteboard;
- @property (nonatomic) NSArrayController* arrayController;
- @property (nonatomic) NSWindow* window;
-diff --git a/Frameworks/OakFilterList/src/OakChooser.mm b/Frameworks/OakFilterList/src/OakChooser.mm
-index 4deb386..cd56724 100644
---- ./Frameworks/OakFilterList/src/OakChooser.mm
-+++ ./Frameworks/OakFilterList/src/OakChooser.mm
-@@ -108,7 +108,11 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
- return res;
- }
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
- @interface OakChooser () <NSWindowDelegate, NSTextFieldDelegate, NSTableViewDataSource, NSTableViewDelegate>
-+#else
-+ at interface OakChooser () <NSWindowDelegate, NSTextFieldDelegate, NSTableViewDataSource, NSTableViewDelegate, NSSearchFieldDelegate>
-+#endif
- @end
-
- static void* kFirstResponderBinding = &kFirstResponderBinding;
Added: trunk/dports/editors/textmate2/files/patch-frameworks_license_target.diff
===================================================================
--- trunk/dports/editors/textmate2/files/patch-frameworks_license_target.diff (rev 0)
+++ trunk/dports/editors/textmate2/files/patch-frameworks_license_target.diff 2016-01-24 19:29:30 UTC (rev 145051)
@@ -0,0 +1,17 @@
+Upstream-Status: Pending
+
+This pach fixes undefined symbol errors when linking against the static
+libcrypto library without an explicit -lz linker flag.
+It partially reverts [1] where the static library linking was introduced.
+
+[1]: https://github.com/textmate/textmate/commit/5bbcf424874917d4f021a3f33379c6b530dae0f3
+
+--- Frameworks/license/target.orig 2016-01-24 17:03:26.000000000 +0100
++++ Frameworks/license/target 2016-01-24 17:03:43.000000000 +0100
+@@ -3,5 +3,5 @@
+ LINK += text cf
+ CXX_FLAGS += -I"$libressl_prefix/include"
+ LN_FLAGS += -Wl,-U,__Z15revoked_serialsv
+-LN_FLAGS += "$libressl_prefix"/lib/libcrypto.a
++LIBS += crypto
+ FRAMEWORKS = Security
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160124/eaac747e/attachment.html>
More information about the macports-changes
mailing list