From: karl-nilsson <karl-nilsson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
Date: Thu, 24 Mar 2022 05:03:48 +0100 [thread overview]
Message-ID: <20220324040348.LRXa4UfioltCf1paTGXNkYBk7QGnisENGCR0adcKfNI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35001@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 928 bytes --]
There is an updated pull request by karl-nilsson against master on the void-packages repository
https://github.com/karl-nilsson/void-packages cura-4.13
https://github.com/void-linux/void-packages/pull/35001
WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, x64-glibc
Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
- the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump
A patch file from https://github.com/void-linux/void-packages/pull/35001.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cura-4.13-35001.patch --]
[-- Type: text/x-diff, Size: 23668 bytes --]
From 68c8684d3ed8ee549280a092683296905c952ed2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 1/5] cura-fdm-materials: update to 4.13.0.
---
srcpkgs/cura-fdm-materials/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index 2383b2c697a3..fb701a7510f0 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,7 +1,7 @@
# Template file for 'cura-fdm-materials'
pkgname=cura-fdm-materials
reverts="2019.08.21_1"
-version=4.12.0
+version=4.13.0
revision=1
wrksrc="fdm_materials-${version}"
build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="CC0-1.0"
homepage="https://github.com/Ultimaker/fdm_materials"
distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
post_install() {
vlicense LICENSE
From 5a45120dffbb7aae0c5dffba0c8e9801d4cc59ce Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 2/5] libArcus: update to 4.13.1.
---
srcpkgs/libArcus/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
# Template file for 'libArcus'
pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+revision=1
build_style=cmake
configure_args="-DBUILD_EXAMPLES=OFF"
hostmakedepends="protobuf python3-sip-devel"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/libArcus"
distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
libArcus-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 361171a4f93793ee5028a56633c2a8f265806786 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/5] Uranium: update to 4.13.1.
---
srcpkgs/Uranium/template | 4 ++--
srcpkgs/cura-engine/template | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
# Template file for 'Uranium'
pkgname=Uranium
-version=4.12.1
+version=4.13.1
revision=1
build_style=cmake
pycompile_dirs="usr/lib/uranium/plugins"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/Uranium"
distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
post_install() {
vmkdir usr/share/uranium/cmake
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 8c2822f73c0d..5cded6271dea 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
# Template file for 'cura-engine'
pkgname=cura-engine
-version=4.12.1
-revision=2
+version=4.13.1
+revision=1
wrksrc="CuraEngine-${version}"
build_style=cmake
configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="AGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/CuraEngine"
distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
post_install() {
vlicense LICENSE
From dee15adb1fc0971ff936c28914fef19e2711b633 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 4/5] libSavitar: update to 4.13.1.
---
srcpkgs/libSavitar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
# Template file for 'libSavitar'
pkgname=libSavitar
-version=4.12.1
+version=4.13.1
revision=1
build_style=cmake
hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/libSavitar"
distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-sip-devel"
From daa5155c17d1bd5c6d3c0adba342b131e508eac4 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 5/5] cura: update to 4.13.1.
---
.../cura/patches/fix_multiply_models.patch | 13 -
.../patches/fix_support_blocker_crash.patch | 15 -
srcpkgs/cura/patches/remove_plugins.patch | 364 ++++++++++++++++++
srcpkgs/cura/template | 6 +-
4 files changed, 367 insertions(+), 31 deletions(-)
delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch
create mode 100644 srcpkgs/cura/patches/remove_plugins.patch
diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py
-index c29a0648d..dad67ba16 100644
---- a/cura/Arranging/Nest2DArrange.py
-+++ b/cura/Arranging/Nest2DArrange.py
-@@ -91,7 +91,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
-
- if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2: # numpy array has to be explicitly checked against None
- for point in hull_polygon.getPoints():
-- converted_points.append(Point(point[0] * factor, point[1] * factor))
-+ converted_points.append(Point(int(point[0] * factor), int(point[1] * factor)))
- item = Item(converted_points)
- item.markAsFixedInBin(0)
- node_items.append(item)
diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cura/PickingPass.py b/cura/PickingPass.py
-index 54e886fe6..4d6ef671d 100644
---- a/cura/PickingPass.py
-+++ b/cura/PickingPass.py
-@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
-
- window_size = self._renderer.getWindowSize()
-
-- px = (0.5 + x / 2.0) * window_size[0]
-- py = (0.5 + y / 2.0) * window_size[1]
-+ px = int((0.5 + x / 2.0) * window_size[0])
-+ py = int((0.5 + y / 2.0) * window_size[1])
-
- if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
- return -1
diff --git a/srcpkgs/cura/patches/remove_plugins.patch b/srcpkgs/cura/patches/remove_plugins.patch
new file mode 100644
index 000000000000..a63f669e4149
--- /dev/null
+++ b/srcpkgs/cura/patches/remove_plugins.patch
@@ -0,0 +1,364 @@
+diff --git a/plugins/UFPReader/UFPReader.py b/plugins/UFPReader/UFPReader.py
+deleted file mode 100644
+index 71061f938..000000000
+--- a/plugins/UFPReader/UFPReader.py
++++ /dev/null
+@@ -1,42 +0,0 @@
+-# Copyright (c) 2019 Ultimaker B.V.
+-# Cura is released under the terms of the LGPLv3 or higher.
+-
+-from typing import TYPE_CHECKING
+-
+-from Charon.VirtualFile import VirtualFile
+-
+-from UM.Mesh.MeshReader import MeshReader
+-from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase
+-from UM.PluginRegistry import PluginRegistry
+-
+-if TYPE_CHECKING:
+- from cura.Scene.CuraSceneNode import CuraSceneNode
+-
+-
+-class UFPReader(MeshReader):
+-
+- def __init__(self) -> None:
+- super().__init__()
+-
+- MimeTypeDatabase.addMimeType(
+- MimeType(
+- name = "application/x-ufp",
+- comment = "Ultimaker Format Package",
+- suffixes = ["ufp"]
+- )
+- )
+- self._supported_extensions = [".ufp"]
+-
+- def _read(self, file_name: str) -> "CuraSceneNode":
+- # Open the file
+- archive = VirtualFile()
+- archive.open(file_name)
+- # Get the gcode data from the file
+- gcode_data = archive.getData("/3D/model.gcode")
+- # Convert the bytes stream to string
+- gcode_stream = gcode_data["/3D/model.gcode"].decode("utf-8")
+-
+- # Open the GCodeReader to parse the data
+- gcode_reader = PluginRegistry.getInstance().getPluginObject("GCodeReader") # type: ignore
+- gcode_reader.preReadFromStream(gcode_stream) # type: ignore
+- return gcode_reader.readFromStream(gcode_stream, file_name) # type: ignore
+diff --git a/plugins/UFPReader/__init__.py b/plugins/UFPReader/__init__.py
+deleted file mode 100644
+index cfea4b988..000000000
+--- a/plugins/UFPReader/__init__.py
++++ /dev/null
+@@ -1,34 +0,0 @@
+-#Copyright (c) 2019 Ultimaker B.V.
+-#Cura is released under the terms of the LGPLv3 or higher.
+-
+-import sys
+-
+-from UM.Logger import Logger
+-try:
+- from . import UFPReader
+-except ImportError:
+- Logger.log("w", "Could not import UFPReader; libCharon may be missing")
+-
+-from UM.i18n import i18nCatalog
+-i18n_catalog = i18nCatalog("cura")
+-
+-
+-def getMetaData():
+- return {
+- "mesh_reader": [
+- {
+- "mime_type": "application/x-ufp",
+- "extension": "ufp",
+- "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package")
+- }
+- ]
+- }
+-
+-
+-def register(app):
+- if "UFPReader.UFPReader" not in sys.modules:
+- return {}
+-
+- app.addNonSliceableExtension(".ufp")
+- return {"mesh_reader": UFPReader.UFPReader()}
+-
+diff --git a/plugins/UFPReader/plugin.json b/plugins/UFPReader/plugin.json
+deleted file mode 100644
+index cac7e8623..000000000
+--- a/plugins/UFPReader/plugin.json
++++ /dev/null
+@@ -1,8 +0,0 @@
+-{
+- "name": "UFP Reader",
+- "author": "Ultimaker B.V.",
+- "version": "1.0.0",
+- "description": "Provides support for reading Ultimaker Format Packages.",
+- "supported_sdk_versions": ["7.9.0"],
+- "i18n-catalog": "cura"
+-}
+\ No newline at end of file
+diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py
+deleted file mode 100644
+index 455a7c3c3..000000000
+--- a/plugins/UFPWriter/UFPWriter.py
++++ /dev/null
+@@ -1,192 +0,0 @@
+-# Copyright (c) 2021 Ultimaker B.V.
+-# Cura is released under the terms of the LGPLv3 or higher.
+-
+-from typing import cast, List, Dict
+-
+-from Charon.VirtualFile import VirtualFile # To open UFP files.
+-from Charon.OpenMode import OpenMode # To indicate that we want to write to UFP files.
+-from Charon.filetypes.OpenPackagingConvention import OPCError
+-from io import StringIO # For converting g-code to bytes.
+-
+-from PyQt5.QtCore import QBuffer
+-
+-from UM.Logger import Logger
+-from UM.Mesh.MeshWriter import MeshWriter # The writer we need to implement.
+-from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
+-from UM.PluginRegistry import PluginRegistry # To get the g-code writer.
+-
+-from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
+-from UM.Scene.SceneNode import SceneNode
+-from cura.CuraApplication import CuraApplication
+-from cura.Utils.Threading import call_on_qt_thread
+-
+-from UM.i18n import i18nCatalog
+-
+-METADATA_OBJECTS_PATH = "metadata/objects"
+-
+-catalog = i18nCatalog("cura")
+-
+-
+-class UFPWriter(MeshWriter):
+- def __init__(self):
+- super().__init__(add_to_recent_files = False)
+-
+- MimeTypeDatabase.addMimeType(
+- MimeType(
+- name = "application/x-ufp",
+- comment = "Ultimaker Format Package",
+- suffixes = ["ufp"]
+- )
+- )
+-
+- # This needs to be called on the main thread (Qt thread) because the serialization of material containers can
+- # trigger loading other containers. Because those loaded containers are QtObjects, they must be created on the
+- # Qt thread. The File read/write operations right now are executed on separated threads because they are scheduled
+- # by the Job class.
+- @call_on_qt_thread
+- def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode):
+- archive = VirtualFile()
+- archive.openStream(stream, "application/x-ufp", OpenMode.WriteOnly)
+-
+- try:
+- self._writeObjectList(archive)
+-
+- # Store the g-code from the scene.
+- archive.addContentType(extension = "gcode", mime_type = "text/x-gcode")
+- except EnvironmentError as e:
+- error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+- self.setInformation(error_msg)
+- Logger.error(error_msg)
+- return False
+- gcode_textio = StringIO() # We have to convert the g-code into bytes.
+- gcode_writer = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter"))
+- success = gcode_writer.write(gcode_textio, None)
+- if not success: # Writing the g-code failed. Then I can also not write the gzipped g-code.
+- self.setInformation(gcode_writer.getInformation())
+- return False
+- try:
+- gcode = archive.getStream("/3D/model.gcode")
+- gcode.write(gcode_textio.getvalue().encode("UTF-8"))
+- archive.addRelation(virtual_path = "/3D/model.gcode", relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode")
+- except EnvironmentError as e:
+- error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+- self.setInformation(error_msg)
+- Logger.error(error_msg)
+- return False
+-
+- # Attempt to store the thumbnail, if any:
+- backend = CuraApplication.getInstance().getBackend()
+- snapshot = None if getattr(backend, "getLatestSnapshot", None) is None else backend.getLatestSnapshot()
+- if snapshot:
+- try:
+- archive.addContentType(extension = "png", mime_type = "image/png")
+- thumbnail = archive.getStream("/Metadata/thumbnail.png")
+-
+- thumbnail_buffer = QBuffer()
+- thumbnail_buffer.open(QBuffer.ReadWrite)
+- snapshot.save(thumbnail_buffer, "PNG")
+-
+- thumbnail.write(thumbnail_buffer.data())
+- archive.addRelation(virtual_path = "/Metadata/thumbnail.png",
+- relation_type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail",
+- origin = "/3D/model.gcode")
+- except EnvironmentError as e:
+- error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+- self.setInformation(error_msg)
+- Logger.error(error_msg)
+- return False
+- else:
+- Logger.log("w", "Thumbnail not created, cannot save it")
+-
+- # Store the material.
+- application = CuraApplication.getInstance()
+- machine_manager = application.getMachineManager()
+- container_registry = application.getContainerRegistry()
+- global_stack = machine_manager.activeMachine
+-
+- material_extension = "xml.fdm_material"
+- material_mime_type = "application/x-ultimaker-material-profile"
+-
+- try:
+- archive.addContentType(extension = material_extension, mime_type = material_mime_type)
+- except OPCError:
+- Logger.log("w", "The material extension: %s was already added", material_extension)
+-
+- added_materials = []
+- for extruder_stack in global_stack.extruderList:
+- material = extruder_stack.material
+- try:
+- material_file_name = material.getMetaData()["base_file"] + ".xml.fdm_material"
+- except KeyError:
+- Logger.log("w", "Unable to get base_file for the material %s", material.getId())
+- continue
+- material_file_name = "/Materials/" + material_file_name
+-
+- # The same material should not be added again.
+- if material_file_name in added_materials:
+- continue
+-
+- material_root_id = material.getMetaDataEntry("base_file")
+- material_root_query = container_registry.findContainers(id = material_root_id)
+- if not material_root_query:
+- Logger.log("e", "Cannot find material container with root id {root_id}".format(root_id = material_root_id))
+- return False
+- material_container = material_root_query[0]
+-
+- try:
+- serialized_material = material_container.serialize()
+- except NotImplementedError:
+- Logger.log("e", "Unable serialize material container with root id: %s", material_root_id)
+- return False
+-
+- try:
+- material_file = archive.getStream(material_file_name)
+- material_file.write(serialized_material.encode("UTF-8"))
+- archive.addRelation(virtual_path = material_file_name,
+- relation_type = "http://schemas.ultimaker.org/package/2018/relationships/material",
+- origin = "/3D/model.gcode")
+- except EnvironmentError as e:
+- error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+- self.setInformation(error_msg)
+- Logger.error(error_msg)
+- return False
+-
+- added_materials.append(material_file_name)
+-
+- try:
+- archive.close()
+- except EnvironmentError as e:
+- error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+- self.setInformation(error_msg)
+- Logger.error(error_msg)
+- return False
+- return True
+-
+- @staticmethod
+- def _writeObjectList(archive):
+- """Write a json list of object names to the METADATA_OBJECTS_PATH metadata field
+-
+- To retrieve, use: `archive.getMetadata(METADATA_OBJECTS_PATH)`
+- """
+-
+- objects_model = CuraApplication.getInstance().getObjectsModel()
+- object_metas = []
+-
+- for item in objects_model.items:
+- object_metas.extend(UFPWriter._getObjectMetadata(item["node"]))
+-
+- data = {METADATA_OBJECTS_PATH: object_metas}
+- archive.setMetadata(data)
+-
+- @staticmethod
+- def _getObjectMetadata(node: SceneNode) -> List[Dict[str, str]]:
+- """Get object metadata to write for a Node.
+-
+- :return: List of object metadata dictionaries.
+- Might contain > 1 element in case of a group node.
+- Might be empty in case of nonPrintingMesh
+- """
+-
+- return [{"name": item.getName()}
+- for item in DepthFirstIterator(node)
+- if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")]
+diff --git a/plugins/UFPWriter/__init__.py b/plugins/UFPWriter/__init__.py
+deleted file mode 100644
+index 9db6b042f..000000000
+--- a/plugins/UFPWriter/__init__.py
++++ /dev/null
+@@ -1,38 +0,0 @@
+-#Copyright (c) 2018 Ultimaker B.V.
+-#Cura is released under the terms of the LGPLv3 or higher.
+-
+-import sys
+-
+-from UM.Logger import Logger
+-try:
+- from . import UFPWriter
+-except ImportError:
+- Logger.log("w", "Could not import UFPWriter; libCharon may be missing")
+-
+-from UM.i18n import i18nCatalog #To translate the file format description.
+-from UM.Mesh.MeshWriter import MeshWriter #For the binary mode flag.
+-
+-i18n_catalog = i18nCatalog("cura")
+-
+-def getMetaData():
+- if "UFPWriter.UFPWriter" not in sys.modules:
+- return {}
+-
+- return {
+- "mesh_writer": {
+- "output": [
+- {
+- "mime_type": "application/x-ufp",
+- "mode": MeshWriter.OutputMode.BinaryMode,
+- "extension": "ufp",
+- "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package")
+- }
+- ]
+- }
+- }
+-
+-def register(app):
+- if "UFPWriter.UFPWriter" not in sys.modules:
+- return {}
+-
+- return { "mesh_writer": UFPWriter.UFPWriter() }
+diff --git a/plugins/UFPWriter/kitten.png b/plugins/UFPWriter/kitten.png
+deleted file mode 100644
+index 44738f94f..000000000
+Binary files a/plugins/UFPWriter/kitten.png and /dev/null differ
+diff --git a/plugins/UFPWriter/plugin.json b/plugins/UFPWriter/plugin.json
+deleted file mode 100644
+index 6d27d250c..000000000
+--- a/plugins/UFPWriter/plugin.json
++++ /dev/null
+@@ -1,8 +0,0 @@
+-{
+- "name": "UFP Writer",
+- "author": "Ultimaker B.V.",
+- "version": "1.0.1",
+- "description": "Provides support for writing Ultimaker Format Packages.",
+- "api": 7,
+- "i18n-catalog": "cura"
+-}
+\ No newline at end of file
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index aa06dcd98b85..e7a5c9727ea1 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
# Template file for 'cura'
pkgname=cura
-version=4.12.1
+version=4.13.1
revision=1
wrksrc="Cura-${version}"
build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
makedepends="Uranium libArcus-devel python3-devel"
depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry"
checkdepends="python3-pytest python3-mypy $depends"
short_desc="3D printer / slicing GUI"
maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/Cura"
distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c
next prev parent reply other threads:[~2022-03-24 4:03 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-11 19:07 [PR PATCH] " karl-nilsson
2022-01-11 20:23 ` [PR PATCH] [Updated] " karl-nilsson
2022-01-11 21:48 ` [PR PATCH] [Closed]: " karl-nilsson
2022-01-21 5:05 ` [PR PATCH] [Updated] " karl-nilsson
2022-01-28 16:10 ` karl-nilsson
2022-01-28 16:10 ` karl-nilsson
2022-03-01 23:12 ` karl-nilsson
2022-03-24 4:03 ` karl-nilsson [this message]
2022-03-24 4:25 ` karl-nilsson
2022-03-24 4:34 ` karl-nilsson
2022-03-24 4:36 ` [PR PATCH] [Updated] " karl-nilsson
2022-03-29 14:09 ` WIP: Cura: update to 4.13.1 ahesford
2022-03-29 15:24 ` [PR PATCH] [Updated] " karl-nilsson
2022-03-29 15:24 ` karl-nilsson
2022-03-29 15:41 ` karl-nilsson
2022-03-29 15:48 ` [PR PATCH] [Merged]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220324040348.LRXa4UfioltCf1paTGXNkYBk7QGnisENGCR0adcKfNI@z \
--to=karl-nilsson@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).