From 32341d9ebfc3a80a5b6cd9af5f2b85ede5c7d9ad Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Mon, 5 Jun 2023 05:12:48 -0400 Subject: [PATCH] fix issue where Logger was used but not imported (thanks to H. Peter Anvin) --- ...nts-then-bytes-for-gl-mask-functions.patch | 22 +++++++++++++------ python-uranium.spec | 5 ++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Uranium-5.3.0-qt-try-ints-then-bytes-for-gl-mask-functions.patch b/Uranium-5.3.0-qt-try-ints-then-bytes-for-gl-mask-functions.patch index 20b2187..4351c52 100644 --- a/Uranium-5.3.0-qt-try-ints-then-bytes-for-gl-mask-functions.patch +++ b/Uranium-5.3.0-qt-try-ints-then-bytes-for-gl-mask-functions.patch @@ -1,6 +1,6 @@ diff -up Uranium-5.3.0/UM/View/RenderBatch.py.glfix Uranium-5.3.0/UM/View/RenderBatch.py ---- Uranium-5.3.0/UM/View/RenderBatch.py.glfix 2023-05-31 10:16:27.534658464 -0400 -+++ Uranium-5.3.0/UM/View/RenderBatch.py 2023-05-31 10:27:39.386638905 -0400 +--- Uranium-5.3.0/UM/View/RenderBatch.py.glfix 2023-03-06 17:13:21.000000000 -0500 ++++ Uranium-5.3.0/UM/View/RenderBatch.py 2023-06-05 05:07:35.834427722 -0400 @@ -186,10 +186,24 @@ class RenderBatch: if self._render_type == self.RenderType.Solid: @@ -29,8 +29,8 @@ diff -up Uranium-5.3.0/UM/View/RenderBatch.py.glfix Uranium-5.3.0/UM/View/Render self._gl.glDisable(self._gl.GL_DEPTH_TEST) diff -up Uranium-5.3.0/UM/View/RenderPass.py.glfix Uranium-5.3.0/UM/View/RenderPass.py ---- Uranium-5.3.0/UM/View/RenderPass.py.glfix 2023-05-31 10:24:19.093985708 -0400 -+++ Uranium-5.3.0/UM/View/RenderPass.py 2023-05-31 10:27:13.831299703 -0400 +--- Uranium-5.3.0/UM/View/RenderPass.py.glfix 2023-03-06 17:13:21.000000000 -0500 ++++ Uranium-5.3.0/UM/View/RenderPass.py 2023-06-05 05:07:35.835427733 -0400 @@ -93,8 +93,22 @@ class RenderPass: self._fbo.bind() @@ -57,9 +57,17 @@ diff -up Uranium-5.3.0/UM/View/RenderPass.py.glfix Uranium-5.3.0/UM/View/RenderP self._gl.glClear(self._gl.GL_COLOR_BUFFER_BIT | self._gl.GL_DEPTH_BUFFER_BIT) diff -up Uranium-5.3.0/UM/View/SelectionPass.py.glfix Uranium-5.3.0/UM/View/SelectionPass.py ---- Uranium-5.3.0/UM/View/SelectionPass.py.glfix 2023-05-31 10:28:17.500144796 -0400 -+++ Uranium-5.3.0/UM/View/SelectionPass.py 2023-05-31 10:30:48.133144186 -0400 -@@ -109,13 +109,27 @@ class SelectionPass(RenderPass): +--- Uranium-5.3.0/UM/View/SelectionPass.py.glfix 2023-03-06 17:13:21.000000000 -0500 ++++ Uranium-5.3.0/UM/View/SelectionPass.py 2023-06-05 05:07:59.406694028 -0400 +@@ -5,6 +5,7 @@ import enum + import random + from typing import TYPE_CHECKING + ++from UM.Logger import Logger + from UM.Resources import Resources + from UM.Application import Application + +@@ -109,13 +110,27 @@ class SelectionPass(RenderPass): if selectable_objects: batch.render(self._scene.getActiveCamera()) diff --git a/python-uranium.spec b/python-uranium.spec index b99f3e0..bd83e92 100644 --- a/python-uranium.spec +++ b/python-uranium.spec @@ -1,6 +1,6 @@ Name: python-uranium Version: 5.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Python framework for building desktop applications License: LGPLv3+ URL: https://github.com/Ultimaker/Uranium @@ -133,6 +133,9 @@ popd %changelog +* Mon Jun 5 2023 Tom Callaway - 5.3.0-5 +- fix issue where Logger was used but not imported (thanks to H. Peter Anvin) + * Wed May 31 2023 Tom Callaway - 5.3.0-4 - try ints, then bytes for gl mask functions