From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1709369-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A9D1D1581F0
for <garchives@archives.gentoo.org>; Tue, 14 Jan 2025 16:20:34 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9E823E0823;
Tue, 14 Jan 2025 16:20:33 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 1FC46E0823
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Jan 2025 16:20:33 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EB7C3340DD9
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Jan 2025 16:20:31 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 421441D2A
for <gentoo-commits@lists.gentoo.org>; Tue, 14 Jan 2025 16:20:30 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1736869691.41dfe556d7db6a4e677d63f5bf9e47f7a380a9e5.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-gfx/openscad/Manifest media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch media-gfx/openscad/openscad-2021.01-r5.ebuild
X-VCS-Directories: media-gfx/openscad/ media-gfx/openscad/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 41dfe556d7db6a4e677d63f5bf9e47f7a380a9e5
X-VCS-Branch: master
Date: Tue, 14 Jan 2025 16:20:30 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: d8a00966-a182-42a1-a74c-d61ab5b8a227
X-Archives-Hash: 19b2cda8f409f65238e53efea7f625d2
commit: 41dfe556d7db6a4e677d63f5bf9e47f7a380a9e5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 13 22:18:47 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 14 15:48:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dfe556
media-gfx/openscad: drop 2021.01-r5
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/openscad/Manifest | 1 -
...1-Gentoo-specific-Disable-ccache-building.patch | 32 ------
...penscad-2021.01-0002-fix-to-find-lib3mf-2.patch | 43 --------
...fix-v5.4-renames-projection-traits-header.patch | 36 -------
...96-Out-of-bounds-memory-access-in-DXF-loa.patch | 74 -------------
...97-Out-of-bounds-memory-access-in-comment.patch | 25 -----
...ailure-with-generic_print_polyhedron-on-C.patch | 42 --------
...1.01-Fix-build-issue-with-overloaded-join.patch | 60 -----------
...le-quoting-of-the-output-file-parameter-f.patch | 20 ----
.../files/openscad-2021.01-boost-1.85.patch | 12 ---
media-gfx/openscad/openscad-2021.01-r5.ebuild | 118 ---------------------
11 files changed, 463 deletions(-)
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index 03d32353cffc..1f822d2c1cc8 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -1,4 +1,3 @@
-DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128
DIST openscad-2024.12.30_pre.tar.gz 25338952 BLAKE2B 41baa7f5df30e46611a2ef59dc0aa05ccb85644dddfb979224b5b026f1b9338285eecd50e2078543163621c89fbc81e97b7593b641a223b48ca02029962f8076 SHA512 e63ac792c16852c1bbdf06a3cb044b453e05c20a95158adddbc09239bcf228fd113a6e33f83d5580e615ecab3cdab8436da9e21d2ab3c3f8846f66219218713b
DIST openscad-20241114.tar.gz 25288312 BLAKE2B 0c1a9b4b15c12f4b3b600e81cdb5eeddb34887c83e2ae67735d7221b6660730dc5e7f97f80b84d187772adfa20d15e20f0cded1b4937e26305434847bbf2af27 SHA512 6c66c09e4b72ec5ef200d077b58fcb7a5a9acd359551a5daebdc3e24cb2cb7ed7d607b04e5563ea6f14d9d929310c3a9194ac889f2530c2c933235271040981a
DIST openscad-MCAD-bd0a7ba3f042bfbced5ca1894b236cea08904e26.tar.gz 58895 BLAKE2B e154a38e1c36873a34f7c80b8fa484e4bbcb1b0c217e15b977e6cedc9a83fd2e1518791f9a58a4f0e893c2a55947d7eaddb660d8b725eca048c30f0ea41cf14a SHA512 c6208a90f6a58ebdc0477d3e1b6be2f52e4ce976ac619a87818437cb9696b7e83285564fde757d32efaf50033d5217b55f67b6ce342250de838dd09fef334f36
diff --git a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
deleted file mode 100644
index 6de581078d27..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-0001-Gentoo-specific-Disable-ccache-building.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c138881767262b9f5c64a465a0e1e46ffcfc5899 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 28 Feb 2021 16:51:30 +0100
-Subject: [PATCH] [Gentoo specific] Disable ccache building
-
-On Gentoo, we use a USE flag to determine whether ccache
-should be used for building.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- openscad.pro | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/openscad.pro b/openscad.pro
-index b76ca76..678e08d 100755
---- a/openscad.pro
-+++ b/openscad.pro
-@@ -211,11 +211,6 @@ mdi {
- DEFINES += ENABLE_MDI
- }
-
--system("ccache -V >/dev/null 2>/dev/null") {
-- CONFIG += ccache
-- message("Using ccache")
--}
--
- include(common.pri)
-
- # mingw has to come after other items so OBJECT_DIRS will work properly
---
-2.30.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch b/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
deleted file mode 100644
index 1995bd6e0ac4..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-0002-fix-to-find-lib3mf-2.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 16847a70cf05484a668d8f79aba4ccec7e16c025 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sat, 6 Mar 2021 22:59:17 +0100
-Subject: [PATCH] fix to find lib3mf-2
-
-The pkgconfig file for lib3mf has been renamed in case
-for lib3mf-2 versions.
-This patch uses the news names.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- features/lib3mf.prf | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/features/lib3mf.prf b/features/lib3mf.prf
-index 2c512da..47be364 100644
---- a/features/lib3mf.prf
-+++ b/features/lib3mf.prf
-@@ -15,8 +15,8 @@ isEmpty(LIB3MF_LIBPATH) {
- }
-
- isEmpty(LIB3MF_INCLUDEPATH) {
-- LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3MF")
-- LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3MF")
-+ LIB3MF_CFLAGS = $$system("$$PKG_CONFIG --cflags lib3mf")
-+ LIB3MF_INCLUDEPATH = $$system("$$PKG_CONFIG --variable=includedir lib3mf")
- !isEmpty(LIB3MF_CFLAGS) {
- ENABLE_LIB3MF=yes
- }
-@@ -25,8 +25,8 @@ isEmpty(LIB3MF_INCLUDEPATH) {
- }
-
- isEmpty(LIB3MF_LIBPATH) {
-- LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3MF")
-- LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3MF")
-+ LIB3MF_LIBS = $$system("$$PKG_CONFIG --libs lib3mf")
-+ LIB3MF_LIBPATH = $$system("$$PKG_CONFIG --variable=libdir lib3mf")
- !isEmpty(LIB3MF_LIBS) {
- ENABLE_LIB3MF=yes
- }
---
-2.30.1
-
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
deleted file mode 100644
index 5fea4998683d..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
deleted file mode 100644
index 6c0a9558e3fb..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From https://github.com/openscad/openscad/commit/00a4692989c4e2f191525f73f24ad8727bacdf41 Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Sat, 5 Feb 2022 18:38:31 +0100
-Subject: [PATCH 01/11] CVE-2022-0496 Out-of-bounds memory access in DXF
- loader.
-
-Public issue:
-https://github.com/openscad/openscad/issues/4037
-
-Fix in master branch:
-https://github.com/openscad/openscad/pull/4090
---- a/src/dxfdata.cc
-+++ b/src/dxfdata.cc
-@@ -441,6 +441,11 @@ DxfData::DxfData(double fn, double fs, double fa,
- auto lv = grid.data(this->points[lines[idx].idx[j]][0], this->points[lines[idx].idx[j]][1]);
- for (size_t ki = 0; ki < lv.size(); ++ki) {
- int k = lv.at(ki);
-+ if (k < 0 || k >= lines.size()) {
-+ LOG(message_group::Warning,Location::NONE,"",
-+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+ continue;
-+ }
- if (k == idx || lines[k].disabled) continue;
- goto next_open_path_j;
- }
-@@ -466,13 +471,20 @@ DxfData::DxfData(double fn, double fs, double fa,
- auto lv = grid.data(ref_point[0], ref_point[1]);
- for (size_t ki = 0; ki < lv.size(); ++ki) {
- int k = lv.at(ki);
-+ if (k < 0 || k >= lines.size()) {
-+ LOG(message_group::Warning,Location::NONE,"",
-+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+ continue;
-+ }
- if (lines[k].disabled) continue;
-- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
-+ auto idk0 = lines[k].idx[0]; // make it easier to read and debug
-+ auto idk1 = lines[k].idx[1];
-+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
- current_line = k;
- current_point = 0;
- goto found_next_line_in_open_path;
- }
-- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
-+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
- current_line = k;
- current_point = 1;
- goto found_next_line_in_open_path;
-@@ -501,13 +513,20 @@ DxfData::DxfData(double fn, double fs, double fa,
- auto lv = grid.data(ref_point[0], ref_point[1]);
- for (size_t ki = 0; ki < lv.size(); ++ki) {
- int k = lv.at(ki);
-+ if (k < 0 || k >= lines.size()) {
-+ LOG(message_group::Warning,Location::NONE,"",
-+ "Bad DXF line index in %1$s.",QuotedString(boostfs_uncomplete(filename, fs::current_path()).generic_string()));
-+ continue;
-+ }
- if (lines[k].disabled) continue;
-- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[0]][0], this->points[lines[k].idx[0]][1])) {
-+ auto idk0 = lines[k].idx[0]; // make it easier to read and debug
-+ auto idk1 = lines[k].idx[1];
-+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk0][0], this->points[idk0][1])) {
- current_line = k;
- current_point = 0;
- goto found_next_line_in_closed_path;
- }
-- if (grid.eq(ref_point[0], ref_point[1], this->points[lines[k].idx[1]][0], this->points[lines[k].idx[1]][1])) {
-+ if (grid.eq(ref_point[0], ref_point[1], this->points[idk1][0], this->points[idk1][1])) {
- current_line = k;
- current_point = 1;
- goto found_next_line_in_closed_path;
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch b/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
deleted file mode 100644
index 39ef72406f47..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From https://github.com/openscad/openscad/commit/84addf3c1efbd51d8ff424b7da276400bbfa1a4b Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Sat, 5 Feb 2022 18:45:29 +0100
-Subject: [PATCH 02/11] CVE-2022-0497 Out-of-bounds memory access in comment
- parser.
-
-Public issue:
-https://github.com/openscad/openscad/issues/4043
-
-Fix in master branch:
-https://github.com/openscad/openscad/pull/4044
---- a/src/comment.cpp
-+++ b/src/comment.cpp
-@@ -92,7 +92,7 @@ static std::string getComment(const std::string &fulltext, int line)
- }
-
- int end = start + 1;
-- while (fulltext[end] != '\n') end++;
-+ while (end < fulltext.size() && fulltext[end] != '\n') end++;
-
- std::string comment = fulltext.substr(start, end - start);
-
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
deleted file mode 100644
index f09954bf01be..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/851189
-From https://github.com/openscad/openscad/commit/9aa0d7e9f2914fe5f547bdde69202161d1c6064d Mon Sep 17 00:00:00 2001
-From: Jordan Brown <github@jordan.maileater.net>
-Date: Sun, 18 Jul 2021 21:01:46 -0700
-Subject: [PATCH 05/11] Fix build failure with "generic_print_polyhedron" on
- CGAL-5.3.
-
---- a/src/cgalutils-polyhedron.cc
-+++ b/src/cgalutils-polyhedron.cc
-@@ -337,19 +337,6 @@ namespace CGALUtils {
- }
- };
-
-- template <typename Polyhedron>
-- std::string printPolyhedron(const Polyhedron &p) {
-- std::ostringstream sstream;
-- sstream.precision(20);
--
-- Polyhedron_writer writer;
-- generic_print_polyhedron(sstream, p, writer);
--
-- return sstream.str();
-- }
--
-- template std::string printPolyhedron(const CGAL_Polyhedron &p);
--
- }; // namespace CGALUtils
-
- #endif /* ENABLE_CGAL */
---- a/src/cgalutils.h
-+++ b/src/cgalutils.h
-@@ -45,7 +45,6 @@ namespace CGALUtils {
- bool is_approximately_convex(const PolySet &ps);
- Geometry const* applyMinkowski(const Geometry::Geometries &children);
-
-- template <typename Polyhedron> std::string printPolyhedron(const Polyhedron &p);
- template <typename Polyhedron> bool createPolySetFromPolyhedron(const Polyhedron &p, PolySet &ps);
- template <typename Polyhedron> bool createPolyhedronFromPolySet(const PolySet &ps, Polyhedron &p);
- template <class Polyhedron_A, class Polyhedron_B>
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch b/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch
deleted file mode 100644
index 7a70b183d447..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.gentoo.org/851189
-From https://github.com/openscad/openscad/commit/08bf69b4115c989fc5671254e0d05735d01bcca5 Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Wed, 2 Feb 2022 00:50:43 +0100
-Subject: [PATCH 10/11] Fix build issue with overloaded join().
-
---- a/src/openscad.cc
-+++ b/src/openscad.cc
-@@ -65,7 +65,6 @@
- #include <chrono>
- #include <boost/algorithm/string.hpp>
- #include <boost/algorithm/string/split.hpp>
--#include <boost/algorithm/string/join.hpp>
- #include <boost/range/adaptor/transformed.hpp>
- #include <boost/program_options.hpp>
- #include <boost/filesystem.hpp>
-@@ -307,7 +306,7 @@ void set_render_color_scheme(const std::string color_scheme, const bool exit_if_
- }
-
- if (exit_if_not_found) {
-- LOG(message_group::None,Location::NONE,"",(boost::join(ColorMap::inst()->colorSchemeNames(), "\n")));
-+ LOG(message_group::None,Location::NONE,"",(boost::algorithm::join(ColorMap::inst()->colorSchemeNames(), "\n")));
-
- exit(1);
- } else {
-@@ -885,7 +884,7 @@ struct CommaSeparatedVector
- };
-
- template <class Seq, typename ToString>
--std::string join(const Seq &seq, const std::string &sep, const ToString &toString)
-+std::string str_join(const Seq &seq, const std::string &sep, const ToString &toString)
- {
- return boost::algorithm::join(boost::adaptors::transform(seq, toString), sep);
- }
-@@ -947,7 +946,7 @@ int main(int argc, char **argv)
- ("P,P", po::value<string>(), "customizer parameter set")
- #ifdef ENABLE_EXPERIMENTAL
- ("enable", po::value<vector<string>>(), ("enable experimental features: " +
-- join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
-+ str_join(boost::make_iterator_range(Feature::begin(), Feature::end()), " | ",
- [](const Feature *feature) {
- return feature->get_name();
- }) +
-@@ -964,11 +963,11 @@ int main(int argc, char **argv)
- ("render", po::value<string>()->implicit_value(""), "for full geometry evaluation when exporting png")
- ("preview", po::value<string>()->implicit_value(""), "[=throwntogether] -for ThrownTogether preview png")
- ("animate", po::value<unsigned>(), "export N animated frames")
-- ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::join(viewOptions.names(), " | ")).c_str())
-+ ("view", po::value<CommaSeparatedVector>(), ("=view options: " + boost::algorithm::join(viewOptions.names(), " | ")).c_str())
- ("projection", po::value<string>(), "=(o)rtho or (p)erspective when exporting png")
- ("csglimit", po::value<unsigned int>(), "=n -stop rendering at n CSG elements when exporting png")
- ("colorscheme", po::value<string>(), ("=colorscheme: " +
-- join(ColorMap::inst()->colorSchemeNames(), " | ",
-+ str_join(ColorMap::inst()->colorSchemeNames(), " | ",
- [](const std::string& colorScheme) {
- return (colorScheme == ColorMap::inst()->defaultColorSchemeName() ? "*" : "") + colorScheme;
- }) +
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch b/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch
deleted file mode 100644
index 20167b910ee4..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-Remove-double-quoting-of-the-output-file-parameter-f.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From https://github.com/openscad/openscad/commit/45a5e3bdd6c8071cb50b9c3f2b14a62554aafc4a Mon Sep 17 00:00:00 2001
-From: Torsten Paul <Torsten.Paul@gmx.de>
-Date: Thu, 14 Apr 2022 16:07:04 +0200
-Subject: [PATCH 11/11] Remove double quoting of the output file parameter for
- ghostscript.
-
---- a/tests/export_pngtest.py
-+++ b/tests/export_pngtest.py
-@@ -82,7 +82,7 @@ result = subprocess.call(export_cmd, env = fontenv)
- if result != 0:
- failquit('OpenSCAD failed with return code ' + str(result))
-
--convert_cmd = gs_cmd + ["-sOutputFile=\"" + pngfile + "\"", exportfile]
-+convert_cmd = gs_cmd + ["-sOutputFile=" + pngfile, exportfile]
- print('Running Converter:', ' '.join(convert_cmd), file=sys.stderr)
- result = subprocess.call(convert_cmd)
- if result != 0:
---
-2.35.1
-
diff --git a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch b/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
deleted file mode 100644
index e3370f32fc38..000000000000
--- a/media-gfx/openscad/files/openscad-2021.01-boost-1.85.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff '--color=auto' -ur openscad-2021.01-orig/src/FileModule.cc openscad-2021.01/src/FileModule.cc
---- openscad-2021.01-orig/src/FileModule.cc 2021-01-31 21:17:41.000000000 +0100
-+++ openscad-2021.01/src/FileModule.cc 2024-05-20 07:50:31.746487490 +0200
-@@ -65,7 +65,7 @@
- auto ext = fs::path(path).extension().generic_string();
-
- if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
-- if (fs::is_regular(path)) {
-+ if (fs::is_regular_file(path)) {
- FontCache::instance()->register_font_file(path);
- } else {
- LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path);
diff --git a/media-gfx/openscad/openscad-2021.01-r5.ebuild b/media-gfx/openscad/openscad-2021.01-r5.ebuild
deleted file mode 100644
index 3e4af4844ba7..000000000000
--- a/media-gfx/openscad/openscad-2021.01-r5.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common flag-o-matic qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-IUSE="emacs"
-# tests are not fully working and need cmake which isn't yet
-# officially supported.
-RESTRICT="test"
-
-RDEPEND="
- dev-cpp/eigen:3
- dev-libs/boost:=
- dev-libs/double-conversion:=
- dev-libs/glib:2
- dev-libs/gmp:0=
- dev-libs/hidapi
- dev-libs/libspnav
- dev-libs/libxml2
- dev-libs/libzip:=
- dev-libs/mpfr:0=
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5[-gles2-only]
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- media-gfx/opencsg:=
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/glew-2.0.0:0=
- media-libs/harfbuzz:=
- media-libs/lib3mf
- sci-mathematics/cgal:=
- x11-libs/cairo
- >=x11-libs/qscintilla-2.10.3:=[qt5(+)]
- emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/itstool
- app-alternatives/yacc
- app-alternatives/lex
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-0001-Gentoo-specific-Disable-ccache-building.patch
- "${FILESDIR}"/${P}-0002-fix-to-find-lib3mf-2.patch
- "${FILESDIR}"/${P}-CVE-2022-0496-Out-of-bounds-memory-access-in-DXF-loa.patch
- "${FILESDIR}"/${P}-CVE-2022-0497-Out-of-bounds-memory-access-in-comment.patch
- "${FILESDIR}"/${P}-Fix-build-failure-with-generic_print_polyhedron-on-C.patch
- "${FILESDIR}"/${P}-CGAL-build-fix-v5.4-renames-projection-traits-header.patch
- "${FILESDIR}"/${P}-Fix-build-issue-with-overloaded-join.patch
- "${FILESDIR}"/${P}-Remove-double-quoting-of-the-output-file-parameter-f.patch
- "${FILESDIR}"/${P}-boost-1.85.patch
-)
-
-src_configure() {
- # -Werror=odr
- # https://github.com/openscad/openscad/issues/5239
- filter-lto
-
- if has ccache ${FEATURES}; then
- eqmake5 "PREFIX = ${ESYSROOT}/usr" "CONFIG += ccache" "${PN}.pro"
- else
- eqmake5 "PREFIX = ${ESYSROOT}/usr" "${PN}.pro"
- fi
-}
-
-src_compile() {
- # We have random parallel build issues, bug #856430
- emake -j1
-
- if use emacs ; then
- elisp-compile contrib/*.el
- fi
-}
-
-src_install() {
- emake install INSTALL_ROOT="${D}"
-
- if use emacs; then
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- elisp-install ${PN} contrib/*.el contrib/*.elc
- fi
-
- mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales"
- ln -sf ../locale "${ED}"/usr/share/openscad/locale || die
-
- einstalldocs
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}