[packages/CuraEngine] - updated static-libstdcpp patch is back; release 3

[qboosh]

commit 84b0a036857550660ef354cb0635355d1c509597
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 27 11:41:54 2020 +0200

    - updated static-libstdcpp patch is back; release 3

 CuraEngine-static-libstdcpp.patch | 12 ++++++------
 CuraEngine.spec                   |  6 ++++--
 2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/CuraEngine.spec b/CuraEngine.spec
index 92158bb..91570a1 100644
--- a/CuraEngine.spec
+++ b/CuraEngine.spec
@@ -6,7 +6,7 @@ Summary:	Engine for processing 3D models into G-code instructions for 3D printer
 Summary(pl.UTF-8):	Silnik do przetwarzania modeli 3D na instrukcje G-code dla drukarek 3D
 Name:		CuraEngine
 Version:	4.5.0
-Release:	2
+Release:	3
 Epoch:		1
 License:	AGPL v3
 Group:		Applications/Engineering
@@ -16,9 +16,10 @@ Source0:	https://github.com/Ultimaker/CuraEngine/archive/%{version}/%{name}-%{ve
 Source1:	https://raw.githubusercontent.com/nothings/stb/master/stb_image.h
 # Source1-md5:	a1170ba8b5f36154a8b9859f17ee8470
 Patch0:		%{name}-rpath.patch
+Patch1:		%{name}-static-libstdcpp.patch
 Patch2:		local-stb.patch
 URL:		https://github.com/Ultimaker/CuraEngine
-BuildRequires:	cmake >= 2.8.12
+BuildRequires:	cmake >= 3.6.0
 BuildRequires:	libArcus-devel = %{version}
 BuildRequires:	libgomp-devel
 BuildRequires:	libstdc++-devel >= 6:4.7
@@ -49,6 +50,7 @@ pakiecie cura.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %patch2 -p1
 
 mkdir stb
diff --git a/CuraEngine-static-libstdcpp.patch b/CuraEngine-static-libstdcpp.patch
index 273016f..b35bd50 100644
--- a/CuraEngine-static-libstdcpp.patch
+++ b/CuraEngine-static-libstdcpp.patch
@@ -11,17 +11,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 1ec537d..bc5cf85 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -36,10 +36,6 @@ endif()
- # Add warnings
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+@@ -97,10 +97,6 @@
+     endif()
+ endif ()
  
 -if(NOT APPLE AND NOT WIN32)
 -    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++")
 -endif()
 -
- option (ENABLE_OPENMP
-     "Use OpenMP for parallel code" ON)
- 
+ if (WIN32)
+     add_definitions(-DNOMINMAX)
+ endif()
 -- 
 2.11.0
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/CuraEngine.git/commitdiff/84b0a036857550660ef354cb0635355d1c509597