aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorindiecat2014-03-14 12:07:46 +1100
committerMisty De Meo2014-03-21 11:22:32 -0700
commit5c10cffe5c619ccba2b796a415b088b3d38eb616 (patch)
tree845df5c21c545ab7523e54e35737a22c9e251e2d /Library
parente9aa1227c2fe943935b655398fcdee91e2323e66 (diff)
downloadhomebrew-5c10cffe5c619ccba2b796a415b088b3d38eb616.tar.bz2
fltk: fix build with clang 3.4
Fixes #27404. Closes #27531. Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Diffstat (limited to 'Library')
-rw-r--r--Library/Formula/fltk.rb17
1 files changed, 16 insertions, 1 deletions
diff --git a/Library/Formula/fltk.rb b/Library/Formula/fltk.rb
index c1d9cdeb6..e11e0953e 100644
--- a/Library/Formula/fltk.rb
+++ b/Library/Formula/fltk.rb
@@ -15,8 +15,11 @@ class Fltk < Formula
cause "http://llvm.org/bugs/show_bug.cgi?id=10338"
end
- # The patch is to fix issue with -lpng not found.
+ # First patch is to fix issue with -lpng not found.
# Based on: https://trac.macports.org/browser/trunk/dports/aqua/fltk/files/patch-src-Makefile.diff
+ #
+ # Second patch is to fix compile issue with clang 3.4.
+ # Based on: http://www.fltk.org/strfiles/3046/fltk-clang3.4-1.patch
patch :DATA
def install
@@ -42,3 +45,15 @@ index fcad5f0..5a5a850 100644
$(RM) libfltk_images.dylib
$(LN) libfltk_images.1.3.dylib libfltk_images.dylib
+diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h
+index fdbe320..bd7e741 100644
+--- a/fluid/Fl_Type.h
++++ b/fluid/Fl_Type.h
+@@ -36,7 +36,7 @@ void set_modflag(int mf);
+ class Fl_Type {
+
+ friend class Widget_Browser;
+- friend Fl_Widget *make_type_browser(int,int,int,int,const char *l=0);
++ 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*)