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>,
46cd84d5747782c2328574b92d346c26405172f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/gnunet.scm'>
<input type='hidden' name='id' value='946cd84d5747782c2328574b92d346c26405172f'/><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=946cd84d5747782c2328574b92d346c26405172f'>root</a>/<a href='/guix/log/gnu?id=946cd84d5747782c2328574b92d346c26405172f'>gnu</a>/<a href='/guix/log/gnu/packages?id=946cd84d5747782c2328574b92d346c26405172f'>packages</a>/<a href='/guix/log/gnu/packages/gnunet.scm?id=946cd84d5747782c2328574b92d346c26405172f'>gnunet.scm</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/gnu/packages/gnunet.scm?id=946cd84d5747782c2328574b92d346c26405172f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-29 10:45:45 +0100'>2023-12-29</span></td><td><a href='/guix/commit/gnu/packages/gnunet.scm?id=f90d6adec787187f7929159e3327c73245d3bbe3'>gnu: gnunet-gtk: Update to 0.20.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gnunet.scm (gnunet-gtk): Update to 0.20.0.

Signed-off-by: Guillaume Le Vaillant &lt;glv@posteo.net&gt;
Change-Id: I293aecd0e7074d2b522d955ab4509a5eeb1cf7d6
</span></span></td><td>Adam Faiz</td></tr>
<tr><td><span title='2023-12-29 10:44:03 +0100'>2023-12-29</span></td><td><a href='/guix/commit/gnu/packages/gnunet.scm?id=d68517059f12f9adf86adfa3f087ab7d93bc2f15'>gnu: gnunet: Update to 0.20.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gnunet.scm (gnunet): Update to 0.20.0.
  [source]: Remove snippet.

Change-Id: I1157f586764f9282d331596ca83bb8850ddee7ab
Signed-off-by: Guillaume Le Vaillant &lt;glv@posteo.net&gt;
</span></span></td><td>Adam Faiz</td></tr>
<tr><td><span title='2023-09-25 11:30:01 +0100'>2023-09-25</span></td><td><a href='/guix/commit/gnu/packages/gnunet.scm?id=ce22a756d066f3e329b183893d48ac3a5b627a6a'>gnu: guile-fibers: Remove version from latest package.</a><span class='msg-avail'>...<span class='msg-tooltip'>As I think this makes more sense, the version is only specified when you need
a specific previous release.

* gnu/packages/guile-xyz.scm (guile-fibers): Rename to guile-fibers-1.0.
(guile-fibers-1.3): Rename to guile-fibers.
(guile-fibers-1.1): Inherit from guile-fibers.
* gnu/packages/admin.scm (shepherd-0.10)[native-inputs]: Replace
guile-fibers-1.3 with guile-fibers.
* gnu/packages/ci.scm (cuirass)[inputs]: Likewise.
* gnu/packages/gnunet.scm (gnunet-scheme)[propagated-inputs,native-inputs]:
Likewise.
* gnu/packages/package-management.scm (guix-build-coordinator)
[inputs,propagated-inputs]: Likewise.
* gnu/packages/package-management.scm (nar-herder)[inputs,propagated-inputs]:
Likewise.
* gnu/packages/web.scm (guix-data-service)[propagated-inputs]: Likewise.
</span></span></td><td>Christopher Baines</td></tr>