diff --git a/Uranium-5.3.0-qt-6.5-hack.patch b/Uranium-5.3.0-qt-6.5-hack.patch deleted file mode 100644 index 785a45a..0000000 --- a/Uranium-5.3.0-qt-6.5-hack.patch +++ /dev/null @@ -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 - diff --git a/python-uranium.spec b/python-uranium.spec index 95cb3f8..c91fe95 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,11 +1,10 @@ Name: python-uranium -Version: 5.3.0 +Version: 5.6.0 Release: %autorelease Summary: A Python framework for building desktop applications License: LGPL-3.0-or-later URL: https://github.com/Ultimaker/Uranium 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 # 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 @@ -31,7 +30,7 @@ BuildRequires: git-core BuildRequires: (python3-zombie-imp if python3 >= 3.12) # Tests -BuildRequires: python3-arcus >= 5.2.2 +BuildRequires: python3-arcus >= 5.3.0 BuildRequires: python3-cryptography BuildRequires: python3-numpy BuildRequires: python3-scipy @@ -54,7 +53,7 @@ Uranium is a Python framework for building 3D printing related applications. Summary: %{summary} Provides: uranium = %{version}-%{release} -Requires: python3-arcus >= 5.2.2 +Requires: python3-arcus >= 5.3.0 Requires: python3-cryptography Requires: python3-numpy Requires: python3-scipy diff --git a/sources b/sources index 7d3c2b1..83c2296 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Uranium-5.3.0.tar.gz) = ae21693e531b8744173d72612333675ae59dcdb3da021d345ff983b3e046f1d9b578c2f43bc2d9482ab5f3d0fb6c554586a43d504fe264df5ee65cdac6ac8316 +SHA512 (Uranium-5.6.0.tar.gz) = 575beb75cd73d50f85ff14fc5e5d90883f45ffc5c400dd1dcf2936e37780ab961c70da312c0a7cd856ee9c9cb8b3c4f8299488a8449e698c1c65354e7df14f19