[153180] trunk/dports/python/py-graph-tool

[mmoll at macports.org]

Revision: 153180
          https://trac.macports.org/changeset/153180
Author:   mmoll at macports.org
Date:     2016-09-26 08:06:08 -0700 (Mon, 26 Sep 2016)
Log Message:
-----------
py-graph-tool: patch to fix compilation problem with newest CGAL. Closes #52374.

Modified Paths:
--------------
    trunk/dports/python/py-graph-tool/Portfile

Added Paths:
-----------
    trunk/dports/python/py-graph-tool/files/
    trunk/dports/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch

Modified: trunk/dports/python/py-graph-tool/Portfile
===================================================================
--- 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)
@@ -41,11 +41,13 @@
     if {${name} ne ${subport}} {
         compiler.blacklist *gcc* {clang <= 700.1.81} {macports-clang-3.[0-6]}
         compiler.fallback-append macports-clang-3.7
+        patch.pre_args -p1
+        patchfiles 0001-Fix-compilation-problem-with-newer-CGAL.patch
         configure.cxxflags-append -std=c++14 -stdlib=libc++
 
         variant openmp description "Enable OpenMP" {
             # make sure libomp is installed at runtime, even if the compiler gets uninstalled
-            depends_lib-append    lib:lib/libomp/libomp.dylib:libomp
+            depends_lib-append    lib:${prefix}/lib/libomp/libomp:libomp
             configure.args-append --enable-openmp
         }
         variant clang37 requires openmp conflicts clang38 clang39 description "Use clang-3.7+openmp and enable OpenMP"  {

Added: trunk/dports/python/py-graph-tool/files/0001-Fix-compilation-problem-with-newer-CGAL.patch
===================================================================
--- 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)
@@ -0,0 +1,76 @@
+From 2a4aa1fbe40c2398e7cf008c360a3dcecad0c804 Mon Sep 17 00:00:00 2001
+From: Tiago de Paula Peixoto <tiago at 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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160926/fbd7fa17/attachment-0001.html>