update to current stable version
OBS-URL: https://build.opensuse.org/package/show/science/cura-engine?expand=0&rev=6
This commit is contained in:
Git OBS Bridge
parent
7928225b06
commit
04d8997432
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f2e3c5e74001b39cf5894a1e3f436a7724be0ae9ee30cd02bd2e3fd676ca4b1
|
||||
size 107970
|
||||
3
CuraEngine-2.6.0.obscpio
Normal file
3
CuraEngine-2.6.0.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7b6dc3f0b5808a343b6c73a7f919ba4485fff6ec3b5adc55d35489a3fda2a238
|
||||
size 2540556
|
||||
@ -1,13 +0,0 @@
|
||||
Index: Makefile
|
||||
===================================================================
|
||||
--- Makefile.orig 2015-11-16 00:12:52.594259531 +0100
|
||||
+++ Makefile 2015-11-16 00:13:29.030165015 +0100
|
||||
@@ -50,7 +50,7 @@ else
|
||||
LDFLAGS += --static
|
||||
else
|
||||
CFLAGS += -flto
|
||||
- LDFLAGS += --static -flto
|
||||
+ LDFLAGS += -flto
|
||||
endif
|
||||
endif
|
||||
ifeq ($(UNAME), OpenBSD)
|
||||
5
CuraEngine.obsinfo
Normal file
5
CuraEngine.obsinfo
Normal file
@ -0,0 +1,5 @@
|
||||
name: CuraEngine
|
||||
version: 2.6.0
|
||||
mtime: 1497438677
|
||||
commit: 82a4a92a702be767cda84c325738af755452ce78
|
||||
|
||||
15
_service
Normal file
15
_service
Normal file
@ -0,0 +1,15 @@
|
||||
<services>
|
||||
<service name="obs_scm" mode="disabled">
|
||||
<param name="url">https://github.com/Ultimaker/CuraEngine.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">2.6.0</param>
|
||||
<param name="version">2.6.0</param>
|
||||
<param name="submodules">disable</param>
|
||||
</service>
|
||||
<service mode="buildtime" name="tar" />
|
||||
<service mode="buildtime" name="recompress">
|
||||
<param name="file">*.tar</param>
|
||||
<param name="compression">xz</param>
|
||||
</service>
|
||||
<service mode="buildtime" name="set_version" />
|
||||
</services>
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 26 06:58:03 UTC 2017 - adrian@suse.de
|
||||
|
||||
- update to version 2.6.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 23 10:06:38 UTC 2016 - adrian@suse.de
|
||||
|
||||
|
||||
@ -17,19 +17,19 @@
|
||||
|
||||
|
||||
Name: cura-engine
|
||||
Version: 15.04.6
|
||||
Version: 15.04.3
|
||||
Release: 0
|
||||
Summary: 3D printer control software
|
||||
License: AGPL-3.0
|
||||
Group: Applications/Engineering
|
||||
Group: BLAH
|
||||
Url: http://github.com/Ultimaker/CuraEngine
|
||||
Source0: https://github.com/Ultimaker/CuraEngine/archive/%{version}/CuraEngine-%{version}.tar.gz
|
||||
Source0: https://github.com/Ultimaker/CuraEngine/archive/%{version}/CuraEngine-%{version}.tar.xz
|
||||
Source1: CuraEngine.1
|
||||
Patch1: CuraEngine-uses-sharelib.patch
|
||||
BuildRequires: gcc-c++
|
||||
|
||||
# complains about glibc header problems (not in factory anymore :)
|
||||
#!BuildIgnore: post-build-checks
|
||||
Patch1: fix-build.patch
|
||||
BuildRequires: gcc6-c++
|
||||
#!BuildIgnore: libgcc_s1
|
||||
BuildRequires: cmake
|
||||
BuildRequires: libArcus-devel
|
||||
|
||||
%description
|
||||
CuraEngine is the a powerful, fast and robust engine for processing 3D models
|
||||
@ -37,29 +37,30 @@ into 3D printing instruction for Ultimaker and other GCode based 3D printers.
|
||||
It is part of the larger open source project called "Cura".
|
||||
|
||||
%prep
|
||||
%setup -q -n CuraEngine-%{version}
|
||||
%patch1
|
||||
%setup -q -n CuraEngine-%version
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
CFLAGS="%{optflags}"
|
||||
export CFLAGS
|
||||
make VERSION=%{version}
|
||||
%if 0%{?suse_version} < 1500
|
||||
export CC=gcc-6
|
||||
export CXX=g++-6
|
||||
%endif
|
||||
%cmake -DCMAKE_C_FLAGS="%{optflags} -fPIC" \
|
||||
-DCMAKE_CXX_FLAGS="%{optflags} -fPIC -fpermissive"
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
install -d -m 755 %{buildroot}%{_bindir}
|
||||
install -d -m 755 %{buildroot}%{_datadir}/CuraEngine
|
||||
cp build/CuraEngine %{buildroot}%{_bindir}
|
||||
D=$(date +"%b %Y")
|
||||
sed -i "s/DATE/${D}/g;s/VERSION/%version/g" %{SOURCE1}
|
||||
cd build
|
||||
%make_install
|
||||
|
||||
|
||||
install -Dm0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/cura-engine.1
|
||||
install -Dm0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/CuraEngine.1
|
||||
# hack... not ready for the distro
|
||||
install -Dm0755 lib_CuraEngine.so %{buildroot}%{_libdir}/lib_CuraEngine.so
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%dir %{_datadir}/CuraEngine
|
||||
%doc LICENSE
|
||||
%{_bindir}/CuraEngine
|
||||
%_mandir/man1/cura-engine.1*
|
||||
%_bindir/CuraEngine
|
||||
%_libdir/*
|
||||
%_mandir/man1/CuraEngine.1*
|
||||
|
||||
%changelog
|
||||
|
||||
17
fix-build.patch
Normal file
17
fix-build.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/src/settings/SettingRegistry.cpp b/src/settings/SettingRegistry.cpp
|
||||
index 7c4be40d..cff696a6 100644
|
||||
--- a/src/settings/SettingRegistry.cpp
|
||||
+++ b/src/settings/SettingRegistry.cpp
|
||||
@@ -35,12 +35,6 @@ std::string SettingRegistry::toString(rapidjson::Type type)
|
||||
}
|
||||
|
||||
|
||||
-SettingConfig::SettingConfig(std::string key, std::string label)
|
||||
-: SettingContainer(key, label)
|
||||
-{
|
||||
-// std::cerr << key << std::endl; // debug output to show all frontend registered settings...
|
||||
-}
|
||||
-
|
||||
bool SettingRegistry::settingExists(std::string key) const
|
||||
{
|
||||
return setting_key_to_config.find(key) != setting_key_to_config.end();
|
||||
Loading…
x
Reference in New Issue
Block a user