<!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>[153180] trunk/dports/python/py-graph-tool</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/153180">153180</a></dd>
<dt>Author</dt> <dd>mmoll@macports.org</dd>
<dt>Date</dt> <dd>2016-09-26 08:06:08 -0700 (Mon, 26 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-graph-tool: patch to fix compilation problem with newest CGAL. Closes #52374.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpygraphtoolPortfile">trunk/dports/python/py-graph-tool/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-graph-tool/files/</li>
<li><a href="#trunkdportspythonpygraphtoolfiles0001FixcompilationproblemwithnewerCGALpatch">trunk/dports/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpygraphtoolPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-graph-tool/Portfile (153179 => 153180)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-graph-tool/Portfile 2016-09-26 13:37:38 UTC (rev 153179)
+++ trunk/dports/python/py-graph-tool/Portfile 2016-09-26 15:06:08 UTC (rev 153180)
</span><span class="lines">@@ -41,11 +41,13 @@
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> compiler.blacklist *gcc* {clang <= 700.1.81} {macports-clang-3.[0-6]}
</span><span class="cx"> compiler.fallback-append macports-clang-3.7
</span><ins>+ patch.pre_args -p1
+ patchfiles 0001-Fix-compilation-problem-with-newer-CGAL.patch
</ins><span class="cx"> configure.cxxflags-append -std=c++14 -stdlib=libc++
</span><span class="cx">
</span><span class="cx"> variant openmp description "Enable OpenMP" {
</span><span class="cx"> # make sure libomp is installed at runtime, even if the compiler gets uninstalled
</span><del>- depends_lib-append lib:lib/libomp/libomp.dylib:libomp
</del><ins>+ depends_lib-append lib:${prefix}/lib/libomp/libomp:libomp
</ins><span class="cx"> configure.args-append --enable-openmp
</span><span class="cx"> }
</span><span class="cx"> variant clang37 requires openmp conflicts clang38 clang39 description "Use clang-3.7+openmp and enable OpenMP" {
</span></span></pre></div>
<a id="trunkdportspythonpygraphtoolfiles0001FixcompilationproblemwithnewerCGALpatch"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch (0 => 153180)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch (rev 0)
+++ trunk/dports/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch 2016-09-26 15:06:08 UTC (rev 153180)
</span><span class="lines">@@ -0,0 +1,76 @@
</span><ins>+From 2a4aa1fbe40c2398e7cf008c360a3dcecad0c804 Mon Sep 17 00:00:00 2001
+From: Tiago de Paula Peixoto <tiago@skewed.de>
+Date: Wed, 21 Sep 2016 11:26:51 +0200
+Subject: [PATCH] Fix compilation problem with newer CGAL
+
+---
+ src/graph/generation/graph_triangulation.cc | 16 +++++++++-------
+ src/graph/generation/graph_triangulation.hh | 8 ++++----
+ 2 files changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/src/graph/generation/graph_triangulation.cc b/src/graph/generation/graph_triangulation.cc
+index 5642785..f63509a 100644
+--- a/src/graph/generation/graph_triangulation.cc
++++ b/src/graph/generation/graph_triangulation.cc
+@@ -15,10 +15,10 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+-// As a special exception, you have permission to link this program
+-// with the CGAL library and distribute executables, as long as you
+-// follow the requirements of the GNU GPL in regard to all of the
+-// software in the executable aside from CGAL.
++// As a special exception, you have permission to link this program
++// with the CGAL library and distribute executables, as long as you
++// follow the requirements of the GNU GPL in regard to all of the
++// software in the executable aside from CGAL.
+
+ #include "graph.hh"
+ #include "graph_util.hh"
+@@ -52,11 +52,12 @@ bool operator==(const SimpleTriangulation::Vertex& a,
+
+ // periodic triangulation is only available in more recent versions of CGAL
+ #if (CGAL_VERSION_NR >= 1030500000)
+-#include <CGAL/Periodic_3_triangulation_traits_3.h>
++#include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h>
+ #include <CGAL/Periodic_3_Delaunay_triangulation_3.h>
+-typedef CGAL::Periodic_3_triangulation_traits_3<Kernel> GT;
++typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<Kernel> GT;
+ typedef CGAL::Periodic_3_Delaunay_triangulation_3<GT>
+ PeriodicDelaunayTriangulation;
++
+ namespace CGAL
+ {
+ bool operator==(const PeriodicDelaunayTriangulation::Vertex& a,
+@@ -85,7 +86,8 @@ void triangulation(GraphInterface& gi, boost::python::object points,
+
+ if (type == "simple")
+ {
+- get_triangulation<SimpleTriangulation, std::false_type>()(g, points_array, pos_map);
++ get_triangulation<SimpleTriangulation, std::false_type>()
++ (g, points_array, pos_map);
+ }
+ else if (type == "delaunay")
+ {
+diff --git a/src/graph/generation/graph_triangulation.hh b/src/graph/generation/graph_triangulation.hh
+index fffebe1..441bce5 100644
+--- a/src/graph/generation/graph_triangulation.hh
++++ b/src/graph/generation/graph_triangulation.hh
+@@ -15,10 +15,10 @@
+ // You should have received a copy of the GNU General Public License
+ // along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+-// As a special exception, you have permission to link this program
+-// with the CGAL library and distribute executables, as long as you
+-// follow the requirements of the GNU GPL in regard to all of the
+-// software in the executable aside from CGAL.
++// As a special exception, you have permission to link this program
++// with the CGAL library and distribute executables, as long as you
++// follow the requirements of the GNU GPL in regard to all of the
++// software in the executable aside from CGAL.
+
+ #ifndef GRAPH_TRIANGULATION_HH
+ #define GRAPH_TRIANGULATION_HH
+--
+2.10.0
+
</ins></span></pre>
</div>
</div>
</body>
</html>