From 15d71caa52992745a26f8c4ed819ae14cbf7de31 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Nov 04 2021 13:49:07 +0000 Subject: Update to 5.0.7 release --- diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec index 461260b..7a66dcf 100644 --- a/cinnamon-screensaver.spec +++ b/cinnamon-screensaver.spec @@ -1,11 +1,10 @@ Summary: Cinnamon Screensaver Name: cinnamon-screensaver -Version: 5.0.6 -Release: 3%{?dist} +Version: 5.0.7 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: %{url}/commit/1748efb91b0eddeebada935f762ab4db211576e6.patch#/fix_mpris_albumart.patch BuildRequires: meson BuildRequires: intltool @@ -91,6 +90,9 @@ rm %{buildroot}%{_datadir}/gir-1.0/CScreensaver-1.0.gir %{_libdir}/girepository-1.0/CScreensaver-1.0.typelib %changelog +* Thu Nov 04 2021 Leigh Scott - 5.0.7-1 +- Update to 5.0.7 release + * Tue Aug 17 2021 Leigh Scott - 5.0.6-3 - Fix mpris album art diff --git a/fix_mpris_albumart.patch b/fix_mpris_albumart.patch deleted file mode 100644 index 28f1180..0000000 --- a/fix_mpris_albumart.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 1748efb91b0eddeebada935f762ab4db211576e6 Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Tue, 6 Jul 2021 09:55:08 -0400 -Subject: [PATCH] stage.py: Delay initialization of certain components during - startup. - -Some components - power- and audio-related - use dbus interfaces to -receive updates, and get set up asynchronously. Since the screensaver -is now spawned on-demand, instead of always running in the background, -these need some time for their setup to complete. - -Ideally they should be listening for their respective connections to -complete, and eventually they will, but this will require quite a -bit more code changes and add potential for other regressions, so -a fixed delay is ok for now. - -This fixes media controls and album art not being displayed. ---- - src/stage.py | 47 ++++++++++++++++++++++++++++------------------- - 1 file changed, 28 insertions(+), 19 deletions(-) - -diff --git a/src/stage.py b/src/stage.py -index cf3ebb3..2952c3b 100644 ---- a/src/stage.py -+++ b/src/stage.py -@@ -66,6 +66,7 @@ def __init__(self, manager, away_message): - self.unlock_dialog = None - self.audio_panel = None - self.info_panel = None -+ self.osk = None - - self.stage_refresh_id = 0 - -@@ -307,29 +308,32 @@ def setup_children(self): - print("Problem setting up clock widget: %s" % str(e)) - self.clock_widget = None - -- try: -- self.setup_albumart() -- except Exception as e: -- print("Problem setting up albumart widget: %s" % str(e)) -- self.albumart_widget = None -- -- try: -- self.setup_status_bars() -- except Exception as e: -- print("Problem setting up status bars: %s" % str(e)) -- self.audio_panel = None -- self.info_panel = None -- - try: - self.setup_osk() - except Exception as e: - print("Problem setting up on-screen keyboard: %s" % str(e)) - self.osk = None - -- if total_failure: -+ trackers.timer_tracker_get().start("setup-delayed-components", -+ 2000, -+ self.setup_delayed_components) -+ else: - print("Total failure somewhere, deactivating screensaver.") - GObject.idle_add(self.deactivate_after_timeout) - -+ def setup_delayed_components(self, data=None): -+ try: -+ self.setup_albumart() -+ except Exception as e: -+ print("Problem setting up albumart widget: %s" % str(e)) -+ self.albumart_widget = None -+ try: -+ self.setup_status_bars() -+ except Exception as e: -+ print("Problem setting up status bars: %s" % str(e)) -+ self.audio_panel = None -+ self.info_panel = None -+ - def destroy_children(self): - try: - self.destroy_monitor_views() -@@ -404,6 +408,7 @@ def destroy_stage(self): - - self.set_timeout_active(None, False) - -+ trackers.timer_tracker_get().cancel("setup-delayed-components") - self.destroy_children() - - self.gdk_filter.stop() -@@ -479,7 +484,8 @@ def on_power_state_changed(self, client, data=None): - if status.Debug: - print("stage: Power state changed, updating info panel") - -- self.info_panel.update_visibility() -+ if self.info_panel != None: -+ self.info_panel.update_visibility() - - def setup_clock(self): - """ -@@ -510,7 +516,7 @@ def setup_albumart(self): - self.albumart_widget = AlbumArt(None, status.screen.get_mouse_monitor()) - self.add_child_widget(self.albumart_widget) - -- self.floaters.append(self.clock_widget) -+ self.floaters.append(self.albumart_widget) - - if settings.get_show_albumart(): - self.albumart_widget.start_positioning() -@@ -565,10 +571,13 @@ def setup_status_bars(self): - self.audio_panel = AudioPanel() - self.add_child_widget(self.audio_panel) - -+ if status.Awake: -+ self.audio_panel.show_panel() -+ - self.info_panel = InfoPanel() - self.add_child_widget(self.info_panel) - -- self.info_panel.update_visibility() -+ self.info_panel.refresh_power_state() - - def queue_dialog_key_event(self, event): - """ -@@ -672,7 +681,7 @@ def raise_unlock_widget(self): - if self.audio_panel != None: - self.audio_panel.show_panel() - if self.info_panel != None: -- self.info_panel.update_visibility() -+ self.info_panel.refresh_power_state() - if self.osk != None: - self.osk.show() - -@@ -707,7 +716,7 @@ def cancel_unlock_widget(self): - status.Awake = False - - self.update_monitor_views() -- self.info_panel.update_visibility() -+ self.info_panel.refresh_power_state() - - def update_monitor_views(self): - """ diff --git a/sources b/sources index 8871694..46c25a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinnamon-screensaver-5.0.6.tar.gz) = fce753d4805ad8e0e6767238b5b24b741a8e6b974fb0739cbe76105dfcd33621330257cdbfc34d5a33256659f5b2f9ef457cca9351ff6f73802fbffd6c0828b6 +SHA512 (cinnamon-screensaver-5.0.7.tar.gz) = ec5990e1f73983e96eb07f0d4d1a66076d067df28d56c68cce987dc7fce35871650273d2d4a64058d73c7daff2326722e3c1a2fd86afc761d81d1a6b2e7f9370