[143228] trunk/dports/aqua/fltk

[michaelld at macports.org]

Revision: 143228
          https://trac.macports.org/changeset/143228
Author:   michaelld at macports.org
Date:     2015-12-08 05:13:35 -0800 (Tue, 08 Dec 2015)
Log Message:
-----------
fltk-devel: update to 1.3.x-r10949; addresses ticket #49912.

Revision Links:
--------------
    https://trac.macports.org/changeset/10949

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

Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile	2015-12-08 13:00:04 UTC (rev 143227)
+++ trunk/dports/aqua/fltk/Portfile	2015-12-08 13:13:35 UTC (rev 143228)
@@ -53,9 +53,9 @@
 
     conflicts       fltk
 
-    version         1.3.x-r10866
-    checksums       rmd160 c73b62a7969623dfd1734ac2d3e3598c420fa2c3 \
-                    sha256 2d09730b7cec3140a1a403de14b7bab7c90fe770e059ec976092d061a9bc3d81
+    version         1.3.x-r10949
+    checksums       rmd160 815603dc4353263ae1718e94c5b9c48364efb1e8 \
+                    sha256 bc0348707f451fada53493e947d232591b1d7358a08e5e44b070d972e3483cb3
 
     master_sites    http://fltk.org/pub/fltk/snapshots/
     distname        fltk-${version}

Modified: trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff	2015-12-08 13:00:04 UTC (rev 143227)
+++ trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff	2015-12-08 13:13:35 UTC (rev 143228)
@@ -1,12 +1,8 @@
 --- FL/mac.H.orig
 +++ FL/mac.H
-@@ -71,15 +72,21 @@
- #ifndef MAC_OS_X_VERSION_10_10
- #define MAC_OS_X_VERSION_10_10 101000
+@@ -75,14 +75,17 @@
+ #define MAC_OS_X_VERSION_10_11 101100
  #endif
-+#ifndef MAC_OS_X_VERSION_10_11
-+#define MAC_OS_X_VERSION_10_11 101100
-+#endif
  
 -#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
 -#if defined(__LP64__) && __LP64__
@@ -28,7 +24,7 @@
  #endif
  
  #ifdef __OBJC__
-@@ -110,11 +117,7 @@
+@@ -112,11 +115,7 @@
  struct XPoint { int x, y; };
  struct XRectangle {int x, y, width, height;};
  #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
@@ -52,52 +48,3 @@
      Boolean accepted;
      status = PMCreateSession(&printSession);
      if (status != noErr) return 1;
---- src/fl_font_mac.cxx.orig
-+++ src/fl_font_mac.cxx
-@@ -89,7 +89,7 @@ if (fl_mac_os_version >= Fl_X::CoreText_threshold) {
- }
- else {
- #endif
--#if ! __LP64__
-+#if (! __LP64__) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
-   OSStatus err;
-     // fill our structure with a few default values
-   ascent = Size*3/4.;
-@@ -387,7 +387,7 @@ if (fl_mac_os_version >= Fl_X::CoreText_threshold) {
-   return retval;
- } else {
- #endif
--#if ! __LP64__
-+#if (! __LP64__) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
-   OSStatus err;
-   Fixed bBefore, bAfter, bAscent, bDescent;
-   ATSUTextLayout layout;
-@@ -465,7 +465,7 @@ if (fl_mac_os_version >= Fl_X::CoreText_threshold) {
-   }
- else {
- #endif
--#if ! __LP64__
-+#if (! __LP64__) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
-   OSStatus err;
-   ATSUTextLayout layout;
-   ByteCount iSize;
-@@ -533,7 +533,7 @@ static void fl_mac_draw(const char *str, int n, float x, float y, Fl_Graphics_Dr
-     CFRelease(ctline);
-   } else {
- #endif
--#if ! __LP64__
-+#if (! __LP64__) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
-   OSStatus err;
-   // now collect our ATSU resources
-   ATSUTextLayout layout = driver->font_descriptor()->layout;
---- src/fl_set_fonts_mac.cxx.orig
-+++ src/fl_set_fonts_mac.cxx
-@@ -137,7 +137,7 @@ if(fl_mac_os_version >= Fl_X::CoreText_threshold) {
- }
- else {
- #endif
--#if ! __LP64__
-+#if (! __LP64__) && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
-   ItemCount oFontCount, oCountAgain;
-   ATSUFontID *oFontIDs;
-   // How many fonts?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/48327bec/attachment-0001.html>