Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal
Commits: 8f373828 by Bas Couwenberg at 2023-11-20T11:19:42+01:00 Add upstream patch to fix FTBFS due to test failures. - - - - - e2dded86 by Bas Couwenberg at 2023-11-20T11:28:40+01:00 Don't ignore test failures on amd64 & i386. - - - - - 4 changed files: - debian/changelog - + debian/patches/mr295-Fix-algo-visibility.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +sfcgal (1.5.0-2) UNRELEASED; urgency=medium + + * Add upstream patch to fix FTBFS due to test failures. + * Don't ignore test failures on amd64 & i386. + + -- Bas Couwenberg <[email protected]> Mon, 20 Nov 2023 11:19:24 +0100 + sfcgal (1.5.0-1) unstable; urgency=medium * Update symbols for other architectures. ===================================== debian/patches/mr295-Fix-algo-visibility.patch ===================================== @@ -0,0 +1,50 @@ +Description: Fix algo visibility +Author: Loïc Bartoletti <[email protected]> +Origin: https://gitlab.com/sfcgal/SFCGAL/-/merge_requests/295 +Bug: https://gitlab.com/sfcgal/SFCGAL/-/issues/263 + +--- a/src/algorithm/visibility.cpp ++++ b/src/algorithm/visibility.cpp +@@ -161,6 +161,7 @@ visibility(const Geometry &polygon, cons + + Point_2 startPoint{pointA.as<Point>().toPoint_2()}; + Point_2 endPoint{pointB.as<Point>().toPoint_2()}; ++ Point_2 queryPoint{pointB.as<Point>().toPoint_2()}; + + // insert geometry into the arrangement + CGAL::Polygon_with_holes_2 pwh{ +@@ -175,12 +176,21 @@ visibility(const Geometry &polygon, cons + + // If the point is in a boundary segment, find the corresponding half edge + Halfedge_const_handle he = arr.halfedges_begin(); +- while (he->source()->point() != startPoint || +- he->target()->point() != endPoint) { ++ bool cont = !Segment_2(he->source()->point(), he->target()->point()) ++ .has_on(queryPoint) || ++ he->source()->point() == startPoint || ++ he->target()->point() == endPoint || he->face()->is_unbounded(); ++ // While we are not in the right half edge, or while q is the source, ++ // continue ++ while (cont) { + he++; + if (he == arr.halfedges_end()) { + BOOST_THROW_EXCEPTION(Exception("Can not find corresponding half edge.")); + } ++ ++ cont = !Segment_2(he->source()->point(), he->target()->point()) ++ .has_on(queryPoint) || ++ he->source()->point() == queryPoint || he->face()->is_unbounded(); + } + + // visibility query +--- a/test/unit/SFCGAL/algorithm/Visibility.cpp ++++ b/test/unit/SFCGAL/algorithm/Visibility.cpp +@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE(testVisibility_Segm + std::unique_ptr<Polygon> result( + algorithm::visibility(poly, startPoint, endPoint)); + std::string expectedWkt = +- "POLYGON((1.0 2.0,0.0 4.0,0.0 0.0,4.0 0.0,4.0 4.0,1.0 2.0))"; ++ "POLYGON((4.0 0.0,4.0 4.0,1.0 2.0,0.0 1.3,0.0 0.0,3.0 2.0,4.0 0.0))"; + BOOST_CHECK_EQUAL(result->asText(1), expectedWkt); + } + ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ sfcgal-config.patch +mr295-Fix-algo-visibility.patch ===================================== debian/rules ===================================== @@ -30,7 +30,7 @@ override_dh_auto_configure: override_dh_auto_test: ifneq (,$(filter $(DEB_BUILD_ARCH),s390x m68k powerpc ppc64)) # Skip tests -else ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 arm64 i386 mips64el ppc64el hppa hurd-i386 loong64)) +else ifneq (,$(filter $(DEB_BUILD_ARCH),arm64 mips64el ppc64el hppa hurd-i386 loong64)) dh_auto_test || echo "Ignoring test failures" else dh_auto_test View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/compare/2a0e6acb528ad81c5f8aa6b7d9e070df10c8fc32...e2dded86cde70c097b267008230aafb1b82d239e -- View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/compare/2a0e6acb528ad81c5f8aa6b7d9e070df10c8fc32...e2dded86cde70c097b267008230aafb1b82d239e You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
