From 98c4b059533356dea8c76564f1c098d646ab273d Mon Sep 17 00:00:00 2001 From: Gard Spreemann Date: Fri, 19 Aug 2022 11:21:26 +0200 Subject: Renumber patch --- debian/patches/0005-CGAL-5.5-compatibility.patch | 22 ++++++++++++++++++++++ debian/patches/0006-CGAL-5.5-compatibility.patch | 22 ---------------------- debian/patches/series | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 debian/patches/0005-CGAL-5.5-compatibility.patch delete mode 100644 debian/patches/0006-CGAL-5.5-compatibility.patch (limited to 'debian/patches') diff --git a/debian/patches/0005-CGAL-5.5-compatibility.patch b/debian/patches/0005-CGAL-5.5-compatibility.patch new file mode 100644 index 00000000..949b5e4d --- /dev/null +++ b/debian/patches/0005-CGAL-5.5-compatibility.patch @@ -0,0 +1,22 @@ +From: Vincent Rouvreau +Date: Tue, 9 Aug 2022 16:06:06 +0200 +Subject: CGAL 5.5 compatibility + +Based on discussion in https://github.com/CGAL/cgal/issues/6799 +--- + src/Contraction/include/gudhi/Skeleton_blocker_contractor.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h +index 6911ca2..7910e7b 100644 +--- a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h ++++ b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h +@@ -174,7 +174,7 @@ typename GeometricSimplifiableComplex::Vertex_handle> { + #if CGAL_VERSION_NR < 1050500000 + typedef CGAL::Modifiable_priority_queue PQ; + #else +- typedef CGAL::Modifiable_priority_queue PQ; ++ typedef CGAL::Modifiable_priority_queue PQ; + #endif + + typedef bool pq_handle; diff --git a/debian/patches/0006-CGAL-5.5-compatibility.patch b/debian/patches/0006-CGAL-5.5-compatibility.patch deleted file mode 100644 index 949b5e4d..00000000 --- a/debian/patches/0006-CGAL-5.5-compatibility.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Vincent Rouvreau -Date: Tue, 9 Aug 2022 16:06:06 +0200 -Subject: CGAL 5.5 compatibility - -Based on discussion in https://github.com/CGAL/cgal/issues/6799 ---- - src/Contraction/include/gudhi/Skeleton_blocker_contractor.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h -index 6911ca2..7910e7b 100644 ---- a/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h -+++ b/src/Contraction/include/gudhi/Skeleton_blocker_contractor.h -@@ -174,7 +174,7 @@ typename GeometricSimplifiableComplex::Vertex_handle> { - #if CGAL_VERSION_NR < 1050500000 - typedef CGAL::Modifiable_priority_queue PQ; - #else -- typedef CGAL::Modifiable_priority_queue PQ; -+ typedef CGAL::Modifiable_priority_queue PQ; - #endif - - typedef bool pq_handle; diff --git a/debian/patches/series b/debian/patches/series index c3448dab..1c41a910 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,4 @@ 0002-Use-system-MathJax.patch 0003-Offline-header-for-docs.patch 0004-Disable-Sphinx.patch -0006-CGAL-5.5-compatibility.patch +0005-CGAL-5.5-compatibility.patch -- cgit v1.2.3