<!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>[116164] trunk/dports/gis/grass</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/116164">116164</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-01-20 05:50:28 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>grass: a patch for conflicting is_void (see #40315, fixes a build on clang according to vince)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisgrassPortfile">trunk/dports/gis/grass/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgisgrassfilespatchis_voiddiff">trunk/dports/gis/grass/files/patch-is_void.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgrassPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/grass/Portfile (116163 => 116164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/grass/Portfile 2014-01-20 13:46:28 UTC (rev 116163)
+++ trunk/dports/gis/grass/Portfile 2014-01-20 13:50:28 UTC (rev 116164)
</span><span class="lines">@@ -39,12 +39,13 @@
</span><span class="cx">
</span><span class="cx"> # https://trac.macports.org/ticket/32790
</span><span class="cx"> # this should probably only apply to some Xcode versions
</span><del>-compiler.blacklist *clang*
</del><ins>+# compiler.blacklist *clang*
</ins><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> patch-configure.diff \
</span><span class="cx"> patch-gui-wxpython-core-globalvar.py.diff \
</span><span class="cx"> patch-gui-wxpython-gui_core-ghelp.py.diff \
</span><ins>+ patch-is_void.diff \
</ins><span class="cx"> patch-lib-init-grass.src.diff \
</span><span class="cx"> patch-macosx_Makefile.diff \
</span><span class="cx"> patch-Makefile.diff \
</span></span></pre></div>
<a id="trunkdportsgisgrassfilespatchis_voiddiff"></a>
<div class="addfile"><h4>Added: trunk/dports/gis/grass/files/patch-is_void.diff (0 => 116164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/grass/files/patch-is_void.diff (rev 0)
+++ trunk/dports/gis/grass/files/patch-is_void.diff 2014-01-20 13:50:28 UTC (rev 116164)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+http://trac.osgeo.org/grass/ticket/2170
+
+--- raster/r.terraflow/direction.cc.orig
++++ raster/r.terraflow/direction.cc
+@@ -53,11 +53,11 @@ encodeDirectionMFD(const genericWindow<elevation_type>& elevwin,
+
+ if(!is_nodata(elevwin.get())) {
+ dir = 0;
+- if (elevwin.get(5) < elevwin.get() && !is_void(elevwin.get(5))) dir |= 1;
+- if (elevwin.get(3) < elevwin.get() && !is_void(elevwin.get(3))) dir |= 16;
++ if (elevwin.get(5) < elevwin.get() && !elevation_type_is_void(elevwin.get(5))) dir |= 1;
++ if (elevwin.get(3) < elevwin.get() && !elevation_type_is_void(elevwin.get(3))) dir |= 16;
+ for(int i=0; i<3; i++) {
+- if(elevwin.get(i) < elevwin.get() && !is_void(elevwin.get(i))) dir |= 32<<i;
+- if(elevwin.get(i+6) < elevwin.get() && !is_void(elevwin.get(6+i))) dir |= 8>>i;
++ if(elevwin.get(i) < elevwin.get() && !elevation_type_is_void(elevwin.get(i))) dir |= 32<<i;
++ if(elevwin.get(i+6) < elevwin.get() && !elevation_type_is_void(elevwin.get(6+i))) dir |= 8>>i;
+ }
+ }
+
+--- raster/r.terraflow/nodata.cc.orig
++++ raster/r.terraflow/nodata.cc
+@@ -73,7 +73,7 @@ is_nodata(float x) {
+
+
+ int
+-is_void(elevation_type el) {
++elevation_type_is_void(elevation_type el) {
+ return (el == nodataType::ELEVATION_NODATA);
+ }
+
+--- raster/r.terraflow/nodata.h.orig
++++ raster/r.terraflow/nodata.h
+@@ -37,7 +37,7 @@
+ int is_nodata(elevation_type el);
+ int is_nodata(int x);
+ int is_nodata(float x);
+-int is_void(elevation_type el);
++int elevation_type_is_void(elevation_type el);
+
+
+ class nodataType : public ijBaseType {
</ins></span></pre>
</div>
</div>
</body>
</html>