forked from pool/cura-engine
fix
OBS-URL: https://build.opensuse.org/package/show/science/cura-engine?expand=0&rev=31
This commit is contained in:
@@ -1,3 +1,8 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jan 2 12:50:27 UTC 2019 - Adrian Schröter <adrian@suse.de>
|
||||||
|
|
||||||
|
- fix build with stb in subdirectory
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Nov 16 13:35:50 UTC 2018 - Adrian Schröter <adrian@suse.de>
|
Fri Nov 16 13:35:50 UTC 2018 - Adrian Schröter <adrian@suse.de>
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package cura-engine
|
# spec file for package cura-engine
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@@ -25,8 +25,6 @@ Group: Hardware/Printing
|
|||||||
Url: http://github.com/Ultimaker/CuraEngine
|
Url: http://github.com/Ultimaker/CuraEngine
|
||||||
Source0: CuraEngine-%{version}.tar.xz
|
Source0: CuraEngine-%{version}.tar.xz
|
||||||
Source1: CuraEngine.1
|
Source1: CuraEngine.1
|
||||||
# PATCH-FIX-OPENSUSE fix-build.patch
|
|
||||||
Patch1: fix-build.patch
|
|
||||||
# On TW/Factory or Leap/SLE 15 use latest gcc, gcc6 otherwise
|
# On TW/Factory or Leap/SLE 15 use latest gcc, gcc6 otherwise
|
||||||
%if 0%{?suse_version} >= 1500
|
%if 0%{?suse_version} >= 1500
|
||||||
BuildRequires: gcc-c++ >= 5
|
BuildRequires: gcc-c++ >= 5
|
||||||
@@ -44,7 +42,6 @@ It is part of the larger project called "Cura".
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n CuraEngine-%version
|
%setup -q -n CuraEngine-%version
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?suse_version} < 1500
|
%if 0%{?suse_version} < 1500
|
||||||
|
@@ -1,13 +0,0 @@
|
|||||||
diff --git a/src/infill/ImageBasedDensityProvider.cpp b/src/infill/ImageBasedDensityProvider.cpp
|
|
||||||
index 46228e54..68fb18e6 100644
|
|
||||||
--- a/src/infill/ImageBasedDensityProvider.cpp
|
|
||||||
+++ b/src/infill/ImageBasedDensityProvider.cpp
|
|
||||||
@@ -5,7 +5,7 @@
|
|
||||||
|
|
||||||
#define STBI_FAILURE_USERMSG // enable user friendly bug messages for STB lib
|
|
||||||
#define STB_IMAGE_IMPLEMENTATION // needed in order to enable the implementation of libs/std_image.h
|
|
||||||
-#include <stb/stb_image.h>
|
|
||||||
+#include <stb_image.h>
|
|
||||||
|
|
||||||
namespace cura {
|
|
||||||
|
|
Reference in New Issue
Block a user