Update to 5.4.0
Uranium-5.3.0-qt-6.5-hack.patch likely replaced with https://github.com/Ultimaker/Uranium/pull/874
This commit is contained in:
parent
ffb2e5a230
commit
25d4c3df42
3 changed files with 5 additions and 73 deletions
|
|
@ -1,68 +0,0 @@
|
||||||
diff -up Uranium-5.3.0/UM/Qt/qml/UM/qmldir.qt65 Uranium-5.3.0/UM/Qt/qml/UM/qmldir
|
|
||||||
--- Uranium-5.3.0/UM/Qt/qml/UM/qmldir.qt65 2023-05-22 11:48:10.779310352 -0400
|
|
||||||
+++ Uranium-5.3.0/UM/Qt/qml/UM/qmldir 2023-05-22 11:48:31.404560978 -0400
|
|
||||||
@@ -1,6 +1,7 @@
|
|
||||||
module Uranium
|
|
||||||
|
|
||||||
ApplicationMenu 1.0 ApplicationMenu.qml
|
|
||||||
+RecolorImage 1.0 RecolorImage.qml
|
|
||||||
MessageStack 1.0 MessageStack.qml
|
|
||||||
Dialog 1.0 Dialog.qml
|
|
||||||
|
|
||||||
diff -up Uranium-5.3.0/UM/Qt/qml/UM/RecolorImage.qml.qt65 Uranium-5.3.0/UM/Qt/qml/UM/RecolorImage.qml
|
|
||||||
--- Uranium-5.3.0/UM/Qt/qml/UM/RecolorImage.qml.qt65 2023-05-22 11:46:42.419236608 -0400
|
|
||||||
+++ Uranium-5.3.0/UM/Qt/qml/UM/RecolorImage.qml 2023-05-22 11:47:01.327466370 -0400
|
|
||||||
@@ -0,0 +1,35 @@
|
|
||||||
+// Copyright (c) 2018 Ultimaker B.V.
|
|
||||||
+// Uranium is released under the terms of the LGPLv3 or higher.
|
|
||||||
+
|
|
||||||
+import QtQuick 2.1
|
|
||||||
+import UM 1.3 as UM
|
|
||||||
+
|
|
||||||
+Item
|
|
||||||
+{
|
|
||||||
+ id: base;
|
|
||||||
+
|
|
||||||
+ property alias source: img.source
|
|
||||||
+ property alias color: shader.color
|
|
||||||
+ property alias sourceSize: img.sourceSize
|
|
||||||
+
|
|
||||||
+ Image
|
|
||||||
+ {
|
|
||||||
+ id: img
|
|
||||||
+ anchors.fill: parent
|
|
||||||
+ visible: false
|
|
||||||
+ sourceSize.width: parent.width
|
|
||||||
+ sourceSize.height: parent.height
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ ShaderEffect
|
|
||||||
+ {
|
|
||||||
+ id: shader
|
|
||||||
+ anchors.fill: parent
|
|
||||||
+
|
|
||||||
+ property variant src: img
|
|
||||||
+ property color color: "#fff"
|
|
||||||
+
|
|
||||||
+ vertexShader: Resources.getPath(Resources.Shaders, "recolor_image.vert.qsb")
|
|
||||||
+ fragmentShader: Resources.getPath(Resources.Shaders, "recolor_image.frag.qsb")
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
diff -up Uranium-5.3.0/UM/Qt/qml/UM/SimpleButton.qml.qt65 Uranium-5.3.0/UM/Qt/qml/UM/SimpleButton.qml
|
|
||||||
--- Uranium-5.3.0/UM/Qt/qml/UM/SimpleButton.qml.qt65 2023-05-22 11:47:45.530003515 -0400
|
|
||||||
+++ Uranium-5.3.0/UM/Qt/qml/UM/SimpleButton.qml 2023-05-22 11:47:53.582101367 -0400
|
|
||||||
@@ -27,12 +27,13 @@ MouseArea
|
|
||||||
radius: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
- ColorImage
|
|
||||||
+ RecolorImage
|
|
||||||
{
|
|
||||||
id: image
|
|
||||||
|
|
||||||
anchors.fill: parent
|
|
||||||
anchors.margins: base.iconMargin
|
|
||||||
+ sourceSize.height: width
|
|
||||||
|
|
||||||
color: base.containsMouse ? base.hoverColor : base.color
|
|
||||||
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
Name: python-uranium
|
Name: python-uranium
|
||||||
Version: 5.3.0
|
Version: 5.4.0
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
Summary: A Python framework for building desktop applications
|
Summary: A Python framework for building desktop applications
|
||||||
License: LGPL-3.0-or-later
|
License: LGPL-3.0-or-later
|
||||||
URL: https://github.com/Ultimaker/Uranium
|
URL: https://github.com/Ultimaker/Uranium
|
||||||
Source: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz
|
Source: %{url}/archive/%{version}.tar.gz#/Uranium-%{version}.tar.gz
|
||||||
Patch: Uranium-5.3.0-qt-6.5-hack.patch
|
|
||||||
Patch: Uranium-5.3.0-qt-try-ints-then-bytes-for-gl-mask-functions.patch
|
Patch: Uranium-5.3.0-qt-try-ints-then-bytes-for-gl-mask-functions.patch
|
||||||
# Fix asserts for called once in Python 3.12:
|
# Fix asserts for called once in Python 3.12:
|
||||||
Patch: https://github.com/Ultimaker/Uranium/pull/885.patch#/Uranium-5.3.0-python3.12.patch
|
Patch: https://github.com/Ultimaker/Uranium/pull/885.patch#/Uranium-5.3.0-python3.12.patch
|
||||||
|
|
@ -28,10 +27,11 @@ BuildRequires: git-core
|
||||||
|
|
||||||
# UM/PluginRegistry.py imports from imp
|
# UM/PluginRegistry.py imports from imp
|
||||||
# https://github.com/Ultimaker/Uranium/issues/765
|
# https://github.com/Ultimaker/Uranium/issues/765
|
||||||
|
# https://github.com/Ultimaker/Uranium/pull/915
|
||||||
BuildRequires: (python3-zombie-imp if python3 >= 3.12)
|
BuildRequires: (python3-zombie-imp if python3 >= 3.12)
|
||||||
|
|
||||||
# Tests
|
# Tests
|
||||||
BuildRequires: python3-arcus >= 5.2.2
|
BuildRequires: python3-arcus >= 5.3.0
|
||||||
BuildRequires: python3-cryptography
|
BuildRequires: python3-cryptography
|
||||||
BuildRequires: python3-numpy
|
BuildRequires: python3-numpy
|
||||||
BuildRequires: python3-scipy
|
BuildRequires: python3-scipy
|
||||||
|
|
@ -54,7 +54,7 @@ Uranium is a Python framework for building 3D printing related applications.
|
||||||
Summary: %{summary}
|
Summary: %{summary}
|
||||||
Provides: uranium = %{version}-%{release}
|
Provides: uranium = %{version}-%{release}
|
||||||
|
|
||||||
Requires: python3-arcus >= 5.2.2
|
Requires: python3-arcus >= 5.3.0
|
||||||
Requires: python3-cryptography
|
Requires: python3-cryptography
|
||||||
Requires: python3-numpy
|
Requires: python3-numpy
|
||||||
Requires: python3-scipy
|
Requires: python3-scipy
|
||||||
|
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (Uranium-5.3.0.tar.gz) = ae21693e531b8744173d72612333675ae59dcdb3da021d345ff983b3e046f1d9b578c2f43bc2d9482ab5f3d0fb6c554586a43d504fe264df5ee65cdac6ac8316
|
SHA512 (Uranium-5.4.0.tar.gz) = 47575482a5ac5ea9ea0d69f87698fd434d8ce5fbf20b84583476f27129694e52bb21db3df4dd66d5935e4e9dd14c5e5332db3370822c76af9b9e95c1a828bc45
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue