From 73484f4f856b8b939f0b86ee719c1a6488937fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= Date: Mon, 23 Mar 2026 22:06:21 -0600 Subject: [PATCH] ubuntu-release-upgrader: patch mate display power management system --- .../011-disable_screensaver_mate.patch | 29 ++++++++++++++----- helpers/make-ubuntu-release-upgrader | 2 +- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/helpers/DATA/ubuntu-release-upgrader/patch_changes/011-disable_screensaver_mate.patch b/helpers/DATA/ubuntu-release-upgrader/patch_changes/011-disable_screensaver_mate.patch index 5ebc4edd..0f5409cd 100644 --- a/helpers/DATA/ubuntu-release-upgrader/patch_changes/011-disable_screensaver_mate.patch +++ b/helpers/DATA/ubuntu-release-upgrader/patch_changes/011-disable_screensaver_mate.patch @@ -1,8 +1,8 @@ diff --git a/DistUpgrade/DistUpgradeController.py b/DistUpgrade/DistUpgradeController.py -index b7dd0af7..c06166b6 100644 +index b7dd0af7..ffc66293 100644 --- a/DistUpgrade/DistUpgradeController.py +++ b/DistUpgrade/DistUpgradeController.py -@@ -2708,10 +2708,18 @@ class DistUpgradeController(object): +@@ -2708,10 +2708,31 @@ class DistUpgradeController(object): # exits, the connection will be closed and screen inhibition # will be removed. self._session_bus = dbus.SessionBus() @@ -10,18 +10,31 @@ index b7dd0af7..c06166b6 100644 - '/org/freedesktop/ScreenSaver') - screensaver = dbus.Interface(proxy, dbus_interface='org.freedesktop.ScreenSaver') - screensaver.Inhibit('trisquel-release-upgrader', 'Upgrading Trisquel') ++ + try: + # Attempt standar "generic" + proxy = self._session_bus.get_object('org.freedesktop.ScreenSaver', + '/org/freedesktop/ScreenSaver') + screensaver = dbus.Interface(proxy, dbus_interface='org.freedesktop.ScreenSaver') -+ screensaver.Inhibit('ubuntu-release-upgrader', 'Upgrading Ubuntu') ++ screensaver.Inhibit('trisquel-release-upgrader', 'Upgrading System') + except Exception: -+ # Attempt MATE specific -+ proxy = self._session_bus.get_object('org.mate.ScreenSaver', -+ '/org/mate/ScreenSaver') -+ screensaver = dbus.Interface(proxy, dbus_interface='org.mate.ScreenSaver') -+ screensaver.Inhibit('ubuntu-release-upgrader', 'Upgrading Ubuntu') ++ try: ++ # Attempt MATE specific ++ proxy_ss = self._session_bus.get_object('org.mate.ScreenSaver', ++ '/org/mate/ScreenSaver') ++ screensaver_mate = dbus.Interface(proxy_ss, dbus_interface='org.mate.ScreenSaver') ++ screensaver_mate.Inhibit('trisquel-release-upgrader', 'Upgrading System') ++ ++ # DPMS management ++ proxy_sm = self._session_bus.get_object('org.mate.SessionManager', ++ '/org/mate/SessionManager') ++ session_mate = dbus.Interface(proxy_sm, dbus_interface='org.mate.SessionManager') ++ session_mate.Inhibit('trisquel-release-upgrader', 0, 'Upgrading System', 8) ++ ++ logging.debug('MATE Session and Screensaver successfully inhibited') ++ except Exception as mate_e: ++ logging.debug('Failed to inhibit MATE specifically: ' + str(mate_e)) ++ raise summary = _("Lock screen disabled") message = _("Your lock screen has been " diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index d015282c..60a30d83 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -25,7 +25,7 @@ # Also, don't forget to update the meta-release files at archive and packages.t.i # The "obsoletes" list from ubuntu has been removed -VERSION=20.9 +VERSION=21 . ./config # Previous upstream release name, update for each release.