From abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001
From: Torsten Paul <Torsten.Paul@gmx.de>
Date: Wed, 2 Feb 2022 02:30:59 +0100
Subject: [PATCH] CGAL build fix, v5.4 renames projection traits header files
 and classes.

---
 src/cgalutils-tess.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/cgalutils-tess.cc b/src/cgalutils-tess.cc
index ec1cc1eeb3..37f8cf08b1 100644
--- a/src/cgalutils-tess.cc
+++ b/src/cgalutils-tess.cc
@@ -6,10 +6,12 @@
 #pragma push_macro("NDEBUG")
 #undef NDEBUG
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
-  #include <CGAL/Triangulation_2_projection_traits_3.h>
+#if CGAL_VERSION_NR < 1050401000
+#include <CGAL/Triangulation_2_projection_traits_3.h>
+typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
 #else
-  #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
+#include <CGAL/Projection_traits_3.h>
+typedef CGAL::Filtered_projection_traits_3<K> Projection;
 #endif
 #include <CGAL/Triangulation_face_base_with_info_2.h>
 #pragma pop_macro("NDEBUG")
@@ -19,7 +21,6 @@ struct FaceInfo {
   bool in_domain() { return nesting_level%2 == 1; }
 };
 
-typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
 typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
 typedef CGAL::Triangulation_data_structure_2<
 	CGAL::Triangulation_vertex_base_2<Projection>,
e87127166c351a91369d'>commit</a><a href='/guix/diff/etc/substitutes/berlin.guix.gnu.org.pub?id=337037d22cfcc7764c1ce87127166c351a91369d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/substitutes/berlin.guix.gnu.org.pub'>
<input type='hidden' name='id' value='337037d22cfcc7764c1ce87127166c351a91369d'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=337037d22cfcc7764c1ce87127166c351a91369d'>root</a>/<a href='/guix/log/etc?id=337037d22cfcc7764c1ce87127166c351a91369d'>etc</a>/<a href='/guix/log/etc/substitutes?id=337037d22cfcc7764c1ce87127166c351a91369d'>substitutes</a>/<a href='/guix/log/etc/substitutes/berlin.guix.gnu.org.pub?id=337037d22cfcc7764c1ce87127166c351a91369d'>berlin.guix.gnu.org.pub</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/etc/substitutes/berlin.guix.gnu.org.pub?id=337037d22cfcc7764c1ce87127166c351a91369d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-10 00:11:00 +0200'>2020-07-10</span></td><td><a href='/guix/commit/etc/substitutes/berlin.guix.gnu.org.pub?id=d283bb960f927dd5f7bb8b96bc697221e4e8ad39'>maint: Remove traces of "berlin.guixsd.org".</a><span class='msg-avail'>...<span class='msg-tooltip'>The guixsd.org domain is no longer advertised since before in 1.0.0
release in May 2019.

* etc/substitutes/berlin.guixsd.org.pub: Rename to...
* etc/substitutes/berlin.guix.gnu.org.pub: ... this.
* etc/substitutes/ci.guix.gnu.org.pub,
etc/substitutes/ci.guix.info.pub: Adjust accordingly.
* gnu/services/base.scm (%default-authorized-guix-keys): Likewise.
* guix/build/download-nar.scm (urls-for-item): Likewise.
* guix/self.scm (miscellaneous-files): Likewise.
* Makefile.am (dist_pkgdata_DATA): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>