[cura] Updated to 14.12.1
Miro Hrončok
churchyard at fedoraproject.org
Mon Dec 29 12:30:02 UTC 2014
commit c668bffa4e0b86f98872a49b67ba43d09bf2534f
Author: Miro Hrončok <miro at hroncok.cz>
Date: Mon Dec 29 13:29:50 2014 +0100
Updated to 14.12.1
.gitignore | 1 +
cura-missing-firmware.patch | 32 -------------------------
cura-no-firmware.patch | 54 +++++++++++++++++++++++++++++++++++++++++++
cura-version.patch | 4 +-
cura.spec | 21 +++++-----------
sources | 2 +-
6 files changed, 65 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2291a26..9e7566f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/Cura-13.11.2-fedora.tar.gz
/Cura-14.06-fedora.tar.gz
/Cura-14.09-fedora.tar.gz
+/Cura-14.12.1-fedora.tar.gz
diff --git a/cura-no-firmware.patch b/cura-no-firmware.patch
new file mode 100644
index 0000000..8a8688d
--- /dev/null
+++ b/cura-no-firmware.patch
@@ -0,0 +1,54 @@
+diff --git a/Cura/gui/firmwareInstall.py b/Cura/gui/firmwareInstall.py
+index 2ee983f..4e4612c 100644
+--- a/Cura/gui/firmwareInstall.py
++++ b/Cura/gui/firmwareInstall.py
+@@ -17,40 +17,6 @@ from Cura.util import profile
+ from Cura.util import resources
+
+ def getDefaultFirmware(machineIndex = None):
+- if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker':
+- name = 'MarlinUltimaker'
+- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
+- return None
+- if profile.getMachineSetting('has_heated_bed', machineIndex) == 'True':
+- name += '-HBK'
+- if sys.platform.startswith('linux'):
+- name += '-115200'
+- else:
+- name += '-250000'
+- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 1:
+- name += '-dual'
+- return resources.getPathForFirmware(name + '.hex')
+-
+- if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker_plus':
+- name = 'MarlinUltimaker-UMOP'
+- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
+- return None
+- if sys.platform.startswith('linux'):
+- name += '-115200'
+- else:
+- name += '-250000'
+- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 1:
+- name += '-dual'
+- return resources.getPathForFirmware(name + '.hex')
+-
+- if profile.getMachineSetting('machine_type', machineIndex) == 'ultimaker2':
+- if profile.getMachineSettingFloat('extruder_amount', machineIndex) > 2:
+- return None
+- if profile.getMachineSettingFloat('extruder_amount', machineIndex) == 2:
+- return resources.getPathForFirmware("MarlinUltimaker2-dual.hex")
+- return resources.getPathForFirmware("MarlinUltimaker2.hex")
+- if profile.getMachineSetting('machine_type', machineIndex) == 'Witbox':
+- return resources.getPathForFirmware("MarlinWitbox.hex")
+ return None
+
+ class InstallFirmware(wx.Dialog):
+@@ -61,7 +27,7 @@ class InstallFirmware(wx.Dialog):
+ if filename is None:
+ filename = getDefaultFirmware(machineIndex)
+ if filename is None:
+- wx.MessageBox(_("I am sorry, but Cura does not ship with a default firmware for your machine configuration."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
++ wx.MessageBox(_("I am sorry, but Cura on Fedora does not ship firmware for legal and technical reasons. Go download it and install it as custom firmware instead."), _("Firmware update"), wx.OK | wx.ICON_ERROR)
+ self.Destroy()
+ return
+ self._machine_type = profile.getMachineSetting('machine_type', machineIndex)
diff --git a/cura-version.patch b/cura-version.patch
index 6600563..8749999 100644
--- a/cura-version.patch
+++ b/cura-version.patch
@@ -1,5 +1,5 @@
diff --git a/Cura/util/version.py b/Cura/util/version.py
-index 0a52fc2..add5eb0 100644
+index 56faeee..add5eb0 100644
--- a/Cura/util/version.py
+++ b/Cura/util/version.py
@@ -17,70 +17,12 @@ except:
@@ -41,7 +41,7 @@ index 0a52fc2..add5eb0 100644
- version = f.readline()
- f.close()
- return version.strip()
-- return "?" #No idea what the version is. TODO:Tell the user.
+- return "UNKNOWN" #No idea what the version is. TODO:Tell the user.
+ return "REPLACE_THIS_IN_SPEC"
def isDevVersion():
diff --git a/cura.spec b/cura.spec
index 98201a3..49d973f 100644
--- a/cura.spec
+++ b/cura.spec
@@ -1,5 +1,5 @@
Name: cura
-Version: 14.09
+Version: 14.12.1
Release: 1%{?dist}
Summary: 3D printer control software
@@ -29,11 +29,7 @@ Patch1: %{name}-system-paths.patch
Patch2: %{name}-version.patch
# Disable installation of firmwares Fedora doesn't ship
-Patch3: %{name}-missing-firmware.patch
-
-# There are errors in Czech .po file
-# https://github.com/daid/Cura/issues/992
-Patch4: %{name}-czech-newlines.patch
+Patch3: %{name}-no-firmware.patch
BuildArch: noarch
BuildRequires: python2-devel
@@ -46,9 +42,7 @@ Requires: pyserial
Requires: numpy
Requires: python-power
Requires: pypy
-Requires: ultimaker-marlin-firmware >= 13.12
-Requires: ultimaker2-marlin-firmware >= 14.06.1
-Requires: CuraEngine >= 14.03
+Requires: CuraEngine >= 14.12.1
%description
Cura is a project which aims to be an single software solution for 3D printing.
@@ -65,7 +59,6 @@ settings and send this G-Code to the 3D printer for printing.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
dos2unix resources/example/Attribution.txt
@@ -95,10 +88,6 @@ cp -apr plugins %{buildroot}%{_datadir}/%{name}
cp -ap %{SOURCE1} %{buildroot}%{_bindir}
ln -s %{_datadir}/%{name} %{buildroot}%{python_sitelib}/Cura/resources
ln -s %{_datadir}/%{name}/%{name}.ico %{buildroot}%{_datadir}/pixmaps
-for FILE in 250000-dual.hex 115200-dual.hex 250000.hex 115200.hex; do
- ln -s ../../ultimaker-marlin-firmware/MarlinUltimaker-$FILE %{buildroot}%{_datadir}/%{name}/firmware/
-done
-ln -s ../../ultimaker2-marlin-firmware/MarlinUltimaker2.hex %{buildroot}%{_datadir}/%{name}/firmware/
# locales
cp -ar %{buildroot}%{_datadir}/%{name}/locale/* %{buildroot}%{_datadir}/locale
@@ -118,6 +107,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%{_bindir}/%{name}
%changelog
+* Mon Dec 29 2014 Miro Hrončok <mhroncok at redhat.com> - 14.12.1-1
+- Updated to 14.12.1
+- No longer depend on firmware
+
* Sat Oct 25 2014 Miro Hrončok <mhroncok at redhat.com> - 14.09-1
- New version 14.09
diff --git a/sources b/sources
index d76609d..345ff3c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18e3320f107d055d206169404057e006 Cura-14.09-fedora.tar.gz
+c8f2859273d425f0e399fd69d3c02429 Cura-14.12.1-fedora.tar.gz
More information about the scm-commits
mailing list