diff options
Diffstat (limited to 'media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch')
| -rw-r--r-- | media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch | 60 |
1 files changed, 60 insertions, 0 deletions
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 new file mode 100644 index 000000000000..7a70b183d447 --- /dev/null +++ b/media-gfx/openscad/files/openscad-2021.01-Fix-build-issue-with-overloaded-join.patch @@ -0,0 +1,60 @@ +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 + |