one more fix
OBS-URL: https://build.opensuse.org/package/show/graphics/openscad?expand=0&rev=32
This commit is contained in:
parent
19b753afbb
commit
2cfc0e4a5c
22
boost_include.diff
Normal file
22
boost_include.diff
Normal file
@ -0,0 +1,22 @@
|
||||
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"
|
@ -1,7 +1,7 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 2 08:10:59 UTC 2020 - Dirk Stoecker <opensuse@dstoecker.de>
|
||||
|
||||
- fix build with new C++ compilers
|
||||
- fix build with new C++ compilers, add boost_include.diff
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 20 09:03:01 UTC 2020 - Martin Liška <mliska@suse.cz>
|
||||
|
@ -24,6 +24,8 @@ License: GPL-3.0-or-later
|
||||
Group: Productivity/Graphics/CAD
|
||||
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
|
||||
@ -58,6 +60,7 @@ aspects, e.g. modelling of machine parts.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
qmake-qt5 PREFIX=%{_prefix} QMAKE_CXXFLAGS="%{optflags}" CONFIG+=qopenglwidget CONFIG+=c++14
|
||||
|
Loading…
x
Reference in New Issue
Block a user