<pre style='margin:0'>
Mark Moll (mamoll) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c75b9052a5a037daf3b6db060becd5649d77962d">https://github.com/macports/macports-ports/commit/c75b9052a5a037daf3b6db060becd5649d77962d</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new c75b905 py-graph-tool: add upstream fix for latest CGAL. Closes https://trac.macports.org/ticket/57716
</span>c75b905 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit c75b9052a5a037daf3b6db060becd5649d77962d
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Mon Dec 10 20:38:53 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> py-graph-tool: add upstream fix for latest CGAL. Closes https://trac.macports.org/ticket/57716
</span>---
python/py-graph-tool/Portfile | 24 ++++++++----------------
python/py-graph-tool/files/patch-cgal413.diff | 22 ++++++++++++++++++++++
2 files changed, 30 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graph-tool/Portfile b/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c03878..f1077ea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graph-tool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> set realname graph-tool
name py-${realname}
version 2.27
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> epoch 20171109
categories python science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,24 +49,15 @@ if {${os.major} <= 12 && ${os.platform} eq "darwin"} {
</span> configure.args-append --enable-openmp
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant clang39 requires openmp conflicts clang40 clang50 clang60 description "Use clang-3.9 and enable OpenMP" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-clang-3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant clang40 requires openmp conflicts clang39 clang50 clang60 description "Use clang-4.0 and enable OpenMP" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-clang-4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant clang50 requires openmp conflicts clang39 clang40 clang60 description "Use clang-5.0 and enable OpenMP" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.compiler macports-clang-5.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant clang60 requires openmp conflicts clang39 clang40 clang50 description "Use clang-6.0 and enable OpenMP" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant clang60 requires openmp conflicts clang70 description "Use clang-6.0 and enable OpenMP" {
</span> configure.compiler macports-clang-6.0
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant clang70 requires openmp conflicts clang60 description "Use clang-6.0 and enable OpenMP" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.compiler macports-clang-7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> default_variants +openmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset clang39] && ![variant_isset clang40] && ![variant_isset clang50]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +clang60
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset clang60]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +clang70
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,6 +75,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-scipy \
port:py${python.version}-gobject3 \
port:py${python.version}-cairo
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-cgal413.diff
</span> use_configure yes
# parallel build starts swapping with 8GB of RAM.
#use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graph-tool/files/patch-cgal413.diff b/python/py-graph-tool/files/patch-cgal413.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..874597f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graph-tool/files/patch-cgal413.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/graph/generation/graph_triangulation.cc b/src/graph/generation/graph_triangulation.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f7a9a545..4d418beb 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/graph/generation/graph_triangulation.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/graph/generation/graph_triangulation.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +68,18 @@ bool operator==(const PeriodicDelaunayTriangulation::Vertex& a,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// comparison missing in 4.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (CGAL_VERSION_NR >= 1041301000)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++namespace CGAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++bool operator==(const DelaunayTriangulation::Vertex& a,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ const DelaunayTriangulation::Vertex& b)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return a.point() == b.point();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "graph_triangulation.hh"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "numpy_bind.hh"
</span></pre><pre style='margin:0'>
</pre>