[Git][debian-gis-team/sfcgal][master] 3 commits: Add upstream patch to fix FTBFS with CGAL 5.3.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / sfcgal


Commits:
87aa7dd8 by Bas Couwenberg at 2021-09-14T15:58:45+02:00
Add upstream patch to fix FTBFS with CGAL 5.3.

- - - - -
edac3ae9 by Bas Couwenberg at 2021-09-14T16:23:29+02:00
Update symbols for amd64.

- - - - -
5a6e7b77 by Bas Couwenberg at 2021-09-14T16:24:12+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/libsfcgal1.symbols
- + debian/patches/0001-NULL-nullptr-for-CGAL-5.3.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,10 +1,12 @@
-sfcgal (1.3.10-2) UNRELEASED; urgency=medium
+sfcgal (1.3.10-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.6.0, no changes.
   * Bump debhelper compat to 12, changes:
     - Drop --list-missing from dh_install
+  * Add upstream patch to fix FTBFS with CGAL 5.3.
+  * Update symbols for amd64.
 
- -- Bas Couwenberg <sebastic at debian.org>  Wed, 08 Sep 2021 17:45:09 +0200
+ -- Bas Couwenberg <sebastic at debian.org>  Tue, 14 Sep 2021 16:24:01 +0200
 
 sfcgal (1.3.10-1) unstable; urgency=medium
 


=====================================
debian/libsfcgal1.symbols
=====================================
The diff for this file was not included because it is too large.

=====================================
debian/patches/0001-NULL-nullptr-for-CGAL-5.3.patch
=====================================
@@ -0,0 +1,37 @@
+Description: NULL -> nullptr for CGAL <= 5.3
+Author: Sébastien Loriot <sebastien.loriot at cgal.org>
+Origin: https://gitlab.com/Oslandia/SFCGAL/-/commit/f929b291d4efe9b780812677fd523d2431519fcf
+Bug: https://gitlab.com/Oslandia/SFCGAL/-/merge_requests/246
+
+--- a/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h
++++ b/CGAL_patches/CGAL/internal/corefinement/Combinatorial_map_output_builder.h
+@@ -888,16 +888,16 @@ public:
+ 
+       if (!first_hedge->is_border())
+         selected_hedge_to_dart
+-          .insert(std::make_pair(first_hedge,Dart_handle(NULL)));
++          .insert(std::make_pair(first_hedge,Dart_handle(nullptr)));
+       if (!first_hedge->opposite()->is_border())
+         selected_hedge_to_dart
+-          .insert(std::make_pair(first_hedge->opposite(),Dart_handle(NULL)));
++          .insert(std::make_pair(first_hedge->opposite(),Dart_handle(nullptr)));
+       if (!second_hedge->is_border())
+         selected_hedge_to_dart
+-          .insert(std::make_pair(second_hedge,Dart_handle(NULL)));
++          .insert(std::make_pair(second_hedge,Dart_handle(nullptr)));
+       if (!second_hedge->opposite()->is_border())
+         selected_hedge_to_dart
+-          .insert(std::make_pair(second_hedge->opposite(),Dart_handle(NULL)));
++          .insert(std::make_pair(second_hedge->opposite(),Dart_handle(nullptr)));
+     }
+ 
+ #ifdef CGAL_COREFINEMENT_DEBUG
+@@ -964,7 +964,7 @@ public:
+ #ifndef NDEBUG
+     for(typename Halfedge_to_dart_map::iterator it=selected_hedge_to_dart.begin();
+         it!=selected_hedge_to_dart.end(); ++it)
+-      CGAL_assertion(it->second!=Dart_handle(NULL));
++      CGAL_assertion(it->second!=Dart_handle(nullptr));
+ #endif
+ 
+     CGAL_assertion(final_map().is_valid());


=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
 sfcgal-config.patch
+0001-NULL-nullptr-for-CGAL-5.3.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/compare/0d179dd7c252156a68abb3101fd65e07064ca844...5a6e7b77b026304ec3ee878a31bc797cee250a60

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/sfcgal/-/compare/0d179dd7c252156a68abb3101fd65e07064ca844...5a6e7b77b026304ec3ee878a31bc797cee250a60
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/20210914/ee16209b/attachment-0001.htm>