diff options
| author | Gabor Gyorvari | 2014-10-19 20:21:11 +0200 |
|---|---|---|
| committer | Jack Nagel | 2014-10-30 12:08:44 -0500 |
| commit | 23bdce600e0fcfcdcb85ae02c76061a26d1f1148 (patch) | |
| tree | 59a353b45174ff7cbb38634d24cc8506c45c78e5 | |
| parent | 6afb4d90289d48a1201e56143b36ce2def5e8b51 (diff) | |
| download | homebrew-23bdce600e0fcfcdcb85ae02c76061a26d1f1148.tar.bz2 | |
fltk: fix compilation on 10.10
Fixes #33093.
Closes #33360.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Formula/fltk.rb | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/Library/Formula/fltk.rb b/Library/Formula/fltk.rb index 282a89f4b..4fc598e5b 100644 --- a/Library/Formula/fltk.rb +++ b/Library/Formula/fltk.rb @@ -26,6 +26,9 @@ class Fltk < Formula # # Second patch is to fix compile issue with clang 3.4. # Based on: http://www.fltk.org/strfiles/3046/fltk-clang3.4-1.patch + # + # Third patch is to fix compile issue with OSX 10.10 Yosemite + # Based on: http://www.fltk.org/str.php?L3141 patch :DATA def install @@ -63,3 +66,26 @@ index fdbe320..bd7e741 100644 + friend Fl_Widget *make_type_browser(int,int,int,int,const char *); friend class Fl_Window_Type; virtual void setlabel(const char *); // virtual part of label(char*) + +diff --git a/src/Fl_cocoa.mm.o b/src/Fl_cocoa.mm +index 1234567..1234567 100644 +--- a/src/Fl_cocoa.mm ++++ b/src/Fl_cocoa.mm +@@ -1322,7 +1322,7 @@ + if (need_new_nsapp) [NSApplication sharedApplication]; + NSAutoreleasePool *localPool; + localPool = [[NSAutoreleasePool alloc] init]; // never released +- [NSApp setDelegate:[[FLDelegate alloc] init]]; ++ [(NSApplication *)NSApp setDelegate:[[FLDelegate alloc] init]]; + if (need_new_nsapp) [NSApp finishLaunching]; + + // empty the event queue but keep system events for drag&drop of files at launch +@@ -2231,7 +2231,7 @@ + w->set_visible(); + if ( w->border() || (!w->modal() && !w->tooltip_window()) ) Fl::handle(FL_FOCUS, w); + Fl::first_window(w); +- [cw setDelegate:[NSApp delegate]]; ++ [(NSFileManager *)cw setDelegate:[NSApp delegate]]; + if (fl_show_iconic) { + fl_show_iconic = 0; + [cw miniaturize:nil]; |