From 98f3dc6dae19b2eb745ab3eb60630f173a569a1d Mon Sep 17 00:00:00 2001
From: Adam Vandenberg
Date: Fri, 18 Jan 2013 11:58:15 -0800
Subject: fltk 1.3.2

Also remove devel release, since apparently it moves to CMake.

Tested compiling pixie and octave.

Closes #15799 - but will review an updated pull request.
---
 Library/Formula/fltk.rb | 68 ++-----------------------------------------------
 1 file changed, 2 insertions(+), 66 deletions(-)

(limited to 'Library/Formula')

diff --git a/Library/Formula/fltk.rb b/Library/Formula/fltk.rb
index 4ee86c31f..9ab5ead2f 100644
--- a/Library/Formula/fltk.rb
+++ b/Library/Formula/fltk.rb
@@ -2,14 +2,8 @@ require 'formula'
 
 class Fltk < Formula
   homepage 'http://www.fltk.org/'
-  url 'http://ftp.easysw.com/pub/fltk/1.3.0/fltk-1.3.0-source.tar.gz'
-  sha1 '720f2804be6132ebae9909d4e74dedcc00b39d25'
-
-  devel do
-    url 'http://ftp.easysw.com/pub/fltk/snapshots/fltk-1.3.x-r9327.tar.bz2'
-    version '1.3.x-r9327'
-    sha1 '12425368b639cd3ae102e658cf5ba8b6d0ca2f85'
-  end
+  url 'http://ftp.easysw.com/pub/fltk/1.3.2/fltk-1.3.2-source.tar.gz'
+  sha1 '25071d6bb81cc136a449825bfd574094b48f07fb'
 
   depends_on :libpng
   depends_on 'jpeg'
@@ -19,66 +13,8 @@ class Fltk < Formula
     cause "http://llvm.org/bugs/show_bug.cgi?id=10338"
   end
 
-  # Fix Mountain Lion build.
-  # http://www.fltk.org/str.php?L2864
-  # Committed upstream as r9649
-  def patches
-    { :p0 => DATA }
-  end
-
   def install
     system "./configure", "--prefix=#{prefix}", "--enable-threads"
     system "make install"
   end
 end
-
-__END__
-Index: src/filename_list.cxx
-===================================================================
---- src/filename_list.cxx	(revision 9648)
-+++ src/filename_list.cxx	(revision 9649)
-@@ -22,7 +22,9 @@
- #include <FL/fl_utf8.h>
- #include "flstring.h"
- #include <stdlib.h>
--
-+#ifdef __APPLE__
-+#include <FL/x.H>
-+#endif
-
- extern "C" {
- #ifndef HAVE_SCANDIR
-@@ -95,7 +97,7 @@
- #ifndef HAVE_SCANDIR
-   // This version is when we define our own scandir
-   int n = fl_scandir(dirloc, list, 0, sort);
--#elif defined(HAVE_SCANDIR_POSIX) && !defined(__APPLE__)
-+#elif defined(HAVE_SCANDIR_POSIX)
-   // POSIX (2008) defines the comparison function like this:
-   int n = scandir(dirloc, list, 0, (int(*)(const dirent **, const dirent **))sort);
- #elif defined(__osf__)
-Index: FL/mac.H
-===================================================================
---- FL/mac.H	(revision 9648)
-+++ FL/mac.H	(revision 9649)
-@@ -149,6 +149,21 @@
- #ifndef MAC_OS_X_VERSION_10_6
- #define MAC_OS_X_VERSION_10_6 1060
- #endif
-+#ifndef MAC_OS_X_VERSION_10_7
-+#define MAC_OS_X_VERSION_10_7 1070
-+#endif
-+#ifndef MAC_OS_X_VERSION_10_8
-+#define MAC_OS_X_VERSION_10_8 1080
-+#endif
-+
-+#if defined(FL_LIBRARY) || defined(FL_INTERNALS)
-+#ifdef HAVE_SCANDIR_POSIX
-+#undef HAVE_SCANDIR_POSIX
-+#endif
-+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-+#define HAVE_SCANDIR_POSIX 1
-+#endif
-+#endif // FL_LIBRARY || FL_INTERNALS
-
- typedef CGImageRef Fl_Bitmask;
-- 
cgit v1.2.3