summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGard Spreemann <gspreemann@gmail.com>2018-05-18 19:14:27 +0200
committerGard Spreemann <gspreemann@gmail.com>2018-05-18 19:14:27 +0200
commit99ae22a516b1227acc3dfd20df9946881442c86b (patch)
treedf9a3fb0fdfaf5bcb788a46d83887d0cda332d65
parent009edf98b230b67763497f98d3e0f42617c3bfad (diff)
Patch for CGAL 4.12 compatibility.
-rw-r--r--debian/patches/0007-CGAL-4.12-compatibility.patch72
-rw-r--r--debian/patches/series1
2 files changed, 73 insertions, 0 deletions
diff --git a/debian/patches/0007-CGAL-4.12-compatibility.patch b/debian/patches/0007-CGAL-4.12-compatibility.patch
new file mode 100644
index 00000000..604c40e7
--- /dev/null
+++ b/debian/patches/0007-CGAL-4.12-compatibility.patch
@@ -0,0 +1,72 @@
+From: Gard Spreemann <gspreemann@gmail.com>
+Date: Fri, 18 May 2018 19:13:09 +0200
+Subject: CGAL 4.12 compatibility.
+
+---
+ utilities/Alpha_complex/alpha_complex_3d_persistence.cpp | 1 +
+ utilities/Alpha_complex/exact_alpha_complex_3d_persistence.cpp | 1 +
+ utilities/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp | 1 +
+ utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp | 1 +
+ .../Alpha_complex/weighted_periodic_alpha_complex_3d_persistence.cpp | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/utilities/Alpha_complex/alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/alpha_complex_3d_persistence.cpp
+index 8ef5ffb..6491dac 100644
+--- a/utilities/Alpha_complex/alpha_complex_3d_persistence.cpp
++++ b/utilities/Alpha_complex/alpha_complex_3d_persistence.cpp
+@@ -36,6 +36,7 @@
+ #include <CGAL/Delaunay_triangulation_3.h>
+ #include <CGAL/Alpha_shape_3.h>
+ #include <CGAL/iterator.h>
++#include <CGAL/Alpha_shape_vertex_base_3.h>
+
+ #include <fstream>
+ #include <cmath>
+diff --git a/utilities/Alpha_complex/exact_alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/exact_alpha_complex_3d_persistence.cpp
+index cceac46..f762024 100644
+--- a/utilities/Alpha_complex/exact_alpha_complex_3d_persistence.cpp
++++ b/utilities/Alpha_complex/exact_alpha_complex_3d_persistence.cpp
+@@ -31,6 +31,7 @@
+ #include <CGAL/Delaunay_triangulation_3.h>
+ #include <CGAL/Alpha_shape_3.h>
+ #include <CGAL/iterator.h>
++#include <CGAL/Alpha_shape_vertex_base_3.h>
+
+ #include <fstream>
+ #include <cmath>
+diff --git a/utilities/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp
+index 188cf60..a69ba9f 100644
+--- a/utilities/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp
++++ b/utilities/Alpha_complex/periodic_alpha_complex_3d_persistence.cpp
+@@ -33,6 +33,7 @@
+ #include <CGAL/Periodic_3_Delaunay_triangulation_3.h>
+ #include <CGAL/Alpha_shape_3.h>
+ #include <CGAL/iterator.h>
++#include <CGAL/Alpha_shape_vertex_base_3.h>
+
+ #include <fstream>
+ #include <cmath>
+diff --git a/utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp
+index 93be8a0..b35ae31 100644
+--- a/utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp
++++ b/utilities/Alpha_complex/weighted_alpha_complex_3d_persistence.cpp
+@@ -32,6 +32,7 @@
+ #include <CGAL/Regular_triangulation_3.h>
+ #include <CGAL/Alpha_shape_3.h>
+ #include <CGAL/iterator.h>
++#include <CGAL/Alpha_shape_vertex_base_3.h>
+
+ // For CGAL < 4.11
+ #if CGAL_VERSION_NR < 1041100000
+diff --git a/utilities/Alpha_complex/weighted_periodic_alpha_complex_3d_persistence.cpp b/utilities/Alpha_complex/weighted_periodic_alpha_complex_3d_persistence.cpp
+index 5321bb0..16864b5 100644
+--- a/utilities/Alpha_complex/weighted_periodic_alpha_complex_3d_persistence.cpp
++++ b/utilities/Alpha_complex/weighted_periodic_alpha_complex_3d_persistence.cpp
+@@ -32,6 +32,7 @@
+ #include <CGAL/Periodic_3_regular_triangulation_3.h>
+ #include <CGAL/Alpha_shape_3.h>
+ #include <CGAL/iterator.h>
++#include <CGAL/Alpha_shape_vertex_base_3.h>
+
+ #include <fstream>
+ #include <cmath>
diff --git a/debian/patches/series b/debian/patches/series
index ca224839..6a2bbf20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
0004-Use-system-MathJax.patch
0005-Don-t-set-runtime_library_dirs-for-the-Python-extens.patch
no-external-doc-resources.patch
+0007-CGAL-4.12-compatibility.patch