Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cinnamon-screensaver for
openSUSE:Factory checked in at 2024-03-18 16:46:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-screensaver"
Mon Mar 18 16:46:20 2024 rev:29 rq:1158904 version:6.0.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes
2024-03-05 18:51:13.274261396 +0100
+++
/work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.1905/cinnamon-screensaver.changes
2024-03-18 16:46:34.955437545 +0100
@@ -1,0 +2,12 @@
+Mon Mar 18 08:20:55 UTC 2024 - Dirk Müller <dmuel...@suse.com>
+
+- update to 6.0.3:
+ * Use a shell script to launch, where the environment can be
+ checked before x11 resources are loaded in python.
+ * binfile.in: Enclose arguments in quotes.
+ * Revert "backup locker: Restore stack management when not
+ activated."
+ * backup locker: Restore stack management when not activated.
+ * cinnamon-screensaver-main.py: Fix application theme provider.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-screensaver-6.0.0.tar.gz
New:
----
cinnamon-screensaver-6.0.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.MS4cVQ/_old 2024-03-18 16:46:35.659463514 +0100
+++ /var/tmp/diff_new_pack.MS4cVQ/_new 2024-03-18 16:46:35.663463662 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-screensaver
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: cinnamon-screensaver
-Version: 6.0.0
+Version: 6.0.3
Release: 0
Summary: Cinnamon screensaver and locker
License: GPL-2.0-or-later
++++++ cinnamon-screensaver-6.0.0.tar.gz -> cinnamon-screensaver-6.0.3.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.0/debian/changelog
new/cinnamon-screensaver-6.0.3/debian/changelog
--- old/cinnamon-screensaver-6.0.0/debian/changelog 2023-11-19
14:43:43.000000000 +0100
+++ new/cinnamon-screensaver-6.0.3/debian/changelog 2024-01-24
16:26:06.000000000 +0100
@@ -1,3 +1,28 @@
+cinnamon-screensaver (6.0.3) virginia; urgency=medium
+
+ [ Michael Webster ]
+ * Use a shell script to launch, where the environment can be checked before
x11 resources are loaded in python.
+ * binfile.in: Enclose arguments in quotes.
+
+ [ Clement Lefebvre ]
+ * Revert "backup locker: Restore stack management when not activated."
+
+ -- Clement Lefebvre <r...@linuxmint.com> Wed, 24 Jan 2024 15:25:47 +0000
+
+cinnamon-screensaver (6.0.2) virginia; urgency=medium
+
+ [ Michael Webster ]
+ * backup locker: Restore stack management when not activated.
+
+ -- Clement Lefebvre <r...@linuxmint.com> Thu, 28 Dec 2023 12:22:57 +0000
+
+cinnamon-screensaver (6.0.1) virginia; urgency=medium
+
+ [ Michael Webster ]
+ * cinnamon-screensaver-main.py: Fix application theme provider.
+
+ -- Clement Lefebvre <r...@linuxmint.com> Tue, 19 Dec 2023 14:22:10 +0000
+
cinnamon-screensaver (6.0.0) virginia; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.0/meson.build
new/cinnamon-screensaver-6.0.3/meson.build
--- old/cinnamon-screensaver-6.0.0/meson.build 2023-11-19 14:43:43.000000000
+0100
+++ new/cinnamon-screensaver-6.0.3/meson.build 2024-01-24 16:26:06.000000000
+0100
@@ -1,4 +1,4 @@
-project('cinnamon-screensaver', 'c', version: '6.0.0', meson_version:
'>=0.56.0')
+project('cinnamon-screensaver', 'c', version: '6.0.3', meson_version:
'>=0.56.0')
cc = meson.get_compiler('c')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.0/src/binfile.in
new/cinnamon-screensaver-6.0.3/src/binfile.in
--- old/cinnamon-screensaver-6.0.0/src/binfile.in 1970-01-01
01:00:00.000000000 +0100
+++ new/cinnamon-screensaver-6.0.3/src/binfile.in 2024-01-24
16:26:06.000000000 +0100
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ "$XDG_SESSION_TYPE" = "wayland" ]; then
+ echo "cinnamon-screensaver is disabled in wayland sessions. Exiting."
+ exit 1
+fi
+
+exec @install_dir@/@target@ "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.0.0/src/cinnamon-screensaver-command.py
new/cinnamon-screensaver-6.0.3/src/cinnamon-screensaver-command.py
--- old/cinnamon-screensaver-6.0.0/src/cinnamon-screensaver-command.py
2023-11-19 14:43:43.000000000 +0100
+++ new/cinnamon-screensaver-6.0.3/src/cinnamon-screensaver-command.py
2024-01-24 16:26:06.000000000 +0100
@@ -122,13 +122,6 @@
self.mainloop.quit()
if __name__ == "__main__":
- try:
- if os.environ["WAYLAND_DISPLAY"]:
- print("Cinnamon Screensaver is unavailable on Wayland.")
- sys.exit(0)
- except KeyError:
- pass
-
ml = GLib.MainLoop.new(None, True)
main = ScreensaverCommand(ml)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.0.0/src/cinnamon-screensaver-main.py
new/cinnamon-screensaver-6.0.3/src/cinnamon-screensaver-main.py
--- old/cinnamon-screensaver-6.0.0/src/cinnamon-screensaver-main.py
2023-11-19 14:43:43.000000000 +0100
+++ new/cinnamon-screensaver-6.0.3/src/cinnamon-screensaver-main.py
2024-01-24 16:26:06.000000000 +0100
@@ -14,15 +14,6 @@
import setproctitle
import sys
-# Do this before importing ScreensaverService as that triggers all of the dbus
services
-# including the XAppKbdLayoutController which is x11 only.
-try:
- if os.environ["WAYLAND_DISPLAY"]:
- print("Cinnamon Screensaver is unavailable on Wayland.")
- sys.exit(0)
-except KeyError:
- pass
-
import config
import status
from util import utils, settings
@@ -139,9 +130,12 @@
fallback_prov = Gtk.CssProvider()
- if fallback_prov.load_from_data(fallback_css.encode()):
+ try:
+ fallback_prov.load_from_data(fallback_css.encode())
Gtk.StyleContext.add_provider_for_screen
(Gdk.Screen.get_default(), fallback_prov, 600)
Gtk.StyleContext.reset_widgets(Gdk.Screen.get_default())
+ except Exception as e:
+ print("Could not parse fallback css: %s" % str(e))
if __name__ == "__main__":
setproctitle.setproctitle('cinnamon-screensaver')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.0.0/src/meson.build
new/cinnamon-screensaver-6.0.3/src/meson.build
--- old/cinnamon-screensaver-6.0.0/src/meson.build 2023-11-19
14:43:43.000000000 +0100
+++ new/cinnamon-screensaver-6.0.3/src/meson.build 2024-01-24
16:26:06.000000000 +0100
@@ -49,18 +49,31 @@
'cinnamon-screensaver.css',
]
+install_data(app_py + app_css,
+ install_dir: pkgdatadir
+)
+
app_scripts = [
['cinnamon-screensaver-main.py', 'cinnamon-screensaver'],
['cinnamon-screensaver-command.py', 'cinnamon-screensaver-command']
]
-install_data(app_py + app_css,
- install_dir: pkgdatadir
-)
-
foreach script : app_scripts
- install_data(script[0], install_dir: pkgdatadir)
- meson.add_install_script('sh', '-c', 'mkdir -p
"$DESTDIR/@0@"'.format(bindir))
- meson.add_install_script('sh', '-c',
- 'ln -sf "@0@" "$DESTDIR/@1@"'.format(join_paths(pkgdatadir, script[0]),
join_paths(bindir, script[1])))
+ prefix_info = configuration_data()
+ prefix_info.set('install_dir', pkgdatadir)
+ prefix_info.set('target', script[0])
+
+ bin_file = configure_file(
+ input : 'binfile.in',
+ output: script[1],
+ configuration: prefix_info,
+ install_dir: get_option('bindir'),
+ install_mode: 'rwxr-xr-x'
+ )
+
+ install_data(
+ script[0],
+ install_dir: pkgdatadir,
+ install_mode: 'rwxr-xr-x'
+ )
endforeach
