From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] Cura update
Date: Tue, 24 Sep 2019 21:03:25 +0200 [thread overview]
Message-ID: <20190924190325.TAsh-Pgz-SMN1_MdPczRC7R9TmbV1wQl-dAh01iqpJg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-14386@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 393 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_update
https://github.com/void-linux/void-packages/pull/14386
[WIP] Cura update
Preparing for the next Cura release
Also take ownership of libSavitar
A patch file from https://github.com/void-linux/void-packages/pull/14386.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cura_update-14386.patch --]
[-- Type: text/x-diff, Size: 11470 bytes --]
From 4a2515025241c75fc2642fcf0bbde56f73c84466 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 24 Sep 2019 11:59:19 -0400
Subject: [PATCH 1/6] cura-engine: update to 4.3.0.
---
srcpkgs/cura-engine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 63b00cda8e7..04184076df0 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,6 +1,6 @@
# Template file for 'cura-engine'
pkgname=cura-engine
-version=4.2.0
+version=4.3.0
revision=1
wrksrc="CuraEngine-${version}"
build_style=cmake
@@ -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=9e66c2840c46ad5ba91da872d73cc8d8d03bf163fe8ce9a81ec5188a6d7b4593
+checksum=4922a21ae90f95daae918baf21b51d94e36b8aac8e160b73c8088b993dd78ccb
post_install() {
vlicense LICENSE
From 70129320d06812fbd7f56155b988635fcbe3cbf9 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 10 Sep 2019 11:45:18 -0400
Subject: [PATCH 2/6] libArcus: update to 4.3.0.
---
srcpkgs/libArcus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index c0c44d46916..ecc4d659533 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
# Template file for 'libArcus'
pkgname=libArcus
-version=4.2.0
+version=4.3.0
revision=1
build_style=cmake
configure_args="-DBUILD_EXAMPLES=OFF"
@@ -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=f355ae80a7d219013bba14ec8f50a411345c00a6e974b4649db3c5322fa9b28a
+checksum=67f828dba93e373516f3dfdcfab76f9dbe3665308a47cbca4bbe85b494ab50e7
libArcus-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From f55cf105994a2ab422a9aa681fd5e4354aaf5259 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 10 Sep 2019 11:56:39 -0400
Subject: [PATCH 3/6] libSavitar: update to 4.3.0.
---
srcpkgs/libSavitar/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index f3eb5c337af..a9d3020158f 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,16 +1,16 @@
# Template file for 'libSavitar'
pkgname=libSavitar
-version=4.2.0
+version=4.3.0
revision=1
build_style=cmake
hostmakedepends="python3"
makedepends="python3-sip-devel python3-devel pugixml-devel"
short_desc="C++ implementation of 3mf loading"
-maintainer="Orphaned <orphan@voidlinux.org>"
+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=6a77df183fef2ddaeb8de26f69315e1868ee722844f4c1fbb9cd5a054805d1a1
+checksum=b7f34e10c705082a6d7bcf8599efece8491f9c8e45eb603f761a0e56b64d5236
nocross="can't find sip on cross environment"
libSavitar-devel_package() {
From b84dd57eb8b881812e4e471c1b8f43353bc69c51 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 24 Sep 2019 11:59:24 -0400
Subject: [PATCH 4/6] Uranium: update to 4.3.0.
---
.../Uranium/patches/fix-crash-in-cura.patch | 132 ------------------
srcpkgs/Uranium/template | 6 +-
2 files changed, 3 insertions(+), 135 deletions(-)
delete mode 100644 srcpkgs/Uranium/patches/fix-crash-in-cura.patch
diff --git a/srcpkgs/Uranium/patches/fix-crash-in-cura.patch b/srcpkgs/Uranium/patches/fix-crash-in-cura.patch
deleted file mode 100644
index 3d51f4e66d8..00000000000
--- a/srcpkgs/Uranium/patches/fix-crash-in-cura.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 9de2827a6ea5eb6ce7d8f845c4b4fc388b01da40 Mon Sep 17 00:00:00 2001
-From: Mark Burton <markb@smartavionics.com>
-Date: Mon, 22 Jul 2019 16:00:15 +0100
-Subject: [PATCH] Set border_node's geometry and material before appending it
- to paint_node.
-
----
- UM/Qt/Bindings/PointingRectangle.py | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/UM/Qt/Bindings/PointingRectangle.py b/UM/Qt/Bindings/PointingRectangle.py
-index ddb8520db..a0a79c6a1 100644
---- UM/Qt/Bindings/PointingRectangle.py
-+++ UM/Qt/Bindings/PointingRectangle.py
-@@ -162,8 +162,9 @@ def updatePaintNode(self, paint_node, update_data):
-
- if self._border_width > 0:
- if paint_node.childCount() == 0:
-- paint_node.appendChildNode(QSGGeometryNode())
-- border_node = paint_node.firstChild()
-+ border_node = QSGGeometryNode()
-+ else:
-+ border_node = paint_node.firstChild()
-
- border_vertices = []
- border_vertices.append((0, 0))
-@@ -204,6 +205,9 @@ def updatePaintNode(self, paint_node, update_data):
- border_material.setColor(self._border_color)
-
- border_node.setMaterial(border_material)
-+
-+ if paint_node.childCount() == 0:
-+ paint_node.appendChildNode(border_node)
- else:
- border_node = None
- border_geometry = None
-
-From c0fcf8e290b88fa276af7df8694e95d55aa912b9 Mon Sep 17 00:00:00 2001
-From: Mark Burton <markb@smartavionics.com>
-Date: Mon, 22 Jul 2019 19:47:15 +0100
-Subject: [PATCH] ShaderEffect crashes on Linux with Qt 5.13 so replace with
- ColorOverlay.
-
----
- UM/Qt/qml/UM/RecolorImage.qml | 60 ++++-------------------------------
- 1 file changed, 6 insertions(+), 54 deletions(-)
-
-diff --git a/UM/Qt/qml/UM/RecolorImage.qml b/UM/Qt/qml/UM/RecolorImage.qml
-index c4f209154..5bd73a6b5 100644
---- UM/Qt/qml/UM/RecolorImage.qml
-+++ UM/Qt/qml/UM/RecolorImage.qml
-@@ -2,6 +2,7 @@
- // Uranium is released under the terms of the LGPLv3 or higher.
-
- import QtQuick 2.1
-+import QtGraphicalEffects 1.0
- import UM 1.3 as UM
-
- Item
-@@ -9,7 +10,7 @@ Item
- id: base;
-
- property alias source: img.source
-- property alias color: shader.color
-+ property alias color: overlay.color
- property alias sourceSize: img.sourceSize
-
- Image
-@@ -21,59 +22,10 @@ Item
- sourceSize.height: parent.height
- }
-
-- ShaderEffect
-- {
-- id: shader
-+ ColorOverlay {
-+ id: overlay
- anchors.fill: parent
--
-- property variant src: img
-- property color color: "#fff"
--
-- vertexShader: UM.OpenGLContextProxy.isLegacyOpenGL ?
-- "
-- uniform highp mat4 qt_Matrix;
-- attribute highp vec4 qt_Vertex;
-- attribute highp vec2 qt_MultiTexCoord0;
-- varying highp vec2 coord;
-- void main() {
-- coord = qt_MultiTexCoord0;
-- gl_Position = qt_Matrix * qt_Vertex;
-- }
-- " : "
-- #version 410
-- uniform highp mat4 qt_Matrix;
-- in highp vec4 qt_Vertex;
-- in highp vec2 qt_MultiTexCoord0;
-- out highp vec2 coord;
-- void main() {
-- coord = qt_MultiTexCoord0;
-- gl_Position = qt_Matrix * qt_Vertex;
-- }
-- "
--
-- fragmentShader: UM.OpenGLContextProxy.isLegacyOpenGL ?
-- "
-- varying highp vec2 coord;
-- uniform sampler2D src;
-- uniform lowp vec4 color;
-- uniform lowp float qt_Opacity;
-- void main() {
-- lowp vec4 tex = texture2D(src, coord);
-- lowp float alpha = tex.a * qt_Opacity;
-- gl_FragColor = vec4(color.r * alpha, color.g * alpha, color.b * alpha, alpha);
-- }
-- " : "
-- #version 410
-- in highp vec2 coord;
-- uniform sampler2D src;
-- uniform lowp vec4 color;
-- uniform lowp float qt_Opacity;
-- out vec4 frag_color;
-- void main() {
-- lowp vec4 tex = texture(src, coord);
-- lowp float alpha = tex.a * qt_Opacity;
-- frag_color = vec4(color.r * alpha, color.g * alpha, color.b * alpha, alpha);
-- }
-- "
-+ source: img
-+ color: "#fff"
- }
- }
diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index cf3fb0bb38c..193d5e211df 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
# Template file for 'Uranium'
pkgname=Uranium
-version=4.2.0
-revision=2
+version=4.3.0
+revision=1
archs=noarch
build_style=cmake
pycompile_module="UM"
@@ -15,4 +15,4 @@ 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=af394fb133e6a3ce92c245428bcf458956b2ca26c33122a35c464b9f5aaddd2e
+checksum=9f871877cf46e8b9e58346f33fdb6eed07c08f242fe292d0c993f224005dfc38
From 30bf6ad49d7692a4314d97dd021889205a254125 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 10 Sep 2019 12:02:36 -0400
Subject: [PATCH 5/6] cura: update to 4.3.0.
---
srcpkgs/cura/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index f4ff4f24b0f..31318e5aecf 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
# Template file for 'cura'
pkgname=cura
-version=4.2.1
+version=4.3.0
revision=1
archs=noarch
wrksrc="Cura-${version}"
@@ -17,4 +17,4 @@ 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=e3b54947a8722dbbdef4510beb724d43952f6dbd1e7c32b52e1a3c9358be3fa1
+checksum=a27f5671250452d685069d8fe8018438ec32c096cd5b2c0d54ada7022ded1ccf
From 7a0e6a3047376cb457b253b66c50adc9b110c9cf Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 24 Sep 2019 12:11:05 -0400
Subject: [PATCH 6/6] cura-fdm-materials: update to 4.3.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 bd9472c957a..bdb4af89b08 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,6 +1,6 @@
# Template file for 'cura-fdm-materials'
pkgname=cura-fdm-materials
-version=2019.08.21
+version=4.3.0
revision=1
archs=noarch
wrksrc="fdm_materials-${version}"
@@ -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=abec9e8c2573cb39906201efca69265327bf565d3eb2c0f246793ff8671c7c24
+checksum=b31b997cae18a85f8c913b4d1f0fe0a5a009f94689d4cc26682f6614d0dc3f09
post_install() {
vlicense LICENSE
next prev parent reply other threads:[~2019-09-24 19:03 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-10 16:10 [PR PATCH] " voidlinux-github
2019-09-14 19:36 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-14 19:36 ` voidlinux-github
2019-09-15 21:36 ` voidlinux-github
2019-09-15 21:36 ` voidlinux-github
2019-09-17 15:15 ` voidlinux-github
2019-09-17 15:15 ` voidlinux-github
2019-09-24 16:04 ` voidlinux-github
2019-09-24 16:04 ` voidlinux-github
2019-09-24 16:12 ` voidlinux-github
2019-09-24 16:12 ` voidlinux-github
2019-09-24 16:17 ` voidlinux-github
2019-09-24 16:17 ` voidlinux-github
2019-09-24 16:24 ` voidlinux-github
2019-09-24 16:24 ` voidlinux-github
2019-09-24 18:20 ` voidlinux-github
2019-09-24 18:20 ` voidlinux-github
2019-09-24 19:03 ` voidlinux-github
2019-09-24 19:03 ` voidlinux-github [this message]
2019-09-24 19:10 ` voidlinux-github
2019-09-24 19:10 ` voidlinux-github
2019-09-24 19:19 ` voidlinux-github
2019-09-24 19:33 ` [PR PATCH] [Updated] [WIP] Cura: update to 4.3.0 voidlinux-github
2019-09-24 19:33 ` voidlinux-github
2019-09-25 22:19 ` [PR PATCH] [Updated] " voidlinux-github
2019-09-25 22:19 ` voidlinux-github
2019-09-25 22:20 ` voidlinux-github
2019-09-25 22:20 ` voidlinux-github
2019-09-25 22:33 ` voidlinux-github
2019-10-01 18:07 ` [PR PATCH] [Merged]: " voidlinux-github
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=20190924190325.TAsh-Pgz-SMN1_MdPczRC7R9TmbV1wQl-dAh01iqpJg@z \
--to=voidlinux-github@inbox.vuxu.org \
--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).