diff --git a/desktop/cinnamon/cinnamon/actions.py b/desktop/cinnamon/cinnamon/actions.py index 60e75d9132..51293d4cec 100644 --- a/desktop/cinnamon/cinnamon/actions.py +++ b/desktop/cinnamon/cinnamon/actions.py @@ -8,7 +8,7 @@ from pisi.actionsapi import mesontools, shelltools, pisitools def setup(): - pisitools.dosed("files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py", "0.7", "0.8") + #pisitools.dosed("files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py", "0.7", "0.8") #shelltools.system("sed -i 's/mintinstall.desktop/org.gnome.Software.desktop/' data/org.cinnamon.gschema.xml") #shelltools.system("sed -i 's/'REQUIRED', '/&polkit-cinnamon-authentication-agent-1;/' meson.build || die") #shelltools.system("sed -i 's/RequiredComponents=\(.*\)$/RequiredComponents=\1polkit-gnome-authentication-agent-1;/' \ diff --git a/desktop/cinnamon/cinnamon/files/Notify-0.8.patch b/desktop/cinnamon/cinnamon/files/Notify-0.8.patch index 09b1a07504..4c5bc02362 100644 --- a/desktop/cinnamon/cinnamon/files/Notify-0.8.patch +++ b/desktop/cinnamon/cinnamon/files/Notify-0.8.patch @@ -1,7 +1,7 @@ diff -Nuar a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py ---- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py 2022-06-21 18:01:39.000000000 +0300 -+++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py 2022-07-17 17:59:13.743936377 +0300 -@@ -1,7 +1,10 @@ +--- a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py 2022-07-25 16:19:39.000000000 +0300 ++++ b/files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications.py 2022-07-25 18:54:11.312893909 +0300 +@@ -1,7 +1,12 @@ #!/usr/bin/python3 import gi @@ -10,6 +10,8 @@ diff -Nuar a/files/usr/share/cinnamon/cinnamon-settings/modules/cs_notifications + gi.require_version("Notify", "0.7") +except ValueError: + gi.require_version("Notify", "0.8") ++except ValueError: ++ gi.require_version("Notify", "0.8.1") from gi.repository import Notify from SettingsWidgets import SidePage diff --git a/desktop/cinnamon/cinnamon/pspec.xml b/desktop/cinnamon/cinnamon/pspec.xml index 02c67cfc14..2b39083fd4 100644 --- a/desktop/cinnamon/cinnamon/pspec.xml +++ b/desktop/cinnamon/cinnamon/pspec.xml @@ -15,7 +15,7 @@ cinnamon Linux desktop which provides advanced innovative features and a traditional user experience Linux desktop which provides advanced innovative features and a traditional user experience - https://github.com/linuxmint/cinnamon/archive/refs/tags/5.4.2.tar.gz + https://github.com/linuxmint/cinnamon/archive/refs/tags/5.4.8.tar.gz cjs-devel meson @@ -198,6 +198,13 @@ + + 2022-07-25 + 5.4.8 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-06-30 5.4.2