[142207] trunk/dports/aqua/fltk/files

[michaelld at macports.org]

Revision: 142207
          https://trac.macports.org/changeset/142207
Author:   michaelld at macports.org
Date:     2015-11-06 08:40:33 -0800 (Fri, 06 Nov 2015)
Log Message:
-----------
fltk*: better patches to fix NSInteger inclusion; hopefully fixes ticket #49500.

Modified Paths:
--------------
    trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff
    trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff

Modified: trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff	2015-11-06 16:19:16 UTC (rev 142206)
+++ trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff	2015-11-06 16:40:33 UTC (rev 142207)
@@ -1,15 +1,6 @@
 --- FL/mac.H.orig
 +++ FL/mac.H
-@@ -48,6 +48,8 @@ typedef CGContextRef Fl_Offscreen;
- 
- // Standard MacOS C/C++ includes...
- #include <ApplicationServices/ApplicationServices.h>
-+#include <objc/NSObjCRuntime.h>
-+
- #undef check // because of Fl::check()
- 
- #ifndef MAC_OS_X_VERSION_10_4
-@@ -71,15 +73,12 @@ typedef CGContextRef Fl_Offscreen;
+@@ -71,15 +72,21 @@
  #ifndef MAC_OS_X_VERSION_10_10
  #define MAC_OS_X_VERSION_10_10 101000
  #endif
@@ -17,19 +8,27 @@
 +#define MAC_OS_X_VERSION_10_11 101100
 +#endif
  
- #ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
+-#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
 -#if defined(__LP64__) && __LP64__
 -typedef long NSInteger;
 -typedef unsigned long NSUInteger;
--#else
++#ifdef __OBJC__
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
++#include <objc/NSObjCRuntime.h>
+ #else
 -typedef int NSInteger;
 -typedef unsigned int NSUInteger;
--#endif
++#include <Foundation/NSObjCRuntime.h>
++#endif
++
++#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
 +#error "NSINTEGER_DEFINED not defined"
  #endif
++
+ #endif
  
  #ifdef __OBJC__
-@@ -110,11 +109,7 @@ typedef struct flCocoaRegion {
+@@ -110,11 +117,7 @@
  struct XPoint { int x, y; };
  struct XRectangle {int x, y, width, height;};
  #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h

Modified: trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff	2015-11-06 16:19:16 UTC (rev 142206)
+++ trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff	2015-11-06 16:40:33 UTC (rev 142207)
@@ -1,15 +1,6 @@
 --- FL/mac.H.orig
 +++ FL/mac.H
-@@ -47,6 +47,8 @@ typedef CGContextRef Fl_Offscreen;
- 
- // Standard MacOS C/C++ includes...
- #include <ApplicationServices/ApplicationServices.h>
-+#include <objc/NSObjCRuntime.h>
-+
- #undef check // because of Fl::check()
- 
- #ifndef MAC_OS_X_VERSION_10_4
-@@ -70,6 +72,13 @@ typedef CGContextRef Fl_Offscreen;
+@@ -70,6 +70,22 @@
  #ifndef MAC_OS_X_VERSION_10_10
  #define MAC_OS_X_VERSION_10_10 101000
  #endif
@@ -17,13 +8,22 @@
 +#define MAC_OS_X_VERSION_10_11 101100
 +#endif
 +
++#ifdef __OBJC__
++#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
++#include <objc/NSObjCRuntime.h>
++#else
++#include <Foundation/NSObjCRuntime.h>
++#endif
++
 +#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
 +#error "NSINTEGER_DEFINED not defined"
 +#endif
++
++#endif
  
  #ifdef __OBJC__
  @class NSCursor;
-@@ -91,11 +100,7 @@ typedef struct flCocoaRegion {
+@@ -91,11 +107,7 @@
  struct XPoint { int x, y; };
  struct XRectangle {int x, y, width, height;};
  #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/4b871fff/attachment.html>