[141755] trunk/dports/aqua/fltk
michaelld at macports.org
michaelld at macports.org
Sat Dec 12 02:52:19 PST 2015
Revision: 141755
https://trac.macports.org/changeset/141755
Author: michaelld at macports.org
Date: 2015-10-27 12:57:55 -0700 (Tue, 27 Oct 2015)
Log Message:
-----------
fltk:
+ tweak patch names to be consistent;
+ patch release and devel to work on 10.11 and with +universal;
+ update devel to 1.3.x-r10866;
+ fix setting of build arch to what fltk expects (removes redundancy);
+ addresses tickets #49472 and #49473.
Revision Links:
--------------
https://trac.macports.org/changeset/10866
Modified Paths:
--------------
trunk/dports/aqua/fltk/Portfile
Added Paths:
-----------
trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff
trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff
trunk/dports/aqua/fltk/files/patch-src-Makefile.devel.diff
trunk/dports/aqua/fltk/files/patch-src-Makefile.release.diff
trunk/dports/aqua/fltk/files/patch-src_fl_line_style.cxx.diff
Removed Paths:
-------------
trunk/dports/aqua/fltk/files/patch-src-Makefile.diff
trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff
Modified: trunk/dports/aqua/fltk/Portfile
===================================================================
--- trunk/dports/aqua/fltk/Portfile 2015-10-27 19:48:32 UTC (rev 141754)
+++ trunk/dports/aqua/fltk/Portfile 2015-10-27 19:57:55 UTC (rev 141755)
@@ -53,9 +53,9 @@
conflicts fltk
- version 1.3.x-r10852
- checksums rmd160 9b42b791442a61c9288f3c103d2d03d86e722180 \
- sha256 9874eddaf13f7046e38170e8e146005b9c0f2d01d23cf9129367448fb6eb41a3
+ version 1.3.x-r10866
+ checksums rmd160 c73b62a7969623dfd1734ac2d3e3598c420fa2c3 \
+ sha256 2d09730b7cec3140a1a403de14b7bab7c90fe770e059ec976092d061a9bc3d81
master_sites http://fltk.org/pub/fltk/snapshots/
distname fltk-${version}
@@ -73,11 +73,18 @@
if {${subport} eq "fltk"} {
patchfiles-append \
- patch-src-Makefile.diff \
- patch-src-Fl_JPEG_Image.cxx.diff
+ patch-src-Makefile.release.diff \
+ patch-fix_LP64.release.diff
+
+ # the following patches are already integrated into the devel version
+ patchfiles-append \
+ patch-src-Fl_JPEG_Image.cxx.diff \
+ patch-src_fl_line_style.cxx.diff
+
} else {
patchfiles-append \
- patch-src-Makefile_devel.diff
+ patch-src-Makefile.devel.diff \
+ patch-fix_LP64.devel.diff
}
post-patch {
@@ -106,6 +113,11 @@
pre-configure {
configure.args-append \
--with-archflags="[get_canonical_archflags]"
+ configure.cc_archflags
+ configure.cxx_archflags
+ configure.objc_archflags
+ configure.objcxx_archflags
+ configure.ld_archflags
}
configure.args --enable-shared \
Added: trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff 2015-10-27 19:57:55 UTC (rev 141755)
@@ -0,0 +1,104 @@
+--- 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;
+ #ifndef MAC_OS_X_VERSION_10_10
+ #define MAC_OS_X_VERSION_10_10 101000
+ #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__
+-typedef long NSInteger;
+-typedef unsigned long NSUInteger;
+-#else
+-typedef int NSInteger;
+-typedef unsigned int NSUInteger;
+-#endif
++#error "NSINTEGER_DEFINED not defined"
+ #endif
+
+ #ifdef __OBJC__
+@@ -110,11 +109,7 @@ typedef struct flCocoaRegion {
+ struct XPoint { int x, y; };
+ struct XRectangle {int x, y, width, height;};
+ #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
+-#if defined(__LP64__) && __LP64__
+-typedef double CGFloat;
+-#else
+-typedef float CGFloat;
+-#endif
++#error "CGFLOAT_DEFINED not defined"
+ #endif // CGFLOAT_DEFINED
+
+ extern CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h);
+--- src/Fl_Quartz_Printer.mm.orig
++++ src/Fl_Quartz_Printer.mm
+@@ -89,7 +89,7 @@ int Fl_System_Printer::start_job (int pagecount, int *frompage, int *topage)
+ else
+ #endif
+ {
+-#if !__LP64__
++#if !__LP64__ && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
+ 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?
Added: trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff 2015-10-27 19:57:55 UTC (rev 141755)
@@ -0,0 +1,98 @@
+--- 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;
+ #ifndef MAC_OS_X_VERSION_10_10
+ #define MAC_OS_X_VERSION_10_10 101000
+ #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
++#error "NSINTEGER_DEFINED not defined"
++#endif
+
+ #ifdef __OBJC__
+ @class NSCursor;
+@@ -91,11 +100,7 @@ typedef struct flCocoaRegion {
+ struct XPoint { int x, y; };
+ struct XRectangle {int x, y, width, height;};
+ #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
+-#if defined(__LP64__) && __LP64__
+-typedef double CGFloat;
+-#else
+-typedef float CGFloat;
+-#endif
++#error "CGFLOAT_DEFINED not defined"
+ #endif // CGFLOAT_DEFINED
+
+ extern CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h);
+--- src/Fl_Quartz_Printer.mm.orig
++++ src/Fl_Quartz_Printer.mm
+@@ -87,7 +87,7 @@ int Fl_System_Printer::start_job (int pagecount, int *frompage, int *topage)
+ else
+ #endif
+ {
+-#if !__LP64__
++#if !__LP64__ && (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5)
+ Boolean accepted;
+ status = PMCreateSession(&printSession);
+ if (status != noErr) return 1;
+--- src/fl_font_mac.cxx.orig
++++ src/fl_font_mac.cxx
+@@ -86,7 +86,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.;
+@@ -363,7 +363,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;
+@@ -441,7 +441,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;
+@@ -509,7 +509,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
+@@ -136,7 +136,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?
Copied: trunk/dports/aqua/fltk/files/patch-src-Makefile.devel.diff (from rev 141754, trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff)
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-Makefile.devel.diff (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-src-Makefile.devel.diff 2015-10-27 19:57:55 UTC (rev 141755)
@@ -0,0 +1,11 @@
+--- src/Makefile.orig
++++ src/Makefile
+@@ -363,7 +363,7 @@
+ -install_name $(libdir)/$@ \
+ -current_version $(FL_VERSION) \
+ -compatibility_version $(FL_ABI_VERSION) \
+- $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
++ $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
+ $(RM) libfltk_images.dylib
+ $(LN) libfltk_images.$(FL_DSO_VERSION).dylib libfltk_images.dylib
+
Deleted: trunk/dports/aqua/fltk/files/patch-src-Makefile.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-Makefile.diff 2015-10-27 19:48:32 UTC (rev 141754)
+++ trunk/dports/aqua/fltk/files/patch-src-Makefile.diff 2015-10-27 19:57:55 UTC (rev 141755)
@@ -1,11 +0,0 @@
---- src/Makefile.orig 2015-04-02 19:28:53.000000000 -0400
-+++ src/Makefile 2015-04-02 19:29:45.000000000 -0400
-@@ -360,7 +360,7 @@
- -install_name $(libdir)/$@ \
- -current_version 1.3.3 \
- -compatibility_version 1.3.0 \
-- $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
-+ $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
- $(RM) libfltk_images.dylib
- $(LN) libfltk_images.1.3.dylib libfltk_images.dylib
-
Copied: trunk/dports/aqua/fltk/files/patch-src-Makefile.release.diff (from rev 141754, trunk/dports/aqua/fltk/files/patch-src-Makefile.diff)
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-Makefile.release.diff (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-src-Makefile.release.diff 2015-10-27 19:57:55 UTC (rev 141755)
@@ -0,0 +1,11 @@
+--- src/Makefile.orig 2015-04-02 19:28:53.000000000 -0400
++++ src/Makefile 2015-04-02 19:29:45.000000000 -0400
+@@ -360,7 +360,7 @@
+ -install_name $(libdir)/$@ \
+ -current_version 1.3.3 \
+ -compatibility_version 1.3.0 \
+- $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
++ $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
+ $(RM) libfltk_images.dylib
+ $(LN) libfltk_images.1.3.dylib libfltk_images.dylib
+
Deleted: trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff 2015-10-27 19:48:32 UTC (rev 141754)
+++ trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff 2015-10-27 19:57:55 UTC (rev 141755)
@@ -1,11 +0,0 @@
---- src/Makefile.orig
-+++ src/Makefile
-@@ -363,7 +363,7 @@
- -install_name $(libdir)/$@ \
- -current_version $(FL_VERSION) \
- -compatibility_version $(FL_ABI_VERSION) \
-- $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk
-+ $(IMGOBJECTS) -L. $(LDLIBS) $(IMAGELIBS) -lfltk $(LDFLAGS)
- $(RM) libfltk_images.dylib
- $(LN) libfltk_images.$(FL_DSO_VERSION).dylib libfltk_images.dylib
-
Added: trunk/dports/aqua/fltk/files/patch-src_fl_line_style.cxx.diff
===================================================================
--- trunk/dports/aqua/fltk/files/patch-src_fl_line_style.cxx.diff (rev 0)
+++ trunk/dports/aqua/fltk/files/patch-src_fl_line_style.cxx.diff 2015-10-27 19:57:55 UTC (rev 141755)
@@ -0,0 +1,25 @@
+--- src/fl_line_style.cxx.orig
++++ src/fl_line_style.cxx
+@@ -35,8 +35,8 @@ int fl_line_width_ = 0;
+
+ #ifdef __APPLE_QUARTZ__
+ float fl_quartz_line_width_ = 1.0f;
+-static enum CGLineCap fl_quartz_line_cap_ = kCGLineCapButt;
+-static enum CGLineJoin fl_quartz_line_join_ = kCGLineJoinMiter;
++static CGLineCap fl_quartz_line_cap_ = kCGLineCapButt;
++static CGLineJoin fl_quartz_line_join_ = kCGLineJoinMiter;
+ static CGFloat *fl_quartz_line_pattern = 0;
+ static int fl_quartz_line_pattern_size = 0;
+ void fl_quartz_restore_line_style_() {
+@@ -110,9 +110,9 @@ void Fl_Graphics_Driver::line_style(int style, int width, char* dashes) {
+ DeleteObject(fl_current_xmap->pen);
+ fl_current_xmap->pen = newpen;
+ #elif defined(__APPLE_QUARTZ__)
+- static enum CGLineCap Cap[4] = { kCGLineCapButt, kCGLineCapButt,
++ static CGLineCap Cap[4] = { kCGLineCapButt, kCGLineCapButt,
+ kCGLineCapRound, kCGLineCapSquare };
+- static enum CGLineJoin Join[4] = { kCGLineJoinMiter, kCGLineJoinMiter,
++ static CGLineJoin Join[4] = { kCGLineJoinMiter, kCGLineJoinMiter,
+ kCGLineJoinRound, kCGLineJoinBevel };
+ if (width<1) width = 1;
+ fl_quartz_line_width_ = (float)width;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/6b506a9b/attachment.html>
More information about the macports-changes
mailing list