-
+++ Portfile (working copy)
-
PortGroup github 1.0
-
-epoch 4
-
+epoch 5
-
maintainers cal openmaintainer
-
@@ -35,11 +35,7 @@
-
patch-bin__gen_build-avoid-ninja-pool-console.diff
-
- 9e4e88ce76a334abe01f79e9d355623beac75831.patch
-
- f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch
-
- 75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch
-
- bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch
-
+ patch-frameworks_license_target.diff
-
# The build will fail with deployment target set to 10.8
-
Index: files/3f5575cfe4016f2d8a34c6e506146b962f7aa083.patch
-
--- files/3f5575cfe4016f2d8a34c6e506146b962f7aa083.patch (revision 145041)
-
+++ files/3f5575cfe4016f2d8a34c6e506146b962f7aa083.patch (nonexistent)
-
-From 3f5575cfe4016f2d8a34c6e506146b962f7aa083 Mon Sep 17 00:00:00 2001
-
-Date: Sat, 19 Sep 2015 10:14:07 -0400
-
-Subject: [PATCH] Directly convert the URL received from NSOpenPanel to a path
-
-
-
-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 +-
-
-
-
-diff --git a/Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm b/Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm
-
---- ./Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm
-
-+++ ./Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.mm
-
-@@ -44,7 +44,7 @@ - (void)webView:(WebView*)sender runOpenPanelForFileButtonWithResultListener:(id
-
- [panel setDirectoryURL:[NSURL fileURLWithPath:NSHomeDirectory()]];
-
-- [resultListener chooseFilename:[[[[panel URLs] objectAtIndex:0] fileURL] path]];
-
-+ [resultListener chooseFilename:[[[panel URLs] objectAtIndex:0] path]];
-
-
-
- - (WebView*)webView:(WebView*)sender createWebViewWithRequest:(NSURLRequest*)request
-
Index: files/75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch
-
--- files/75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch (revision 145041)
-
+++ files/75d3c74f05c1260df71e5852dab5d7f0c8c4bf85.patch (nonexistent)
-
-From 75d3c74f05c1260df71e5852dab5d7f0c8c4bf85 Mon Sep 17 00:00:00 2001
-
-Date: Sat, 19 Sep 2015 10:14:03 -0400
-
-Subject: [PATCH] =?UTF-8?q?OFBOutlineView:=20Rename=20draggedItems=20?=
-
-MIME-Version: 1.0
-
-Content-Transfer-Encoding: 8bit
-
-
-
-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 +++++-----
-
-
-
-diff --git a/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm b/Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
-
---- ./Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
-
-+++ ./Frameworks/OakFileBrowser/src/ui/OFBOutlineView.mm
-
- NSSize defaultIntercellSpacing;
-
- }
-
-+@property (nonatomic) NSArray* draggedOFBItems;
-
- - (void)performDoubleClick:(id)sender;
-
-@@ -210,15 +210,15 @@ - (NSImage*)dragImageForRowsWithIndexes:(NSIndexSet*)anIndexSet tableColumns:(NS
-
- [items addObject:item];
-
-- self.draggedItems = 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];
-
-+ if(self.draggedOFBItems && [self.dataSource respondsToSelector:@selector(outlineView:draggedItems:endedWithOperation:)])
-
-+ [(id <FSDataSourceDragSource>)self.dataSource outlineView:self draggedItems:self.draggedOFBItems endedWithOperation:aDragOperation];
-
-
-
- if([NSOutlineView respondsToSelector:@selector(draggedImage:endedAt:operation:)])
-
- [super draggedImage:anImage endedAt:aPoint operation:aDragOperation];
-
Index: files/9e4e88ce76a334abe01f79e9d355623beac75831.patch
-
--- files/9e4e88ce76a334abe01f79e9d355623beac75831.patch (revision 145041)
-
+++ files/9e4e88ce76a334abe01f79e9d355623beac75831.patch (nonexistent)
-
-From 9e4e88ce76a334abe01f79e9d355623beac75831 Mon Sep 17 00:00:00 2001
-
-Date: Sat, 19 Sep 2015 10:13:51 -0400
-
-Subject: [PATCH] Explicitly cast back to the CGEventFlags typedef
-
-
-
-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
-
---- ./Frameworks/ns/src/ns.mm
-
-@@ -215,17 +215,17 @@ Remove numpad modifier unless key is among what is on standard numpad (incl. com
-
- CGKeyCode key = (CGKeyCode)[anEvent keyCode];
-
-- 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 = 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 keyn'););
-
-- newFlags |= 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
-
- {
-
-- 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 = 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 literaln'););
-
-- 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 literaln'););
-
-- 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);
-
Index: files/bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch
-
--- files/bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch (revision 145041)
-
+++ files/bd63c0f54468c01ac3c8909e3f14aef31da0ed1f.patch (nonexistent)
-
-From bd63c0f54468c01ac3c8909e3f14aef31da0ed1f Mon Sep 17 00:00:00 2001
-
-Date: Sat, 19 Sep 2015 10:25:00 -0400
-
-Subject: [PATCH] Adopt WebFrameLoadDelegate when building with 10.11 SDK
-
-
-
- Commands/tooltip/TMDHTMLTips.mm | 4 ++++
-
-
-
-diff --git a/Commands/tooltip/TMDHTMLTips.mm b/Commands/tooltip/TMDHTMLTips.mm
-
---- PlugIns/dialog/Commands/tooltip/TMDHTMLTips.mm
-
-+++ PlugIns/dialog/Commands/tooltip/TMDHTMLTips.mm
-
-
-
- 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)
-
-+#else
-
-+#endif
-
- WebView* webView;
-
Index: files/f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch
-
--- files/f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch (revision 145041)
-
+++ files/f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f.patch (nonexistent)
-
-From f29ddf6500b9cdf6a4b18b6394f7ceccebe79b4f Mon Sep 17 00:00:00 2001
-
-Date: Sat, 19 Sep 2015 10:14:00 -0400
-
-Subject: [PATCH] Declare new protocols when building for 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 ++++
-
-
-
-diff --git a/Applications/TextMate/src/AboutWindowController.mm b/Applications/TextMate/src/AboutWindowController.mm
-
---- ./Applications/TextMate/src/AboutWindowController.mm
-
-+++ ./Applications/TextMate/src/AboutWindowController.mm
-
-
-
-
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
-
- @interface AboutWindowController () <NSWindowDelegate, NSToolbarDelegate>
-
-+@interface AboutWindowController () <NSWindowDelegate, NSToolbarDelegate, WebFrameLoadDelegate, WebPolicyDelegate>
-
- @property (nonatomic) NSToolbar* toolbar;
-
- @property (nonatomic) NSString* selectedPage;
-
-diff --git a/Frameworks/HTMLOutput/src/browser/HOBrowserView.h b/Frameworks/HTMLOutput/src/browser/HOBrowserView.h
-
---- ./Frameworks/HTMLOutput/src/browser/HOBrowserView.h
-
-+++ ./Frameworks/HTMLOutput/src/browser/HOBrowserView.h
-
-
-
-
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
-
-+#else
-
-+@interface HOBrowserView : NSView <WebFrameLoadDelegate>
-
- @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
-
---- ./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)
-
-+#else
-
-+@interface HOBrowserView () <WebPolicyDelegate, WebUIDelegate, WebResourceLoadDelegate>
-
- @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
-
---- ./Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.h
-
-+++ ./Frameworks/HTMLOutput/src/browser/HOWebViewDelegateHelper.h
-
- @property (nonatomic) NSString* statusText;
-
-
-
-+#if !defined(MAC_OS_X_VERSION_10_11) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11)
-
-+#else
-
-+@interface HOWebViewDelegateHelper : NSObject <WebResourceLoadDelegate, WebUIDelegate>
-
- @property (nonatomic, weak) id /*<HOWebViewDelegateHelperProtocol>*/ delegate;
-
- @end
-
-diff --git a/Frameworks/OakAppKit/src/OakPasteboardChooser.mm b/Frameworks/OakAppKit/src/OakPasteboardChooser.mm
-
---- ./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>
-
-+@interface OakPasteboardChooser () <NSWindowDelegate, NSTextFieldDelegate, NSTableViewDelegate, NSSearchFieldDelegate>
-
- @property (nonatomic) OakPasteboard* pasteboard;
-
- @property (nonatomic) NSArrayController* arrayController;
-
-diff --git a/Frameworks/OakFilterList/src/OakChooser.mm b/Frameworks/OakFilterList/src/OakChooser.mm
-
---- ./Frameworks/OakFilterList/src/OakChooser.mm
-
-@@ -108,7 +108,11 @@ - (id)accessibilityAttributeValue:(NSString*)attribute
-
- }
-
-+#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>
-
-+@interface OakChooser () <NSWindowDelegate, NSTextFieldDelegate, NSTableViewDataSource, NSTableViewDelegate, NSSearchFieldDelegate>
-
- @end
-
- static void* kFirstResponderBinding = &kFirstResponderBinding;
-
--- files/patch-frameworks_license_target.diff (nonexistent)
-
+++ files/patch-frameworks_license_target.diff (working copy)
-
+--- Frameworks/license/target.orig 2016-01-24 17:03:26.000000000 +0100
-
++++ Frameworks/license/target 2016-01-24 17:03:43.000000000 +0100
-
+ LINK += text cf
-
+ LN_FLAGS += -Wl,-U,__Z15revoked_serialsv
-
++LIBS += crypto
February 15, 2016. Free Download TextMate 2.0-beta.8.5 – Code/markup editor with many features (beta). TextMate is a versatile plain text editor with a unique and innovative feature set which caused it to win an Apple Design Award for Best Mac. Get to know your time with your computer.
Join GitHub today
GitHub is home to over 40 million developers working together to host and review code, manage projects, and build software together.
Sign upNew issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Comments
commented Dec 31, 2015
Hi, Textmate 2.0-beta.8.5 becomes unresponsive when invoking command 'Show R Help for actual Word'. Thanks, |
commented Feb 10, 2016
Hi. Which Mac OS X version do you are using? Does the following work?
Do you see a help man page? |
commented Feb 10, 2016
Hi, I am running 10.11 (.3). The commands you below indicated an issue with the path of the executable. Explicitly setting TM_REXEC to usr/local/bin/R fixed it, fantastic!
|
commented Feb 10, 2016
Textmate 2.0-beta.8.5 For Pc
And thank you, of course!
|