rpm/cura-engine
SHA256
1
0
Fork 0
forked from pool/cura-engine
Code Pull Requests Activity

Accepting request 642562 from science

Browse Source 
- update to version 3.5.1
  https://ultimaker.com/en/products/ultimaker-cura-software/release-notes
- replaced fix-build.patch with new need

OBS-URL: https://build.opensuse.org/request/show/642562
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cura-engine?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2018-10-25 06:12:42 +00:00 committed by Git OBS Bridge
commit 333e709b5b
7 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CuraEngine-3.4.1.obscpio
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ced188be8f4b56652751f6e794cc21e42b3877343127ba3f2f817723359ae19c
size 3391501

3
CuraEngine-3.5.1.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cf7468fea52bc5a967feca508b80f422815eba1270d280a4693af6dbae2b2d08
size 4154381

6
CuraEngine.obsinfo
View File

@ -1,5 +1,5 @@
name: CuraEngine
version: 3.4.1
mtime: 1531126515
commit: 683c4b80c48cd338568b79fcf599da4fcbbaef46
version: 3.5.1
mtime: 1539615866
commit: 71d441338e69cc16daefd41da1d5d7f99dd4ea8d

4
_service
View File

@ -2,8 +2,8 @@
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/Ultimaker/CuraEngine.git</param>
<param name="scm">git</param>
<param name="revision">3.4.1</param>
<param name="version">3.4.1</param>
<param name="revision">3.5.1</param>
<param name="version">3.5.1</param>
</service>
<service mode="disabled" name="set_version" />

7
cura-engine.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Oct 17 07:07:33 UTC 2018 - Adrian Schröter <adrian@suse.de>
- update to version 3.5.1
https://ultimaker.com/en/products/ultimaker-cura-software/release-notes
- replaced fix-build.patch with new need
-------------------------------------------------------------------
Thu Jul 26 14:38:35 UTC 2018 - jengelh@inai.de

12
cura-engine.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package CuraEngine
# spec file for package cura-engine
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2018 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,20 +12,20 @@
# 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/
#
Name: cura-engine
Version: 3.4.1
Version: 3.5.1
Release: 0
Summary: 3D printer control software
License: LGPL-3.0
License: AGPL-3.0-only
Group: Hardware/Printing
Url: http://github.com/Ultimaker/CuraEngine
Source0: CuraEngine-%{version}.tar.xz
Source1: CuraEngine.1
# PATCH-FIX-UPSTREAM
# PATCH-FIX-OPENSUSE fix-build.patch
Patch1: fix-build.patch
# On TW/Factory or Leap/SLE 15 use latest gcc, gcc6 otherwise
%if 0%{?suse_version} >= 1500

35
fix-build.patch
View File

@ -1,24 +1,13 @@
commit 5aad55bf67e52ce5bdb27a3925af8a4cab441b38
Author: Ghostkeeper <rubend@tutanota.com>
Date: Mon Jun 18 15:39:01 2018 +0200
Remove outdated copy of command_line_settings.json
This entire directory doesn't exist.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c579388..4c55e6f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,11 +251,6 @@ if (BUILD_TESTS)
endforeach()
endif()
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 {
-
-add_custom_command(TARGET CuraEngine POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_SOURCE_DIR}/resources $<TARGET_FILE_DIR:CuraEngine>)
-
# Installing CuraEngine.
include(GNUInstallDirs)
install(TARGETS CuraEngine DESTINATION ${CMAKE_INSTALL_BINDIR})