<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[141755] trunk/dports/aqua/fltk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/141755">141755</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-10-27 12:57:55 -0700 (Tue, 27 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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-<a href="https://trac.macports.org/changeset/10866">r10866</a>;
+ fix setting of build arch to what fltk expects (removes redundancy);
+ addresses tickets #49472 and #49473.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkPortfile">trunk/dports/aqua/fltk/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkfilespatchfix_LP64develdiff">trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff</a></li>
<li><a href="#trunkdportsaquafltkfilespatchfix_LP64releasediff">trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff</a></li>
<li><a href="#trunkdportsaquafltkfilespatchsrcMakefiledeveldiff">trunk/dports/aqua/fltk/files/patch-src-Makefile.devel.diff</a></li>
<li><a href="#trunkdportsaquafltkfilespatchsrcMakefilereleasediff">trunk/dports/aqua/fltk/files/patch-src-Makefile.release.diff</a></li>
<li><a href="#trunkdportsaquafltkfilespatchsrc_fl_line_stylecxxdiff">trunk/dports/aqua/fltk/files/patch-src_fl_line_style.cxx.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkfilespatchsrcMakefilediff">trunk/dports/aqua/fltk/files/patch-src-Makefile.diff</a></li>
<li><a href="#trunkdportsaquafltkfilespatchsrcMakefile_develdiff">trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaquafltkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/fltk/Portfile (141754 => 141755)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx">
</span><span class="cx"> conflicts fltk
</span><span class="cx">
</span><del>- version 1.3.x-r10852
- checksums rmd160 9b42b791442a61c9288f3c103d2d03d86e722180 \
- sha256 9874eddaf13f7046e38170e8e146005b9c0f2d01d23cf9129367448fb6eb41a3
</del><ins>+ version 1.3.x-r10866
+ checksums rmd160 c73b62a7969623dfd1734ac2d3e3598c420fa2c3 \
+ sha256 2d09730b7cec3140a1a403de14b7bab7c90fe770e059ec976092d061a9bc3d81
</ins><span class="cx">
</span><span class="cx"> master_sites http://fltk.org/pub/fltk/snapshots/
</span><span class="cx"> distname fltk-${version}
</span><span class="lines">@@ -73,11 +73,18 @@
</span><span class="cx">
</span><span class="cx"> if {${subport} eq "fltk"} {
</span><span class="cx"> patchfiles-append \
</span><del>- patch-src-Makefile.diff \
- patch-src-Fl_JPEG_Image.cxx.diff
</del><ins>+ 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
+
</ins><span class="cx"> } else {
</span><span class="cx"> patchfiles-append \
</span><del>- patch-src-Makefile_devel.diff
</del><ins>+ patch-src-Makefile.devel.diff \
+ patch-fix_LP64.devel.diff
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="lines">@@ -106,6 +113,11 @@
</span><span class="cx"> pre-configure {
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --with-archflags="[get_canonical_archflags]"
</span><ins>+ configure.cc_archflags
+ configure.cxx_archflags
+ configure.objc_archflags
+ configure.objcxx_archflags
+ configure.ld_archflags
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure.args --enable-shared \
</span></span></pre></div>
<a id="trunkdportsaquafltkfilespatchfix_LP64develdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff (0 => 141755)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+--- 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?
</ins></span></pre></div>
<a id="trunkdportsaquafltkfilespatchfix_LP64releasediff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/fltk/files/patch-fix_LP64.release.diff (0 => 141755)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,98 @@
</span><ins>+--- 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?
</ins></span></pre></div>
<a id="trunkdportsaquafltkfilespatchsrcMakefiledeveldifffromrev141754trunkdportsaquafltkfilespatchsrcMakefile_develdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/aqua/fltk/files/patch-src-Makefile.devel.diff (from rev 141754, trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff) (0 => 141755)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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
+
</ins></span></pre></div>
<a id="trunkdportsaquafltkfilespatchsrcMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/fltk/files/patch-src-Makefile.diff (141754 => 141755)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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
-
</del></span></pre></div>
<a id="trunkdportsaquafltkfilespatchsrcMakefilereleasedifffromrev141754trunkdportsaquafltkfilespatchsrcMakefilediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/aqua/fltk/files/patch-src-Makefile.release.diff (from rev 141754, trunk/dports/aqua/fltk/files/patch-src-Makefile.diff) (0 => 141755)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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
+
</ins></span></pre></div>
<a id="trunkdportsaquafltkfilespatchsrcMakefile_develdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/aqua/fltk/files/patch-src-Makefile_devel.diff (141754 => 141755)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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
-
</del></span></pre></div>
<a id="trunkdportsaquafltkfilespatchsrc_fl_line_stylecxxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/aqua/fltk/files/patch-src_fl_line_style.cxx.diff (0 => 141755)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+--- 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;
</ins></span></pre>
</div>
</div>
</body>
</html>