Hello community, here is the log from the commit of package openscad for openSUSE:Factory checked in at 2019-03-22 15:07:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openscad (Old) and /work/SRC/openSUSE:Factory/.openscad.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openscad" Fri Mar 22 15:07:29 2019 rev:3 rq:687068 version:2015.03 Changes: -------- --- /work/SRC/openSUSE:Factory/openscad/openscad.changes 2017-12-18 08:58:18.290283600 +0100 +++ /work/SRC/openSUSE:Factory/.openscad.new.25356/openscad.changes 2019-03-22 15:08:08.101454679 +0100 @@ -1,0 +2,8 @@ +Wed Mar 20 00:14:44 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Cleanup BuildRequires, sort, remove duplicates +- Fix Url:, openscad.org redirects to www.openscad.org +- Add openscad-git_c68684f9520d.patch, fix build with Boost 1.69 +- Use %license, remove %defattr + +------------------------------------------------------------------- New: ---- openscad-git_c68684f9520d.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openscad.spec ++++++ --- /var/tmp/diff_new_pack.lgUt23/_old 2019-03-22 15:08:09.197453731 +0100 +++ /var/tmp/diff_new_pack.lgUt23/_new 2019-03-22 15:08:09.201453727 +0100 @@ -1,7 +1,7 @@ # # spec file for package openscad # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,49 +20,45 @@ Version: 2015.03 Release: 0 Summary: Programmers Solid 3D CAD Modeller -License: GPL-3.0+ +License: GPL-3.0-or-later Group: Productivity/Graphics/CAD -Url: http://openscad.org/ +Url: http://www.openscad.org/ Source: http://files.openscad.org/%{name}-%{version}-2.src.tar.gz #PATCH-FIX-UPSTREAM openscad-git4fa5f0340a.patch -- Fix Build with Qt 5.7.1 Patch0: openscad-git4fa5f0340a.patch +# PATCH-FIX-UPSTREAM https://github.com/openscad/openscad/commit/c68684f9520d.patch -- Fix build with Boost 1.69 +Patch1: openscad-git_c68684f9520d.patch +BuildRequires: eigen3-devel BuildRequires: flex +BuildRequires: fontconfig-devel +BuildRequires: freetype2-devel BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: harfbuzz-devel BuildRequires: libcgal-devel BuildRequires: opencsg-devel -BuildRequires: freetype2-devel -BuildRequires: harfbuzz-devel -BuildRequires: boost-devel %if 0%{?suse_version} -BuildRequires: Mesa-devel BuildRequires: bison -BuildRequires: libeigen3-devel +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_program_options-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_thread-devel BuildRequires: libqscintilla-qt5-devel BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: fontconfig-devel -BuildRequires: libboost_thread-devel -BuildRequires: libboost_program_options-devel -BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_system-devel -BuildRequires: libboost_regex-devel - - %endif %if 0%{?fedora_version} +BuildRequires: boost-devel BuildRequires: byacc -BuildRequires: eigen3-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGLU-devel BuildRequires: qscintilla-devel BuildRequires: qt-devel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description OpenSCAD is a software for creating solid 3D CAD objects. It does not @@ -73,6 +69,7 @@ %prep %setup -q -n %{name}-%{version}-2 %patch0 -p1 +%patch1 -p1 %build %if 0%{?suse_version} @@ -89,8 +86,8 @@ %find_lang %{name} %files -f %{name}.lang -%defattr(-,root,root) -%doc COPYING README.md RELEASE_NOTES doc/*.pdf +%doc README.md RELEASE_NOTES doc/*.pdf +%license COPYING %{_bindir}/openscad %{_datadir}/openscad/ %{_datadir}/applications/openscad.desktop ++++++ openscad-git_c68684f9520d.patch ++++++ >From c68684f9520d6c241dd5d96e57a0020837504a32 Mon Sep 17 00:00:00 2001 From: Marius Kintel <mar...@kintel.net> Date: Sun, 21 Oct 2018 12:02:50 -0400 Subject: [PATCH] Build fix for boost 1.69 --- src/CSGTermEvaluator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CSGTermEvaluator.cc b/src/CSGTermEvaluator.cc index 6416f29b6e..b3753cf431 100644 --- a/src/CSGTermEvaluator.cc +++ b/src/CSGTermEvaluator.cc @@ -109,7 +109,7 @@ static shared_ptr<CSGTerm> evaluate_csg_term_from_geometry(const State &state, shared_ptr<const PolySet> ps = dynamic_pointer_cast<const PolySet>(geom); // Since is_convex() doesn't handle non-planar faces, we need to tessellate // also in the indeterminate state so we cannot just use a boolean comparison. See #1061 - bool convex = ps->convexValue(); + bool convex{ps->convexValue()}; if (ps && !convex) { assert(ps->getDimension() == 3); PolySet *ps_tri = new PolySet(3, ps->convexValue());
