Hello community, here is the log from the commit of package openscad for openSUSE:Factory checked in at 2020-10-05 19:36:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openscad (Old) and /work/SRC/openSUSE:Factory/.openscad.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openscad" Mon Oct 5 19:36:45 2020 rev:6 rq:839140 version:2019.05 Changes: -------- --- /work/SRC/openSUSE:Factory/openscad/openscad.changes 2020-03-25 23:50:44.632013459 +0100 +++ /work/SRC/openSUSE:Factory/.openscad.new.4249/openscad.changes 2020-10-05 19:36:49.501417066 +0200 @@ -1,0 +2,10 @@ +Fri Oct 2 08:10:59 UTC 2020 - Dirk Stoecker <[email protected]> + +- fix build with new C++ compilers, add boost_include.diff + +------------------------------------------------------------------- +Thu Aug 20 09:03:01 UTC 2020 - Martin Liška <[email protected]> + +- Use memoryperjob constraint instead of %limit_build macro. + +------------------------------------------------------------------- New: ---- boost_include.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openscad.spec ++++++ --- /var/tmp/diff_new_pack.IPkwLD/_old 2020-10-05 19:36:50.313417860 +0200 +++ /var/tmp/diff_new_pack.IPkwLD/_new 2020-10-05 19:36:50.313417860 +0200 @@ -1,7 +1,7 @@ # # spec file for package openscad # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,10 @@ Summary: Programmers Solid 3D CAD Modeller License: GPL-3.0-or-later Group: Productivity/Graphics/CAD -Url: https://www.openscad.org/ +URL: https://www.openscad.org/ Source: https://files.openscad.org/%{name}-%{version}.src.tar.gz +#PATCH-FIX-UPSTREAM remove and add an include line to fix build +Patch1: boost_include.diff BuildRequires: bison BuildRequires: double-conversion-devel BuildRequires: eigen3-devel @@ -39,7 +41,6 @@ BuildRequires: libcgal-devel BuildRequires: libqscintilla-qt5-devel BuildRequires: libspnav-devel -BuildRequires: memory-constraints BuildRequires: opencsg-devel BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) @@ -59,10 +60,10 @@ %prep %setup -q -n %{name}-%{version} +%patch1 -p1 %build -qmake-qt5 PREFIX=%{_prefix} QMAKE_CXXFLAGS="%{optflags}" CONFIG+=qopenglwidget -%limit_build -m 2200 +qmake-qt5 PREFIX=%{_prefix} QMAKE_CXXFLAGS="%{optflags}" CONFIG+=qopenglwidget CONFIG+=c++14 make %{?_smp_mflags} %install ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.IPkwLD/_old 2020-10-05 19:36:50.341417887 +0200 +++ /var/tmp/diff_new_pack.IPkwLD/_new 2020-10-05 19:36:50.345417891 +0200 @@ -1,10 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> <constraints> <hardware> - <physicalmemory> + <physicalmemory> <size unit="G">3</size> - </physicalmemory> - <memory> + </physicalmemory> + <memory> <size unit="G">5</size> - </memory> + </memory> + <memoryperjob> + <size unit="M">2200</size> + </memoryperjob> </hardware> </constraints> ++++++ boost_include.diff ++++++ diff -ur openscad-2019.05/src/import.cc openscad-2019.05_fix/src/import.cc --- openscad-2019.05/src/import.cc 2019-03-31 06:14:41.000000000 +0200 +++ openscad-2019.05_fix/src/import.cc 2020-10-02 12:34:14.840331047 +0200 @@ -50,7 +50,6 @@ #include <boost/assign/std/vector.hpp> using namespace boost::assign; // bring 'operator+=()' into scope -#include <boost/detail/endian.hpp> #include <cstdint> extern PolySet * import_amf(std::string, const Location &loc); diff -ur openscad-2019.05/src/parser.y openscad-2019.05_fix/src/parser.y --- openscad-2019.05/src/parser.y 2019-04-07 17:45:27.000000000 +0200 +++ openscad-2019.05_fix/src/parser.y 2020-10-02 11:58:27.114794108 +0200 @@ -35,6 +35,7 @@ #else #include <unistd.h> #endif +#include <stack> #include "FileModule.h" #include "UserModule.h"
