diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2022-11-03 16:49:24 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2022-11-03 16:49:24 +0100 |
| commit | 23fbf54eb491d99b106546e20c13b70fe44b9dd7 (patch) | |
| tree | 1ed1f4cc2fffec25ac85c7ec88e100fc1fb7ce09 | |
| parent | ec339239a11601510ce9324a3498f45610ce5eac (diff) | |
Bump CGAL dependency to >=5.5.1, and drop patchdebian/3.6.0+dfsg-3
From CGAL 5.5.1, the CGAL 5.5 compatibility patch is no longer
needed. The underlying issue (upstream issue #6799) has been fixed
upstream.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 6 | ||||
| -rw-r--r-- | debian/patches/0005-CGAL-5.5-compatibility.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 10 insertions, 26 deletions
diff --git a/debian/changelog b/debian/changelog index bfa794d5..8a7777b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gudhi (3.6.0+dfsg-3) unstable; urgency=medium + + * Bump CGAL dependency to >=5.5.1, allowing us to drop the CGAL 5.5 + compatibility patch. + + -- Gard Spreemann <gspr@nonempty.org> Thu, 03 Nov 2022 16:48:20 +0100 + gudhi (3.6.0+dfsg-2) unstable; urgency=medium * Fix watch file broken by GitHub change. diff --git a/debian/control b/debian/control index dfc375ae..be36102c 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: cmake (>= 3.5), libboost-test-dev (>= 1.66), libboost-thread-dev (>= 1.66), libboost-timer-dev (>= 1.66), - libcgal-dev (>= 5.0), - libcgal-qt5-dev (>= 5.0), + libcgal-dev (>= 5.5.1), + libcgal-qt5-dev (>= 5.5.1), libeigen3-dev, libgmp-dev, libhera-dev (>= 1.0.0), @@ -50,7 +50,7 @@ Depends: libboost-filesystem-dev (>= 1.66), libboost-test-dev (>= 1.66), libboost-thread-dev (>= 1.66), libboost-timer-dev (>= 1.66), - libcgal-dev (>= 5.0), + libcgal-dev (>= 5.5.1), libeigen3-dev (>= 3.1.0), libgmp-dev (>= 4.2), libtbb-dev, diff --git a/debian/patches/0005-CGAL-5.5-compatibility.patch b/debian/patches/0005-CGAL-5.5-compatibility.patch deleted file mode 100644 index 949b5e4d..00000000 --- a/debian/patches/0005-CGAL-5.5-compatibility.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Vincent Rouvreau <vincent.rouvreau@inria.fr> -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<Edge_handle, Compare_cost, Undirected_edge_id> PQ; - #else -- typedef CGAL::Modifiable_priority_queue<Edge_handle, Compare_cost, Undirected_edge_id, CGAL::CGAL_BOOST_PENDING_RELAXED_HEAP> PQ; -+ typedef CGAL::Modifiable_priority_queue<Edge_handle, Compare_cost, Undirected_edge_id, CGAL::CGAL_BOOST_PAIRING_HEAP> PQ; - #endif - - typedef bool pq_handle; diff --git a/debian/patches/series b/debian/patches/series index 1c41a910..ab3337cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,4 +2,3 @@ 0002-Use-system-MathJax.patch 0003-Offline-header-for-docs.patch 0004-Disable-Sphinx.patch -0005-CGAL-5.5-compatibility.patch |