[97434] trunk/dports/aqua/fltk

ryandesign at macports.org ryandesign at macports.org
Wed Sep 5 17:23:02 PDT 2012


Revision: 97434
          https://trac.macports.org/changeset/97434
Author:   ryandesign at macports.org
Date:     2012-09-05 17:23:02 -0700 (Wed, 05 Sep 2012)
Log Message:
-----------
fltk: fix build on Lion and earlier by backporting more parts from upstream (#35986)

Modified Paths:
--------------
    trunk/dports/aqua/fltk/Portfile
    trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff

Added Paths:
-----------
    trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2012-09-06 00:20:27 UTC (rev 97433)
+++ trunk/dports/aqua/fltk/Portfile	2012-09-06 00:23:02 UTC (rev 97434)
@@ -39,7 +39,8 @@
 
 use_parallel_build  yes
 
-patchfiles      patch-src-filename_list.cxx.diff
+patchfiles      patch-FL-mac.H.diff \
+                patch-src-filename_list.cxx.diff
 
 post-patch {
     reinplace "s|/Applications|${applications_dir}/${name}|g" \

Added: trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff	                        (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-FL-mac.H.diff	2012-09-06 00:23:02 UTC (rev 97434)
@@ -0,0 +1,15 @@
+--- FL/mac.H.orig	2011-05-12 06:50:43.000000000 -0500
++++ FL/mac.H	2012-09-05 18:57:31.000000000 -0500
+@@ -52,6 +52,12 @@
+ #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)) // this part is used when compiling an application program
+ 

Modified: trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff	2012-09-06 00:20:27 UTC (rev 97433)
+++ trunk/dports/aqua/fltk/files/patch-src-filename_list.cxx.diff	2012-09-06 00:23:02 UTC (rev 97434)
@@ -1,6 +1,17 @@
 http://www.fltk.org/str.php?L2864
 --- src/filename_list.cxx.orig	2011-01-05 10:50:10.000000000 -0600
 +++ src/filename_list.cxx	2012-08-14 04:23:22.000000000 -0500
+@@ -31,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
 @@ -115,6 +108,12 @@
    int n = scandir(dirloc, list, 0, (int(*)(void*, void*))sort);
  #elif defined(__sgi)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120905/71094529/attachment.html>


More information about the macports-changes mailing list