diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2022-06-13 08:06:49 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2022-07-03 14:51:21 +0300 |
| commit | e89baa8837fb77c1b0bcabb611e1cd7a03468af9 (patch) | |
| tree | 6c46a34747f843e7f449912b8f5fe9eb31f68990 /media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch | |
| parent | dev-libs/argtable: drop 2.13-r1 (diff) | |
| download | gentoo-e89baa8837fb77c1b0bcabb611e1cd7a03468af9.tar.gz gentoo-e89baa8837fb77c1b0bcabb611e1cd7a03468af9.tar.bz2 gentoo-e89baa8837fb77c1b0bcabb611e1cd7a03468af9.zip | |
media-gfx/openscad: fix build against >=cgal-5.4.1
Also address two CVE issues, CVE-2022-0496 and CVE-2022-0497
Fix double quoting of output file parameter for ghostscript
Closes: https://bugs.gentoo.org/851189
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25870
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch')
| -rw-r--r-- | media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch new file mode 100644 index 000000000000..5fea4998683d --- /dev/null +++ b/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/851189 +From https://github.com/openscad/openscad/commit/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 09/11] CGAL build fix, v5.4 renames projection traits header + files and classes. + +--- 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>, +-- +2.35.1 + |