<!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>[143228] 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/143228">143228</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-12-08 05:13:35 -0800 (Tue, 08 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>fltk-devel: update to 1.3.x-<a href="https://trac.macports.org/changeset/10949">r10949</a>; addresses ticket #49912.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaquafltkPortfile">trunk/dports/aqua/fltk/Portfile</a></li>
<li><a href="#trunkdportsaquafltkfilespatchfix_LP64develdiff">trunk/dports/aqua/fltk/files/patch-fix_LP64.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 (143227 => 143228)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</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-r10866
- checksums rmd160 c73b62a7969623dfd1734ac2d3e3598c420fa2c3 \
- sha256 2d09730b7cec3140a1a403de14b7bab7c90fe770e059ec976092d061a9bc3d81
</del><ins>+ version 1.3.x-r10949
+ checksums rmd160 815603dc4353263ae1718e94c5b9c48364efb1e8 \
+ sha256 bc0348707f451fada53493e947d232591b1d7358a08e5e44b070d972e3483cb3
</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></pre></div>
<a id="trunkdportsaquafltkfilespatchfix_LP64develdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/aqua/fltk/files/patch-fix_LP64.devel.diff (143227 => 143228)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,12 +1,8 @@
</span><span class="cx"> --- FL/mac.H.orig
</span><span class="cx"> +++ FL/mac.H
</span><del>-@@ -71,15 +72,21 @@
- #ifndef MAC_OS_X_VERSION_10_10
- #define MAC_OS_X_VERSION_10_10 101000
</del><ins>+@@ -75,14 +75,17 @@
+ #define MAC_OS_X_VERSION_10_11 101100
</ins><span class="cx"> #endif
</span><del>-+#ifndef MAC_OS_X_VERSION_10_11
-+#define MAC_OS_X_VERSION_10_11 101100
-+#endif
</del><span class="cx">
</span><span class="cx"> -#ifndef NSINTEGER_DEFINED // appears with 10.5 in NSObjCRuntime.h
</span><span class="cx"> -#if defined(__LP64__) && __LP64__
</span><span class="lines">@@ -28,7 +24,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifdef __OBJC__
</span><del>-@@ -110,11 +117,7 @@
</del><ins>+@@ -112,11 +115,7 @@
</ins><span class="cx"> struct XPoint { int x, y; };
</span><span class="cx"> struct XRectangle {int x, y, width, height;};
</span><span class="cx"> #ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
</span><span class="lines">@@ -52,52 +48,3 @@
</span><span class="cx"> Boolean accepted;
</span><span class="cx"> status = PMCreateSession(&printSession);
</span><span class="cx"> if (status != noErr) return 1;
</span><del>---- 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?
</del></span></pre>
</div>
</div>
</body>
</html>