<!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>[141433] trunk/dports/games/openttd/files</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/141433">141433</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2015-10-18 09:49:20 -0700 (Sun, 18 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>openttd: Update patch status tracking, delete obsolete patch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgamesopenttdfilespatchconfiglibremovedeploymenttargetdiff">trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff</a></li>
<li><a href="#trunkdportsgamesopenttdfilespatchsrc__music__cocoa_mcppsupportnewaudiocomponenthincludeguarddiff">trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff</a></li>
<li><a href="#trunkdportsgamesopenttdfilespatchsrc__video__cocoa__wnd_quartzmmavoidremovedcmgetsystemprofilediff">trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgamesopenttdfilesopenttdfontcachepatch">trunk/dports/games/openttd/files/openttd-fontcache.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgamesopenttdfilesopenttdfontcachepatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/games/openttd/files/openttd-fontcache.patch (141432 => 141433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/openttd/files/openttd-fontcache.patch 2015-10-18 16:38:11 UTC (rev 141432)
+++ trunk/dports/games/openttd/files/openttd-fontcache.patch 2015-10-18 16:49:20 UTC (rev 141433)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-Fix: Compilation with freetype2 version 2.5.4 and newer (AMDmi3)
-
-See upstream tickets #6223 and #6185.
-
-Upstream-Status: Backport [committed in r27079]
-Index: src/fontcache.cpp
-===================================================================
---- src/fontcache.cpp (revision 27078)
-+++ src/fontcache.cpp (working copy)
-@@ -536,8 +536,8 @@
- aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
-
- /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */
-- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL));
-- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL));
-+ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL));
-+ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL));
-
- /* Limit glyph size to prevent overflows later on. */
- if (width > 256 || height > 256) usererror("Font glyph is too large");
-@@ -553,8 +553,8 @@
-
- /* Draw shadow for medium size */
- if (this->fs == FS_NORMAL && !aa) {
-- for (int y = 0; y < slot->bitmap.rows; y++) {
-- for (int x = 0; x < slot->bitmap.width; x++) {
-+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) {
-+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) {
- if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
- sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR;
- sprite.data[1 + x + (1 + y) * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF;
-@@ -563,8 +563,8 @@
- }
- }
-
-- for (int y = 0; y < slot->bitmap.rows; y++) {
-- for (int x = 0; x < slot->bitmap.width; x++) {
-+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) {
-+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) {
- if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) {
- sprite.data[x + y * sprite.width].m = FACE_COLOUR;
- sprite.data[x + y * sprite.width].a = aa ? slot->bitmap.buffer[x + y * slot->bitmap.pitch] : 0xFF;
</del></span></pre></div>
<a id="trunkdportsgamesopenttdfilespatchconfiglibremovedeploymenttargetdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff (141432 => 141433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff 2015-10-18 16:38:11 UTC (rev 141432)
+++ trunk/dports/games/openttd/files/patch-config.lib-remove-deployment-target.diff 2015-10-18 16:49:20 UTC (rev 141433)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+Upstream-Stauts: Inappropriate [Configuration]
</ins><span class="cx"> --- config.lib.orig 2013-12-26 17:59:22.000000000 +0100
</span><span class="cx"> +++ config.lib 2013-12-26 18:01:06.000000000 +0100
</span><span class="cx"> @@ -1557,23 +1557,6 @@
</span></span></pre></div>
<a id="trunkdportsgamesopenttdfilespatchsrc__music__cocoa_mcppsupportnewaudiocomponenthincludeguarddiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff (141432 => 141433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff 2015-10-18 16:38:11 UTC (rev 141432)
+++ trunk/dports/games/openttd/files/patch-src__music__cocoa_m.cpp-support-new-audiocomponent.h-include-guard.diff 2015-10-18 16:49:20 UTC (rev 141433)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-Upstream-Status: Pending
</del><ins>+Upstream-Status: Submitted [https://bugs.openttd.org/task/6380]
</ins><span class="cx"> --- src/music/cocoa_m.cpp.orig 2015-10-18 17:47:57.000000000 +0200
</span><span class="cx"> +++ src/music/cocoa_m.cpp 2015-10-18 17:55:07.000000000 +0200
</span><span class="cx"> @@ -67,8 +67,9 @@
</span></span></pre></div>
<a id="trunkdportsgamesopenttdfilespatchsrc__video__cocoa__wnd_quartzmmavoidremovedcmgetsystemprofilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff (141432 => 141433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff 2015-10-18 16:38:11 UTC (rev 141432)
+++ trunk/dports/games/openttd/files/patch-src__video__cocoa__wnd_quartz.mm-avoid-removed-cmgetsystemprofile.diff 2015-10-18 16:49:20 UTC (rev 141433)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-Upstream-Status: pending
</del><ins>+Upstream-Status: Submitted [https://bugs.openttd.org/task/6380]
</ins><span class="cx"> --- src/video/cocoa/wnd_quartz.mm.orig 2015-10-18 18:11:44.000000000 +0200
</span><span class="cx"> +++ src/video/cocoa/wnd_quartz.mm 2015-10-18 18:14:30.000000000 +0200
</span><span class="cx"> @@ -110,12 +110,7 @@
</span></span></pre>
</div>
</div>
</body>
</html>