Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openscad for openSUSE:Factory checked in at 2021-08-27 21:43:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openscad (Old) and /work/SRC/openSUSE:Factory/.openscad.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openscad" Fri Aug 27 21:43:55 2021 rev:10 rq:914537 version:2021.01 Changes: -------- --- /work/SRC/openSUSE:Factory/openscad/openscad.changes 2021-05-16 23:44:08.393133443 +0200 +++ /work/SRC/openSUSE:Factory/.openscad.new.1899/openscad.changes 2021-08-27 21:45:04.610052648 +0200 @@ -1,0 +2,6 @@ +Fri Aug 27 07:43:42 UTC 2021 - Samu Voutilainen <s...@smar.fi> + +- Added patch fix_build_with_cgal-5.3.patch. + Upstream patch to fix build with CGAL-5.3. + +------------------------------------------------------------------- New: ---- fix_build_with_cgal-5.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openscad.spec ++++++ --- /var/tmp/diff_new_pack.WY20SP/_old 2021-08-27 21:45:05.242053401 +0200 +++ /var/tmp/diff_new_pack.WY20SP/_new 2021-08-27 21:45:05.246053406 +0200 @@ -24,6 +24,7 @@ Group: Productivity/Graphics/CAD URL: https://www.openscad.org/ Source: https://files.openscad.org/%{name}-%{version}.src.tar.gz +Patch1: fix_build_with_cgal-5.3.patch BuildRequires: bison BuildRequires: double-conversion-devel BuildRequires: eigen3-devel @@ -63,6 +64,8 @@ %prep %setup -q +%patch1 -p1 + %build %qmake5 PREFIX=%{_prefix} CONFIG+=qopenglwidget CONFIG+=c++14 # As of 08.05.2021, memoryperjob constraint is not working correctly, ++++++ fix_build_with_cgal-5.3.patch ++++++ commit cc49ad8dac24309f5452d5dea9abd406615a52d9 Author: Jordan Brown <git...@jordan.maileater.net> Date: Sun Jul 18 21:01:46 2021 -0700 Upstream: merged Subject: Upstream patch to fix build with cgal-5.3. Fix build failure with "generic_print_polyhedron" on CGAL-5.3. diff --git a/src/cgalutils-polyhedron.cc b/src/cgalutils-polyhedron.cc index 0e5c72c36..14bddb7f4 100644 --- a/src/cgalutils-polyhedron.cc +++ b/src/cgalutils-polyhedron.cc @@ -335,19 +335,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 */ diff --git a/src/cgalutils.h b/src/cgalutils.h index 231762ebc..7da5a25ca 100644 --- a/src/cgalutils.h +++ b/src/cgalutils.h @@ -33,7 +33,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>
