<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/ded93e28cd1091faba54d0e175483d88c14eeb7d">https://github.com/macports/macports-ports/commit/ded93e28cd1091faba54d0e175483d88c14eeb7d</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 ded93e2 py-graph-tool: update to version 2.19. Closes https://trac.macports.org/ticket/52839
</span>ded93e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ded93e28cd1091faba54d0e175483d88c14eeb7d
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Sun Nov 13 17:05:37 2016 -0600
<span style='display:block; white-space:pre;color:#404040;'> py-graph-tool: update to version 2.19. Closes https://trac.macports.org/ticket/52839
</span>---
python/py-graph-tool/Portfile | 11 ++--
...1-Fix-compilation-problem-with-newer-CGAL.patch | 76 ----------------------
2 files changed, 5 insertions(+), 82 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 9ef098b..63b3105 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}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.19
</span> revision 0
epoch 20160425
categories python science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,9 +23,10 @@ long_description graph-tool is an efficient python module for manipulation \
</span> homepage http://graph-tool.skewed.de
master_sites http://downloads.skewed.de/graph-tool/
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 c87ba05c20e619e2de933e11abae1591 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 c9fde996179c4b9196be6cefa3bd28037fe62f20 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7b99c438897145dfd68bb28a0b242541ada75f04
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 6b68edf0ef5efc375b467a7a117eb9c2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 e4c3756f56bfc6011286082a9a816c58251b5489 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 f5bfeda915b5c4a15211f2c0d396893d828bffbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 eba1090f94b0434890beedaf0c100dd0fc77e41ebfe29b4725d76cadb82099af
</span> distname ${realname}-${version}
python.versions 27 34 35
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +42,6 @@ if {${os.major} <= 12 && ${os.platform} eq "darwin"} {
</span> if {${name} ne ${subport}} {
compiler.blacklist *gcc* {clang <= 700.1.81} {macports-clang-3.[0-6]}
compiler.fallback-append macports-clang-3.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles 0001-Fix-compilation-problem-with-newer-CGAL.patch
</span> configure.cxxflags-append -std=c++14 -stdlib=libc++
variant openmp description "Enable OpenMP" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch b/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 456e2f6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2a4aa1fbe40c2398e7cf008c360a3dcecad0c804 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Tiago de Paula Peixoto <tiago@skewed.de>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 21 Sep 2016 11:26:51 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation problem with newer CGAL
</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;'>- src/graph/generation/graph_triangulation.cc | 16 +++++++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/graph/generation/graph_triangulation.hh | 8 ++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 13 insertions(+), 11 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index 5642785..f63509a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/graph/generation/graph_triangulation.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/graph/generation/graph_triangulation.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,10 +15,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // along with this program. If not, see <http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// As a special exception, you have permission to link this program
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// with the CGAL library and distribute executables, as long as you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// follow the requirements of the GNU GPL in regard to all of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// software in the executable aside from CGAL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// As a special exception, you have permission to link this program
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// with the CGAL library and distribute executables, as long as you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// follow the requirements of the GNU GPL in regard to all of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// software in the executable aside from CGAL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "graph.hh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "graph_util.hh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,11 +52,12 @@ bool operator==(const SimpleTriangulation::Vertex& a,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // periodic triangulation is only available in more recent versions of CGAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (CGAL_VERSION_NR >= 1030500000)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <CGAL/Periodic_3_triangulation_traits_3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <CGAL/Periodic_3_Delaunay_triangulation_traits_3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <CGAL/Periodic_3_Delaunay_triangulation_3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef CGAL::Periodic_3_triangulation_traits_3<Kernel> GT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef CGAL::Periodic_3_Delaunay_triangulation_traits_3<Kernel> GT;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef CGAL::Periodic_3_Delaunay_triangulation_3<GT>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PeriodicDelaunayTriangulation;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace CGAL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool operator==(const PeriodicDelaunayTriangulation::Vertex& a,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -85,7 +86,8 @@ void triangulation(GraphInterface& gi, boost::python::object points,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (type == "simple")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get_triangulation<SimpleTriangulation, std::false_type>()(g, points_array, pos_map);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get_triangulation<SimpleTriangulation, std::false_type>()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (g, points_array, pos_map);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (type == "delaunay")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/src/graph/generation/graph_triangulation.hh b/src/graph/generation/graph_triangulation.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fffebe1..441bce5 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/src/graph/generation/graph_triangulation.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/src/graph/generation/graph_triangulation.hh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,10 +15,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // You should have received a copy of the GNU General Public License
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // along with this program. If not, see <http://www.gnu.org/licenses/>.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// As a special exception, you have permission to link this program
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// with the CGAL library and distribute executables, as long as you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// follow the requirements of the GNU GPL in regard to all of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--// software in the executable aside from CGAL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// As a special exception, you have permission to link this program
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// with the CGAL library and distribute executables, as long as you
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// follow the requirements of the GNU GPL in regard to all of the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// software in the executable aside from CGAL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef GRAPH_TRIANGULATION_HH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GRAPH_TRIANGULATION_HH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.10.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>