[Git][debian-gis-team/sfcgal][master] 3 commits: Update lintian overrides.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Sep 11 16:20:06 BST 2024
Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal
Commits:
23f820e0 by Bas Couwenberg at 2024-09-11T16:39:37+02:00
Update lintian overrides.
- - - - -
3dd6020d by Bas Couwenberg at 2024-09-11T16:42:30+02:00
Add DEP-3 headers for CGAL 6 patch.
- - - - -
62725775 by Bas Couwenberg at 2024-09-11T16:43:12+02:00
Set distribution to unstable.
- - - - -
4 changed files:
- debian/changelog
- debian/libsfcgal1t64.lintian-overrides
- debian/patches/cgal6.diff → debian/patches/cgal6.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,12 +1,13 @@
-sfcgal (1.5.2-2) UNRELEASED; urgency=medium
+sfcgal (1.5.2-2) unstable; urgency=medium
[ Bas Couwenberg ]
* Bump Standards-Version to 4.7.0, no changes.
+ * Update lintian overrides.
[ Christoph Berg ]
* Cherry-pick upstream patch for CGAL6 support. (closes: #1074382)
- -- Bas Couwenberg <sebastic at debian.org> Sun, 28 Jul 2024 20:03:16 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 11 Sep 2024 16:42:59 +0200
sfcgal (1.5.2-1) unstable; urgency=medium
=====================================
debian/libsfcgal1t64.lintian-overrides
=====================================
@@ -2,6 +2,3 @@
# Fortify Source functions: no, only unprotected functions found!
hardening-no-fortify-functions *
-# 64-bit time_t transition
-package-name-doesnt-match-sonames libSFCGAL1
-
=====================================
debian/patches/cgal6.diff → debian/patches/cgal6.patch
=====================================
@@ -1,10 +1,11 @@
-Source: https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/325
+Description: Compatibility with 6.0 and 5.6.
+Author: Sébastien Loriot <sebastien.loriot at cgal.org>
+Origin: https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/325
+Bug: https://gitlab.com/sfcgal/SFCGAL/-/issues/267
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1d9affa4424ac87b5a6080db8329c457313486fd..d2c9241ba7bc7d7794daa00da0a4f5f651d20e44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -78,10 +78,6 @@ message( STATUS "CGAL ${CGAL_VERSION} found" )
+@@ -78,10 +78,6 @@ message( STATUS "CGAL ${CGAL_VERSION} fo
include_directories( ${CMAKE_BINARY_DIR}/include )
#-- BOOST --------------------------------------------------
@@ -15,11 +16,9 @@ index 1d9affa4424ac87b5a6080db8329c457313486fd..d2c9241ba7bc7d7794daa00da0a4f5f6
option( Boost_USE_AUTO_LINK "boost use autolink" OFF )
if( NOT ${Boost_USE_AUTO_LINK} )
add_definitions( "-DBOOST_ALL_NO_LIB" )
-diff --git a/src/algorithm/offset.cpp b/src/algorithm/offset.cpp
-index 113d6fc1de566f18ae7c5ec6511a4429468d759f..20403abee41678ed636060f1545b651c893f9a7c 100644
--- a/src/algorithm/offset.cpp
+++ b/src/algorithm/offset.cpp
-@@ -169,6 +169,7 @@ circleToPolygon(const Kernel::Circle_2 &circle) -> Offset_polygon_2
+@@ -169,6 +169,7 @@ circleToPolygon(const Kernel::Circle_2 &
Gps_traits_2 const traits;
Offset_curve_2 const curve(circle);
@@ -27,7 +26,7 @@ index 113d6fc1de566f18ae7c5ec6511a4429468d759f..20403abee41678ed636060f1545b651c
std::list<CGAL::Object> parts;
traits.make_x_monotone_2_object()(curve, std::back_inserter(parts));
BOOST_ASSERT(parts.size() == 2U);
-@@ -181,6 +182,13 @@ circleToPolygon(const Kernel::Circle_2 &circle) -> Offset_polygon_2
+@@ -181,6 +182,13 @@ circleToPolygon(const Kernel::Circle_2 &
CGAL::assign(arc, part);
result.push_back(arc);
}
@@ -41,11 +40,9 @@ index 113d6fc1de566f18ae7c5ec6511a4429468d759f..20403abee41678ed636060f1545b651c
return result;
}
-diff --git a/src/algorithm/straightSkeleton.cpp b/src/algorithm/straightSkeleton.cpp
-index 13eb427011a93fa109bff18a618296526877981c..42095f0f34435b677fa5213e2fe8e2578e13aa9d 100644
--- a/src/algorithm/straightSkeleton.cpp
+++ b/src/algorithm/straightSkeleton.cpp
-@@ -38,6 +38,14 @@ using Polygon_with_holes_2 = CGAL::Polygon_with_holes_2<Kernel>;
+@@ -38,6 +38,14 @@ using Polygon_with_holes_2 = CGAL::Polyg
using Straight_skeleton_2 = CGAL::Straight_skeleton_2<Kernel>;
using Mesh = CGAL::Surface_mesh<Point_3>;
@@ -60,7 +57,7 @@ index 13eb427011a93fa109bff18a618296526877981c..42095f0f34435b677fa5213e2fe8e257
namespace { // anonymous
template <class K, bool outputDistanceInM>
-@@ -181,14 +189,14 @@ straightSkeletonToMedialAxis(const CGAL::Straight_skeleton_2<K> &ss,
+@@ -181,14 +189,14 @@ straightSkeletonToMedialAxis(const CGAL:
auto
straightSkeleton(const Polygon_with_holes_2 &poly)
@@ -78,7 +75,7 @@ index 13eb427011a93fa109bff18a618296526877981c..42095f0f34435b677fa5213e2fe8e257
if (sk) {
ret = CGAL::convert_straight_skeleton_2<Straight_skeleton_2>(*sk);
}
-@@ -316,10 +324,9 @@ straightSkeleton(const Polygon &g, bool /*autoOrientation*/, bool innerOnly,
+@@ -316,10 +324,9 @@ straightSkeleton(const Polygon &g, bool
return result;
}
@@ -92,7 +89,7 @@ index 13eb427011a93fa109bff18a618296526877981c..42095f0f34435b677fa5213e2fe8e257
if (skeleton == nullptr) {
BOOST_THROW_EXCEPTION(Exception("CGAL failed to create straightSkeleton"));
-@@ -348,8 +355,7 @@ straightSkeleton(const MultiPolygon &g, bool /*autoOrientation*/,
+@@ -348,8 +355,7 @@ straightSkeleton(const MultiPolygon &g,
for (size_t i = 0; i < g.numGeometries(); i++) {
Kernel::Vector_2 trans;
Polygon_with_holes_2 const polygon = preparePolygon(g.polygonN(i), trans);
@@ -102,7 +99,7 @@ index 13eb427011a93fa109bff18a618296526877981c..42095f0f34435b677fa5213e2fe8e257
if (skeleton == nullptr) {
BOOST_THROW_EXCEPTION(
-@@ -379,10 +385,9 @@ approximateMedialAxis(const Geometry &g) -> std::unique_ptr<MultiLineString>
+@@ -379,10 +385,9 @@ approximateMedialAxis(const Geometry &g)
extractPolygons(g, polys);
for (auto &poly : polys) {
@@ -116,11 +113,9 @@ index 13eb427011a93fa109bff18a618296526877981c..42095f0f34435b677fa5213e2fe8e257
if (skeleton == nullptr) {
BOOST_THROW_EXCEPTION(
-diff --git a/src/algorithm/visibility.cpp b/src/algorithm/visibility.cpp
-index a99eaf19a6da2bca48cc18dfc3cc48ee02142c7e..9da4f09fbaa8b61ffcc1567f7c46480aab2ec2b2 100644
--- a/src/algorithm/visibility.cpp
+++ b/src/algorithm/visibility.cpp
-@@ -98,7 +98,6 @@ visibility(const Geometry &polygon, const Geometry &point,
+@@ -98,7 +98,6 @@ visibility(const Geometry &polygon, cons
}
// Find the face
@@ -128,7 +123,7 @@ index a99eaf19a6da2bca48cc18dfc3cc48ee02142c7e..9da4f09fbaa8b61ffcc1567f7c46480a
CGAL::Arr_naive_point_location<Arrangement_2> const pl(arr);
CGAL::Arr_point_location_result<Arrangement_2>::Type obj =
pl.locate(queryPoint);
-@@ -108,9 +107,13 @@ visibility(const Geometry &polygon, const Geometry &point,
+@@ -108,9 +107,13 @@ visibility(const Geometry &polygon, cons
// Create Triangular Expansion Visibility object.
TEV const tev(arr);
@@ -145,7 +140,7 @@ index a99eaf19a6da2bca48cc18dfc3cc48ee02142c7e..9da4f09fbaa8b61ffcc1567f7c46480a
Halfedge_const_handle he = Halfedge_const_handle();
// If the point is in a boundary segment, find the corresponding half edge
-@@ -135,23 +138,38 @@ visibility(const Geometry &polygon, const Geometry &point,
+@@ -135,23 +138,38 @@ visibility(const Geometry &polygon, cons
// Use the half edge to compute the visibility
fh = tev.compute_visibility(queryPoint, he, output_arr);
@@ -187,8 +182,6 @@ index a99eaf19a6da2bca48cc18dfc3cc48ee02142c7e..9da4f09fbaa8b61ffcc1567f7c46480a
}
return query_visibility(fh, fh->outer_ccb());
-diff --git a/src/config.h.cmake b/src/config.h.cmake
-index 5c4555dcbeaa695d99dbcb00b5e2f3a9bee13af7..abb2eab51c5d4dd7005a9e6b5bc62ad4e8bbd3a2 100644
--- a/src/config.h.cmake
+++ b/src/config.h.cmake
@@ -8,19 +8,22 @@
@@ -222,11 +215,9 @@ index 5c4555dcbeaa695d99dbcb00b5e2f3a9bee13af7..abb2eab51c5d4dd7005a9e6b5bc62ad4
#endif
-
-diff --git a/src/detail/generator/building.cpp b/src/detail/generator/building.cpp
-index 93a3efde55f2c92b4d2e1638f5fffe47018d975f..0fb2651565af10e3cddc10401ff2c15226f0fd51 100644
--- a/src/detail/generator/building.cpp
+++ b/src/detail/generator/building.cpp
-@@ -75,8 +75,11 @@ building(const Polygon &g, const Kernel::FT &wallHeight,
+@@ -75,8 +75,11 @@ building(const Polygon &g, const Kernel:
// fix orientation
algorithm::makeValidOrientation(polygon);
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,2 @@
sfcgal-config.patch
-cgal6.diff
+cgal6.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/compare/d4854352134e7f4bd261dbdd4986ebf686b0ead0...62725775a4171d9d6efc1be2c28e8ef8816c9035
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/compare/d4854352134e7f4bd261dbdd4986ebf686b0ead0...62725775a4171d9d6efc1be2c28e8ef8816c9035
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240911/aafd108c/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list