Update to 3.4.1
This commit is contained in:
parent
ba1a791356
commit
c63a010cb3
4 changed files with 37 additions and 4 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -12,3 +12,5 @@
|
|||
/CuraEngine-3.1.0.tar.gz
|
||||
/CuraEngine-3.2.1.tar.gz
|
||||
/CuraEngine-3.3.0.tar.gz
|
||||
/CuraEngine-3.4.1.tar.gz
|
||||
/e6afb9cbae4064da8c3e69af3ff5c4629579c1d2.tar.gz
|
||||
|
|
|
|||
16
CuraEngine-3.4.1-no-resource-dir.patch
Normal file
16
CuraEngine-3.4.1-no-resource-dir.patch
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index dc36e30..ba82f32 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -246,11 +246,6 @@ if (BUILD_TESTS)
|
||||
endforeach()
|
||||
endif()
|
||||
|
||||
-
|
||||
-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})
|
||||
|
|
@ -1,11 +1,18 @@
|
|||
Name: CuraEngine
|
||||
Epoch: 1
|
||||
Version: 3.3.0
|
||||
Release: 2%{?dist}
|
||||
Version: 3.4.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Engine for processing 3D models into G-code instructions for 3D printers
|
||||
License: AGPLv3+
|
||||
URL: https://github.com/Ultimaker/%{name}
|
||||
Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
|
||||
# The cmake stuff would attempt to git clone this:
|
||||
# TODO package on it's own
|
||||
%global stb_commit e6afb9cbae4064da8c3e69af3ff5c4629579c1d2
|
||||
Source1: https://github.com/nothings/stb/archive/%{stb_commit}.tar.gz
|
||||
Provides: bundled(stb) = %stb_commit
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: libarcus-devel == %{version}
|
||||
|
|
@ -18,6 +25,9 @@ BuildRequires: git
|
|||
Patch0: %{name}-rpath.patch
|
||||
Patch1: %{name}-static-libstdcpp.patch
|
||||
|
||||
# A weird part of cmake stuff that does not work at all, not present in upstream master
|
||||
Patch2: %{name}-3.4.1-no-resource-dir.patch
|
||||
|
||||
%description
|
||||
%{name} is a C++ console application for 3D printing G-code generation. It
|
||||
has been made as a better and faster alternative to the old Skeinforge engine.
|
||||
|
|
@ -27,6 +37,7 @@ application look at cura with is the graphical frontend for %{name}.
|
|||
|
||||
%prep
|
||||
%autosetup -p1 -S git
|
||||
tar -xf %{SOURCE1}
|
||||
|
||||
# bundled libraries
|
||||
rm -rf libs
|
||||
|
|
@ -35,7 +46,7 @@ rm -rf libs
|
|||
sed -i 's/"DEV"/"%{version}"/' src/settings/settings.h
|
||||
|
||||
%build
|
||||
%{cmake} -DBUILD_SHARED_LIBS:BOOL=OFF -DCURA_ENGINE_VERSION:STRING=%{version} -DUSE_SYSTEM_LIBS:BOOL=ON -DCMAKE_CXX_FLAGS_RELEASE_INIT:STRING="%{optflags} -fPIC" .
|
||||
%{cmake} -DBUILD_SHARED_LIBS:BOOL=OFF -DCURA_ENGINE_VERSION:STRING=%{version} -DUSE_SYSTEM_LIBS:BOOL=ON -DCMAKE_CXX_FLAGS_RELEASE_INIT:STRING="%{optflags} -fPIC" -DStb_INCLUDE_DIRS:PATH=./stb-%{stb_commit} .
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
|
|
@ -52,6 +63,9 @@ make install DESTDIR=%{buildroot}
|
|||
%{_bindir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Aug 28 2018 Miro Hrončok <mhroncok@redhat.com> - 1:3.4.1-1
|
||||
- Update to 3.4.1
|
||||
|
||||
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:3.3.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
|||
SHA512 (CuraEngine-3.3.0.tar.gz) = 14b1961c90ec8ecad6fadfb992b72a4e05f3fa6c9a7b580812f90410c655db9d5798d46aa17311c216631daae1c21f6255c6fc4a0d903a91091e0a7a63642f70
|
||||
SHA512 (CuraEngine-3.4.1.tar.gz) = 51c75e299ef7728101a4c61aa033c9b07112b0955d2ec72ba6173684513ed3c503a744fab487efe2c19da01eb97bd1297b5b8724b4f767639c8e82eefcdd01be
|
||||
SHA512 (e6afb9cbae4064da8c3e69af3ff5c4629579c1d2.tar.gz) = 232ef301d4d6c82c7c5f0e4234b9160cc815f3b6bcc35d341cdf8738646f2f0887ee9838680699f4c9f4274b1390036b2c4fb3ebc2d663af8ff888114dc9f04b
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue