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 2025-01-20 17:14:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-screensaver (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.5589 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-screensaver"
Mon Jan 20 17:14:29 2025 rev:31 rq:1238868 version:6.4.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/cinnamon-screensaver/cinnamon-screensaver.changes
2024-08-21 23:25:30.288306121 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-screensaver.new.5589/cinnamon-screensaver.changes
2025-01-20 17:15:05.363466072 +0100
@@ -1,0 +2,16 @@
+Mon Jan 20 01:59:07 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- move typelib back to the right location
+
+-------------------------------------------------------------------
+Sun Jan 12 04:10:37 UTC 2025 - Marguerite Su <i...@marguerite.su>
+
+- update to 6.4.0
+ * libscreensaver: fix detection of monitor hotplug
+ * keybindings: Ignore shift-f10
+ * fix executable libraries
+ * Simplify authClient.py pam helper path
+ * unlock dialog: Allow password visibility to be toggled
+ * cs-backup-locker.c: Exit gracefully if incorrect arguments are given
+
+-------------------------------------------------------------------
Old:
----
cinnamon-screensaver-6.2.0.tar.gz
New:
----
cinnamon-screensaver-6.4.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-screensaver.spec ++++++
--- /var/tmp/diff_new_pack.vaiMD8/_old 2025-01-20 17:15:05.791483691 +0100
+++ /var/tmp/diff_new_pack.vaiMD8/_new 2025-01-20 17:15:05.795483856 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-screensaver
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define appid org.cinnamon.ScreenSaver
Name: cinnamon-screensaver
-Version: 6.2.0
+Version: 6.4.0
Release: 0
Summary: Cinnamon screensaver and locker
License: GPL-2.0-or-later
@@ -32,7 +32,6 @@
BuildRequires: meson
BuildRequires: pkgconfig
BuildRequires: python3 >= 3.4
-BuildRequires: update-desktop-files
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gdk-x11-3.0)
BuildRequires: pkgconfig(glib-2.0)
@@ -61,14 +60,6 @@
simple, sane and secure defaults, and be well integrated with the
Cinnamon Desktop.
-%package -n libcscreensaver-0_0_0
-Summary: Library files for %{name}
-
-%description -n libcscreensaver-0_0_0
-%{summary}.
-
-This package ships the library files for %{name}.
-
%package -n typelib-1_0-CScreensaver-1_0
Summary: Typelib for %{name}
@@ -79,7 +70,6 @@
%package devel
Summary: Development files for %{name}
-Requires: libcscreensaver-0_0_0
Requires: typelib-1_0-CScreensaver-1_0
%description devel
@@ -103,10 +93,13 @@
%meson_install
%fdupes %{buildroot}
-%suse_update_desktop_file %{appid}
mkdir -p %{buildroot}%{_pam_vendordir}
mv %{buildroot}%{_sysconfdir}/pam.d/%{name}
%{buildroot}%{_pam_vendordir}/%{name}
+mkdir -p %{buildroot}%{_libdir}/girepository-1.0
+mv
%{buildroot}%{_libexecdir}/%{name}/girepository-1.0/CScreensaver-1.0.typelib \
+ %{buildroot}%{_libdir}/girepository-1.0/
+rm -rf %{buildroot}%{_libexecdir}/%{name}/girepository-1.0
# Fix missing shabang
chmod a+x %{buildroot}%{_datadir}/%{name}/*.py
@@ -127,27 +120,22 @@
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave
%{_sysconfdir}/${i} ||:
done
-%ldconfig_scriptlets -n libcscreensaver-0_0_0
-
%files
%license COPYING COPYING.LIB
%doc AUTHORS README.md HACKING
+%dir %{_libexecdir}/%{name}
%{_bindir}/{%{name}{,-command},cinnamon-unlock-desktop}
%{_datadir}/applications/%{appid}.desktop
-%{_libexecdir}/{%{name}-pam-helper,cs-backup-locker}
+%{_libexecdir}/%{name}/{%{name}-pam-helper,cs-backup-locker,libcscreensaver.so}
%{_datadir}/%{name}
%{_datadir}/dbus-1/services/%{appid}.service
%{_datadir}/icons/hicolor/scalable/{actions,apps,status}/*.svg
%{_pam_vendordir}/%{name}
%files -n typelib-1_0-CScreensaver-1_0
+%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/CScreensaver-1.0.typelib
-%files -n libcscreensaver-0_0_0
-%{_libdir}/libcscreensaver.so.*
-
%files devel
%{_datadir}/gir-1.0/CScreensaver-1.0.gir
-%{_libdir}/pkgconfig/cscreensaver.pc
-%{_libdir}/libcscreensaver.so
++++++ cinnamon-screensaver-6.2.0.tar.gz -> cinnamon-screensaver-6.4.0.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/backup-locker/cs-backup-locker.c
new/cinnamon-screensaver-6.4.0/backup-locker/cs-backup-locker.c
--- old/cinnamon-screensaver-6.2.0/backup-locker/cs-backup-locker.c
2024-06-11 17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/backup-locker/cs-backup-locker.c
2024-11-26 14:51:33.000000000 +0100
@@ -631,6 +631,11 @@
g_debug ("backup-locker: initializing");
+ if (!xid_str || !term_tty_str || !session_tty_str) {
+ g_critical ("xid, term and session arguments are mandatory, exiting.");
+ exit (1);
+ }
+
gulong xid = term_tty = session_tty = 0;
xid = strtoul (xid_str, NULL, 0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/backup-locker/meson.build
new/cinnamon-screensaver-6.4.0/backup-locker/meson.build
--- old/cinnamon-screensaver-6.2.0/backup-locker/meson.build 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/backup-locker/meson.build 2024-11-26
14:51:33.000000000 +0100
@@ -16,7 +16,8 @@
include_directories: inc,
dependencies: [x11, gtk, glib],
link_with: libcscreensaver,
- install_dir: libexecdir,
+ install_rpath: pkglibdir,
+ install_dir: pkglibdir,
install: true
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg
new/cinnamon-screensaver-6.4.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg
---
old/cinnamon-screensaver-6.2.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg
1970-01-01 01:00:00.000000000 +0100
+++
new/cinnamon-screensaver-6.4.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-conceal.svg
2024-11-26 14:51:33.000000000 +0100
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ height="16px"
+ viewBox="0 0 16 16"
+ width="16px"
+ version="1.1"
+ id="svg867"
+ sodipodi:docname="cinnamon-screensaver-view-conceal.svg"
+ inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:svg="http://www.w3.org/2000/svg";>
+ <defs
+ id="defs871" />
+ <sodipodi:namedview
+ id="namedview869"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="true"
+ inkscape:deskcolor="#d1d1d1"
+ showgrid="false"
+ inkscape:zoom="52.375"
+ inkscape:cx="6.4725537"
+ inkscape:cy="8"
+ inkscape:window-width="1920"
+ inkscape:window-height="980"
+ inkscape:window-x="1920"
+ inkscape:window-y="28"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg867" />
+ <path
+ d="m 1.53125 0.46875 l -1.0625 1.0625 l 14 14 l 1.0625 -1.0625 l
-2.382812 -2.382812 c 1.265624 -1.0625 2.171874 -2.496094 2.589843 -4.097657 c
-0.914062 -3.523437 -4.097656 -5.984375 -7.738281 -5.988281 c -1.367188
0.011719 -2.707031 0.371094 -3.894531 1.042969 z m 6.46875 3.53125 c 2.210938 0
4 1.789062 4 4 c -0.003906 0.800781 -0.246094 1.578125 -0.699219 2.238281 l
-1.46875 -1.46875 c 0.105469 -0.242187 0.164063 -0.503906 0.167969 -0.769531 c
0 -1.105469 -0.894531 -2 -2 -2 c -0.265625 0.003906 -0.527344 0.0625 -0.769531
0.167969 l -1.46875 -1.46875 c 0.660156 -0.453125 1.4375 -0.695313 2.238281
-0.699219 z m -6.144531 0.917969 c -0.753907 0.898437 -1.296875 1.957031
-1.59375 3.09375 c 0.914062 3.523437 4.097656 5.984375 7.738281 5.988281 c
0.855469 -0.007812 1.703125 -0.152344 2.511719 -0.425781 l -1.667969 -1.667969
c -0.277344 0.058594 -0.5625 0.089844 -0.84375 0.09375 c -2.210938 0 -4
-1.789062 -4 -4 c 0.003906 -0.28125 0.035156 -0.566406 0.09375 -0.84375 z m 0 0"
+ fill="#2e3436"
+ id="path865"
+ style="stroke:none;fill:#ffffff;fill-opacity:0.69999999" />
+</svg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg
new/cinnamon-screensaver-6.4.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg
---
old/cinnamon-screensaver-6.2.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg
1970-01-01 01:00:00.000000000 +0100
+++
new/cinnamon-screensaver-6.4.0/data/icons/hicolor/scalable/status/cinnamon-screensaver-view-reveal.svg
2024-11-26 14:51:33.000000000 +0100
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ height="16px"
+ viewBox="0 0 16 16"
+ width="16px"
+ version="1.1"
+ id="svg4"
+ sodipodi:docname="cinnamon-screensaver-view-reveal.svg"
+ inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:svg="http://www.w3.org/2000/svg";>
+ <defs
+ id="defs8" />
+ <sodipodi:namedview
+ id="namedview6"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.3372549"
+ inkscape:pagecheckerboard="true"
+ inkscape:deskcolor="#d1d1d1"
+ showgrid="false"
+ inkscape:zoom="52.375"
+ inkscape:cx="6.4725537"
+ inkscape:cy="8"
+ inkscape:window-width="1920"
+ inkscape:window-height="980"
+ inkscape:window-x="1920"
+ inkscape:window-y="28"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg4" />
+ <path
+ d="m 8 2 c -3.648438 0.003906 -6.832031 2.476562 -7.738281 6.007812 c
0.914062 3.527344 4.097656 5.988282 7.738281 5.992188 c 3.648438 -0.003906
6.832031 -2.476562 7.738281 -6.011719 c -0.914062 -3.523437 -4.097656 -5.984375
-7.738281 -5.988281 z m 0 2 c 2.210938 0 4 1.789062 4 4 s -1.789062 4 -4 4 s -4
-1.789062 -4 -4 s 1.789062 -4 4 -4 z m 0 2 c -1.105469 0 -2 0.894531 -2 2 s
0.894531 2 2 2 s 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 0"
+ fill="#2e3436"
+ id="path2"
+ style="fill:#ffffff;fill-opacity:0.69999999;stroke:none" />
+</svg>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/data/meson.build
new/cinnamon-screensaver-6.4.0/data/meson.build
--- old/cinnamon-screensaver-6.2.0/data/meson.build 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/data/meson.build 2024-11-26
14:51:33.000000000 +0100
@@ -8,8 +8,6 @@
dbus_service = configure_file(
output: 'org.cinnamon.ScreenSaver.service',
input: 'org.cinnamon.ScreenSaver.service.in',
- # meson 0.49
- # configuration: { 'EXPANDED_BINDIR': bindir }
configuration: misc_conf
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/data/org.cinnamon.ScreenSaver.service.in
new/cinnamon-screensaver-6.4.0/data/org.cinnamon.ScreenSaver.service.in
--- old/cinnamon-screensaver-6.2.0/data/org.cinnamon.ScreenSaver.service.in
2024-06-11 17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/data/org.cinnamon.ScreenSaver.service.in
2024-11-26 14:51:33.000000000 +0100
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.cinnamon.ScreenSaver
-Exec=@EXPANDED_BINDIR@/cinnamon-screensaver
+Exec=@bindir@/cinnamon-screensaver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/changelog
new/cinnamon-screensaver-6.4.0/debian/changelog
--- old/cinnamon-screensaver-6.2.0/debian/changelog 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/debian/changelog 2024-11-26
14:51:33.000000000 +0100
@@ -1,3 +1,33 @@
+cinnamon-screensaver (6.4.0) xia; urgency=medium
+
+ [ Michael Webster ]
+ * build: Use debugoptimized, remove some obsolete meson bits.
+ * cs-backup-locker.c: Exit gracefully if incorrect arguments are given,
instead of crashing.
+ * Make codespell happy.
+ * unlock dialog: Allow password visibility to be toggled.
+
+ [ Matt Turnbull ]
+ * Follow-up to 60ad855 - remove g-codegen.py now that it is unreferenced.
(#458)
+
+ [ Michael Webster ]
+ * Don't package private library and typelib files separately.
+ * Simplify authClient.py pam helper path.
+
+ [ Fabio Fantoni ]
+ * fix executable libraries
+ * Debian packaging improvement (#459)
+
+ [ Michael Webster ]
+ * keybindings: Ignore shift-f10 (alternate menu popup shortcut).
+
+ [ Fabio Fantoni ]
+ * Update debian/copyright (#461)
+
+ [ Alex Badea ]
+ * libscreensaver: fix detection of monitor hotplug (#463)
+
+ -- Clement Lefebvre <r...@linuxmint.com> Tue, 26 Nov 2024 13:50:06 +0000
+
cinnamon-screensaver (6.2.0) wilma; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/debian/cinnamon-screensaver-pam-helper.install
new/cinnamon-screensaver-6.4.0/debian/cinnamon-screensaver-pam-helper.install
---
old/cinnamon-screensaver-6.2.0/debian/cinnamon-screensaver-pam-helper.install
2024-06-11 17:57:50.000000000 +0200
+++
new/cinnamon-screensaver-6.4.0/debian/cinnamon-screensaver-pam-helper.install
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/lib/*/cinnamon-screensaver-pam-helper
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/debian/cinnamon-screensaver.install
new/cinnamon-screensaver-6.4.0/debian/cinnamon-screensaver.install
--- old/cinnamon-screensaver-6.2.0/debian/cinnamon-screensaver.install
2024-06-11 17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/debian/cinnamon-screensaver.install
2024-11-26 14:51:33.000000000 +0100
@@ -1,10 +1,9 @@
etc/pam.d/cinnamon-screensaver
usr/bin
-usr/lib/*/cinnamon-screensaver/cinnamon-screensaver-pam-helper
-usr/lib/*/cinnamon-screensaver/cs-backup-locker
usr/share/applications
usr/share/cinnamon-screensaver/*.css
usr/share/cinnamon-screensaver/*.py
usr/share/cinnamon-screensaver/*/*.py
usr/share/dbus-1
usr/share/icons
+usr/libexec/cinnamon-screensaver
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/compat
new/cinnamon-screensaver-6.4.0/debian/compat
--- old/cinnamon-screensaver-6.2.0/debian/compat 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/debian/compat 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/control
new/cinnamon-screensaver-6.4.0/debian/control
--- old/cinnamon-screensaver-6.2.0/debian/control 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/debian/control 2024-11-26
14:51:33.000000000 +0100
@@ -3,19 +3,19 @@
Priority: optional
Maintainer: Linux Mint <r...@linuxmint.com>
Build-Depends:
- debhelper (>= 11.1~),
- dh-python,
- gnome-pkg-tools (>= 0.10),
+ debhelper-compat (= 13),
+ dh-sequence-python3,
+ gnome-pkg-tools,
gobject-introspection,
- intltool (>= 0.40.0),
+ intltool,
libdbus-1-dev,
libgirepository1.0-dev,
- libglib2.0-dev (>= 2.37.3),
- libgtk-3-dev (>= 3.22),
+ libglib2.0-dev,
+ libgtk-3-dev,
libpam0g-dev,
libxdo-dev,
libxext-dev,
- meson (>= 0.40.0),
+ meson,
python3,
Standards-Version: 3.9.6
@@ -23,34 +23,32 @@
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
Depends:
- cinnamon-desktop-data (>= 3.5),
- gir1.2-cinnamondesktop-3.0 (>= 4.8),
+ cinnamon-desktop-data (>= 6.0),
+ gir1.2-caribou-1.0,
+ gir1.2-cinnamondesktop-3.0 (>= 6.0),
+ gir1.2-gdk-3.0,
+ gir1.2-gdkpixbuf-2.0,
+ gir1.2-gio-2.0,
gir1.2-gkbd-3.0,
gir1.2-glib-2.0,
+ gir1.2-gobject-2.0,
gir1.2-gtk-3.0,
+ gir1.2-pango-1.0,
gir1.2-xapp-1.0,
iso-flag-png,
- libcscreensaver0 (= ${binary:Version}),
libxdo3,
python3,
python3-gi,
python3-gi-cairo,
python3-setproctitle,
- python3-xapp (>= 1.0.1),
+ python3-xapp,
python3-xlib,
x11-utils,
${misc:Depends},
${python3:Depends},
${shlibs:Depends},
Recommends: libpam-gnome-keyring
-Breaks:
- cinnamon-screensaver-pam-helper (<< 3.8),
- cinnamon-screensaver-webkit-plugin (<< 3.9),
- cinnamon-screensaver-x-plugin (<< 3.9)
-Replaces:
- cinnamon-screensaver-pam-helper (<< 3.8),
- cinnamon-screensaver-webkit-plugin (<< 3.9),
- cinnamon-screensaver-x-plugin (<< 3.9)
+Breaks: libcscreensaver0 (<< ${source:Version})
Description: Cinnamon screen saver and locker
cinnamon-screensaver is a screen saver and locker that aims to have simple,
sane and secure defaults, and be well integrated with the Cinnamon desktop.
@@ -61,18 +59,6 @@
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
-Depends: libcscreensaver0 (= ${binary:Version}), ${misc:Depends}
+Depends: cinnamon-screensaver (= ${binary:Version}), ${misc:Depends}
Description: Cinnamon Screensaver library - debug symbols
This package contains the symbols files needed to debug the Cinnamon
Screensaver library.
-
-Package: libcscreensaver0
-Section: libs
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: library and introspection data used by cinnamon-screensaver
- cinnamon-screensaver is a screen saver and locker that aims to have simple,
- sane and secure defaults, and be well integrated with the Cinnamon desktop.
- .
- This package contains the library used by the screensaver.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/copyright
new/cinnamon-screensaver-6.4.0/debian/copyright
--- old/cinnamon-screensaver-6.2.0/debian/copyright 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/debian/copyright 2024-11-26
14:51:33.000000000 +0100
@@ -1,20 +1,21 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: cinnamon-screensaver
Upstream-Contact: Linux Mint Project <r...@linuxmint.com>
Source: https://github.com/linuxmint/cinnamon-screensaver.git
Files: *
-Copyright: 2016, Michael Webster <miketwebs...@gmail.com>
+Copyright: 2003, Bill Nottingham <nott...@redhat.com>
+ 1989-1991, Free Software Foundation, Inc
+ 1991-2004, Jamie Zawinski <j...@jwz.org>
+ 2016, Michael Webster <miketwebs...@gmail.com>
+ 2006, Ray Strode <rstr...@redhat.com>
+ 2002, Sun Microsystems
+ 2004-2006, William Jon McCann <mcc...@jhu.edu>
License: GPL-2+
-Files: COPYING.LIB
-Copyright: 1951, Franklin Street - Suite 500, Boston, MA, 02110-1335, USA
- 1991, Free Software Foundation, Inc
-License: LGPL-2+
-
Files: debian/*
-Copyright: 2014-2017, Maximiliano Curia <m...@debian.org>
-Copyright: 2013-2017, Linux Mint Project <r...@linuxmint.com>
+Copyright: 2014-2016, Maximiliano Curia <m...@debian.org>
+ 2013-2024, Linux Mint Project <r...@linuxmint.com>
License: LGPL-2+
Files: libcscreensaver/setuid.c
@@ -25,11 +26,6 @@
2004, William Jon McCann <mcc...@jhu.edu>
License: MIT/X11
-Files: po/Makefile.in.in
-Copyright: 2004-2008, Rodney Dawes <dobey.p...@gmail.com>
- 1995-1997, Ulrich Drepper <drep...@gnu.ai.mit.edu>
-License: Permissive
-
License: GPL-2+
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@ -66,8 +62,3 @@
documentation. No representations are made about the suitability of this
software for any purpose. It is provided "as is" without express or
implied warranty.
-
-License: Permissive
- This file may be copied and used freely without restrictions. It may
- be used in projects which are not available under a GNU Public License,
- but which still want to provide support for the GNU gettext functionality.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/debian/libcscreensaver0.install
new/cinnamon-screensaver-6.4.0/debian/libcscreensaver0.install
--- old/cinnamon-screensaver-6.2.0/debian/libcscreensaver0.install
2024-06-11 17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/debian/libcscreensaver0.install
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-usr/lib/*/girepository-1.0/CScreensaver-1.0.typelib
-usr/lib/*/libcscreensaver.so.0
-usr/lib/*/libcscreensaver.so.0.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/debian/rules
new/cinnamon-screensaver-6.4.0/debian/rules
--- old/cinnamon-screensaver-6.2.0/debian/rules 2024-06-11 17:57:50.000000000
+0200
+++ new/cinnamon-screensaver-6.4.0/debian/rules 2024-11-26 14:51:33.000000000
+0100
@@ -1,26 +1,27 @@
#!/usr/bin/make -f
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
%:
- dh $@ --with=python3
+ dh $@
override_dh_strip:
dh_strip --dbg-package=libcscreensaver-dbg
override_dh_auto_configure:
dh_auto_configure -- \
- --libexecdir=lib/$(DEB_HOST_MULTIARCH)/cinnamon-screensaver \
- -D use-debian-pam=true
+ --libexecdir=libexec \
+ --buildtype=debugoptimized \
+ -D use-debian-pam=true \
+
+execute_after_dh_fixperms:
+ : # fix executable libraries
+ chmod 0644
debian/cinnamon-screensaver/usr/libexec/cinnamon-screensaver/girepository-1.0/CScreensaver-1.0.typelib
+ chmod 0644
debian/cinnamon-screensaver/usr/libexec/cinnamon-screensaver/libcscreensaver.so
# there has never been a testsuite, so don't try running it and breaking
# just because there isn't one
override_dh_auto_test:
-# --list-missing will be default in compat 12
-override_dh_missing:
- dh_missing --list-missing
-
override_dh_python3:
dh_python3 usr/share/cinnamon-screensaver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-auth-pam.c
new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-auth-pam.c
--- old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-auth-pam.c
2024-06-11 17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-auth-pam.c
2024-11-26 14:51:33.000000000 +0100
@@ -234,7 +234,7 @@
g_idle_add ((GSourceFunc) cs_auth_queued_message_handler, &data);
if (cs_auth_get_verbose ()) {
- DEBUG ("cs-auth-pam (pid %i): Waiting for respose to message
style %d: '%s'\n", getpid (), style, msg);
+ DEBUG ("cs-auth-pam (pid %i): Waiting for response to message
style %d: '%s'\n", getpid (), style, msg);
}
/* Wait for the response
@@ -244,7 +244,7 @@
g_mutex_unlock (message_handler_mutex);
if (cs_auth_get_verbose ()) {
- DEBUG ("cs-auth-pam (pid %i): Got respose to message style %d:
interrupt:%d\n", getpid (), style, data.should_interrupt_stack);
+ DEBUG ("cs-auth-pam (pid %i): Got response to message style
%d: interrupt:%d\n", getpid (), style, data.should_interrupt_stack);
}
return data.should_interrupt_stack == FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-event-grabber.c
new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-event-grabber.c
--- old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-event-grabber.c
2024-06-11 17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-event-grabber.c
2024-11-26 14:51:33.000000000 +0100
@@ -538,7 +538,7 @@
is that both a keyboard grab and a mouse grab are mandatory
- If we don't have a keyboard grab, then we won't be able to
- read a password to unlock, so the kbd grab is manditory.
+ read a password to unlock, so the kbd grab is mandatory.
- If we don't have a mouse grab, then we might not see mouse
clicks as a signal to unblank, on-screen widgets won't work ideally,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-screen-x11.c
new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-screen-x11.c
--- old/cinnamon-screensaver-6.2.0/libcscreensaver/cs-screen-x11.c
2024-06-11 17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/libcscreensaver/cs-screen-x11.c
2024-11-26 14:51:33.000000000 +0100
@@ -416,7 +416,7 @@
{
// Check to see if the union of monitor rects is the same size as the
screen
- GdkRectangle total_monitors;
+ GdkRectangle total_monitors = {0};
gint i;
gboolean same;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/libcscreensaver/g-codegen.py
new/cinnamon-screensaver-6.4.0/libcscreensaver/g-codegen.py
--- old/cinnamon-screensaver-6.2.0/libcscreensaver/g-codegen.py 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/libcscreensaver/g-codegen.py 1970-01-01
01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-#!/usr/bin/env python3
-
-'''
-FIXME
-
-This script is used only to call gdbus-codegen and simulate the
-generation of the source code and header as different targets.
-
-Both are generated implicitly, so meson is not able to know how
-many files are generated, so it does generate only one opaque
-target that represents the two files.
-
-originally from:
-https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/5924d72931a030b24554116a48140a661a99652b
-
-Please see:
- https://bugzilla.gnome.org/show_bug.cgi?id=791015
- https://github.com/mesonbuild/meson/pull/2930
-
https://github.com/linuxmint/xapps/commit/539ed7377cff41643608cf61ed1a8430a367e283#diff-5800aaf205d98232d967a359f4657a06R4
-'''
-
-import subprocess
-import sys
-import os
-
-subprocess.call([
- 'gdbus-codegen',
- '--interface-prefix=' + sys.argv[1],
- '--generate-c-code=' + os.path.join(sys.argv[4], sys.argv[2]),
- '--c-namespace=Cs'] +
- sys.argv[3].split() + [sys.argv[5]]
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/libcscreensaver/meson.build
new/cinnamon-screensaver-6.4.0/libcscreensaver/meson.build
--- old/cinnamon-screensaver-6.2.0/libcscreensaver/meson.build 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/libcscreensaver/meson.build 2024-11-26
14:51:33.000000000 +0100
@@ -104,47 +104,11 @@
]
dbus_built = []
-# foreach dbus: dbus_files
-# dbus_built += gnome.gdbus_codegen(dbus[0], '@0@.xml'.format(dbus[2]),
-# namespace: 'Cs',
-# annotations: dbus[1]
-# )
-# endforeach
-
-# FIXME: Ugly workaround that simulates the generation of
-# two different targets, so headers can be included
-# explicitly for introspection.
-#
-# This can be removed once all platforms use meson >=.46
-# and replaced with gnome.gdbus_codegen
-codegen = find_program('g-codegen.py')
-
foreach dbus: dbus_files
- annotations = []
-
- foreach item: dbus[1]
- annotations += '--annotate'
- annotations += item
- endforeach
-
- annotations_string = ' '.join(annotations)
-
- generated = custom_target(
- dbus[0],
- input: '@0@.xml'.format(dbus[2]),
- output: ['@0@.h'.format(dbus[0]), '@0@.c'.format(dbus[0])],
- command: [
- codegen,
- dbus[2],
- dbus[0],
- annotations_string,
- meson.current_build_dir(),
- '@INPUT@', '@OUTPUT@'
- ]
- )
-
- dbus_built += generated[0]
- dbus_built += generated[1]
+ dbus_built += gnome.gdbus_codegen(dbus[0], '@0@.xml'.format(dbus[2]),
+ namespace: 'Cs',
+ annotations: dbus[1]
+ )
endforeach
# non-pam auth implementations are not implemented at this time
@@ -176,24 +140,13 @@
libcscreensaver = library(
'cscreensaver',
cscreensaver_sources + gir_sources,
- version: '0.0.0',
include_directories: inc,
cpp_args: '-DG_LOG_DOMAIN="CScreensaver"',
dependencies: libcscreensaver_deps,
+ install_dir: pkglibdir,
install: true
)
-pkgconfig.generate(
- # TODO meson 0.46 replace libraries, name, version with positional library
argument
- libraries: libcscreensaver,
- name: 'cscreensaver',
- version: meson.project_version(),
- description: 'Small utility lib used by cinnamon-screensaver v3.1+ to
provide a GdkWindow filter (not currently introspectable)',
- subdirs: 'cscreensaver',
- # these should be their variables, but meson < 0.46 strikes again
- requires: ['gobject-2.0', 'gtk+-3.0', 'gdk-3.0']
-)
-
cscreensaver_gir = gnome.generate_gir(
libcscreensaver,
sources: gir_sources,
@@ -202,8 +155,8 @@
identifier_prefix: 'Cs',
symbol_prefix: 'cs_',
includes: 'Gtk-3.0',
+ install_dir_typelib: typelibdir,
install: true
-
)
test_passwd = executable(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/libcscreensaver/org.mpris.MediaPlayer2.Player.xml
new/cinnamon-screensaver-6.4.0/libcscreensaver/org.mpris.MediaPlayer2.Player.xml
---
old/cinnamon-screensaver-6.2.0/libcscreensaver/org.mpris.MediaPlayer2.Player.xml
2024-06-11 17:57:50.000000000 +0200
+++
new/cinnamon-screensaver-6.4.0/libcscreensaver/org.mpris.MediaPlayer2.Player.xml
2024-11-26 14:51:33.000000000 +0100
@@ -38,7 +38,7 @@
</tp:enumvalue>
<tp:enumvalue suffix="Track" value="Track">
<tp:docstring xmlns="http://www.w3.org/1999/xhtml";>
- <p>The current track will start again from the begining once it has
finished playing</p>
+ <p>The current track will start again from the beginning once it has
finished playing</p>
</tp:docstring>
</tp:enumvalue>
<tp:enumvalue suffix="Playlist" value="Playlist">
@@ -328,7 +328,7 @@
<p>May be:
<ul>
<li>"None" if the playback will stop when there are no more tracks
to play</li>
- <li>"Track" if the current track will start again from the
begining once it has finished playing</li>
+ <li>"Track" if the current track will start again from the
beginning once it has finished playing</li>
<li>"Playlist" if the playback loops through a list of tracks</li>
</ul>
</p>
@@ -440,9 +440,9 @@
setting this property has no effect and can raise an error.
</p>
<p>
- If the playback progresses in a way that is inconstistant with the
+ If the playback progresses in a way that is inconsistent with the
<tp:member-ref>Rate</tp:member-ref> property, the
- <tp:member-ref>Seeked</tp:member-ref> signal is emited.
+ <tp:member-ref>Seeked</tp:member-ref> signal is emitted.
</p>
</tp:docstring>
</property>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/meson.build
new/cinnamon-screensaver-6.4.0/meson.build
--- old/cinnamon-screensaver-6.2.0/meson.build 2024-06-11 17:57:50.000000000
+0200
+++ new/cinnamon-screensaver-6.4.0/meson.build 2024-11-26 14:51:33.000000000
+0100
@@ -1,4 +1,4 @@
-project('cinnamon-screensaver', 'c', version : '6.2.0', meson_version :
'>=0.56.0')
+project('cinnamon-screensaver', 'c', version : '6.4.0', meson_version :
'>=0.56.0')
cc = meson.get_compiler('c')
@@ -14,6 +14,9 @@
datadir = join_paths(prefix, get_option('datadir'))
pkgdatadir = join_paths(datadir, meson.project_name())
libexecdir = join_paths(prefix, get_option('libexecdir'))
+pkglibdir = join_paths(libexecdir, meson.project_name())
+typelibdir = join_paths(pkglibdir, 'girepository-1.0')
+
libdir = join_paths(prefix, get_option('libdir'))
#needed?
sysconfdir = join_paths(prefix, get_option('sysconfdir'))
@@ -24,10 +27,10 @@
# and 0.49 for using them in configure_file
misc_conf = configuration_data()
misc_conf.set('prefix', prefix)
-misc_conf.set('EXPANDED_BINDIR', bindir)
+misc_conf.set('bindir', bindir)
misc_conf.set('datadir', datadir)
misc_conf.set('pkgdatadir', pkgdatadir)
-misc_conf.set('libexecdir', libexecdir)
+misc_conf.set('pkglibdir', pkglibdir)
misc_conf.set('libdir', libdir)
misc_conf.set('PACKAGE', meson.project_name())
misc_conf.set('VERSION', meson.project_version())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/binfile.in
new/cinnamon-screensaver-6.4.0/src/binfile.in
--- old/cinnamon-screensaver-6.2.0/src/binfile.in 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/binfile.in 2024-11-26
14:51:33.000000000 +0100
@@ -5,4 +5,7 @@
exit 1
fi
+export GI_TYPELIB_PATH="@typelibdir@"
+export LD_LIBRARY_PATH="@pkglibdir@"
+
exec @install_dir@/@target@ "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/config.py.in
new/cinnamon-screensaver-6.4.0/src/config.py.in
--- old/cinnamon-screensaver-6.2.0/src/config.py.in 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/config.py.in 2024-11-26
14:51:33.000000000 +0100
@@ -5,7 +5,7 @@
localedir=datadir+"/locale"
pkgdatadir="@pkgdatadir@"
libdir="@libdir@"
-libexecdir="@libexecdir@"
+pkglibdir="@pkglibdir@"
PACKAGE="@PACKAGE@"
VERSION="@VERSION@"
GETTEXT_PACKAGE="@GETTEXT_PACKAGE@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/manager.py
new/cinnamon-screensaver-6.4.0/src/manager.py
--- old/cinnamon-screensaver-6.2.0/src/manager.py 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/manager.py 2024-11-26
14:51:33.000000000 +0100
@@ -278,7 +278,7 @@
term_tty, session_tty = self.get_tty_vals()
argv = [
- os.path.join(config.libexecdir, "cs-backup-locker"),
+ os.path.join(config.pkglibdir, "cs-backup-locker"),
"--xid", str(self.stage.get_window().get_xid()),
"--term", term_tty,
"--session", session_tty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/meson.build
new/cinnamon-screensaver-6.4.0/src/meson.build
--- old/cinnamon-screensaver-6.2.0/src/meson.build 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/meson.build 2024-11-26
14:51:33.000000000 +0100
@@ -8,17 +8,6 @@
config_py = configure_file(
output: 'config.py',
input: 'config.py.in',
- # meson 0.49
- #configuration: {
- # 'prefix': prefix,
- # 'datadir': datadir,
- # 'pkgdatadir': pkgdatadir,
- # 'libexecdir': libexecdir,
- # 'libdir': libdir,
- # 'PACKAGE': meson.project_name(),
- # 'VERSION': meson.project_version(),
- # 'GETTEXT_PACKAGE': meson.project_name()
- #}
configuration: misc_conf
)
@@ -62,6 +51,8 @@
prefix_info = configuration_data()
prefix_info.set('install_dir', pkgdatadir)
prefix_info.set('target', script[0])
+ prefix_info.set('pkglibdir', pkglibdir)
+ prefix_info.set('typelibdir', typelibdir)
bin_file = configure_file(
input : 'binfile.in',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-screensaver-6.2.0/src/pamhelper/authClient.py
new/cinnamon-screensaver-6.4.0/src/pamhelper/authClient.py
--- old/cinnamon-screensaver-6.2.0/src/pamhelper/authClient.py 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/pamhelper/authClient.py 2024-11-26
14:51:33.000000000 +0100
@@ -40,25 +40,10 @@
try:
helper_path = None
- architecture = platform.machine()
- paths = [config.libexecdir, "/usr/lib",
"/usr/lib/cinnamon-screensaver", "/usr/libexec",
"/usr/libexec/cinnamon-screensaver"]
- # On x86 archs, iterate through multiple paths
- # For instance, on a Mint i686 box, the path is actually
/usr/lib/i386-linux-gnu
- x86archs = ["i386", "i486", "i586", "i686"]
- if architecture in x86archs:
- for arch in x86archs:
- paths += ["/usr/lib/%s" % arch, "/usr/lib/%s-linux-gnu" %
arch]
- elif architecture == "x86_64":
- paths += ["/usr/lib/x86_64", "/usr/lib/x86_64-linux-gnu",
"/usr/lib64"]
- else:
- paths += ["/usr/lib/%s" % architecture,
"/usr/lib/%s-linux-gnu" % architecture]
-
- for path in paths:
- full_path = os.path.join(path,
"cinnamon-screensaver-pam-helper")
- if os.path.exists(full_path):
- helper_path = full_path
- break
+ full_path = os.path.join(config.pkglibdir,
"cinnamon-screensaver-pam-helper")
+ if os.path.exists(full_path):
+ helper_path = full_path
if helper_path is None:
print ("authClient: critical Error: PAM Helper could not be
found!")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/pamhelper/meson.build
new/cinnamon-screensaver-6.4.0/src/pamhelper/meson.build
--- old/cinnamon-screensaver-6.2.0/src/pamhelper/meson.build 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/pamhelper/meson.build 2024-11-26
14:51:33.000000000 +0100
@@ -10,6 +10,7 @@
dependencies: [gio_unix, glib],
include_directories: inc,
link_with: libcscreensaver,
+ install_rpath: pkglibdir,
install: true,
- install_dir: libexecdir
+ install_dir: pkglibdir
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/passwordEntry.py
new/cinnamon-screensaver-6.4.0/src/passwordEntry.py
--- old/cinnamon-screensaver-6.2.0/src/passwordEntry.py 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/passwordEntry.py 2024-11-26
14:51:33.000000000 +0100
@@ -29,6 +29,9 @@
self.set_placeholder_text (placeholder_text)
self.set_can_default(True)
+ self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
"cinnamon-screensaver-view-reveal")
+ trackers.con_tracker_get().connect(self, "icon-press",
self.on_icon_pressed)
+
self.placeholder_text = placeholder_text
self.current_icon_name = None
self.current_flag_id = 0
@@ -174,6 +177,16 @@
def on_icon_pressed(self, entry, icon_pos, event):
if icon_pos == Gtk.EntryIconPosition.PRIMARY:
self.keyboard_controller.next_group()
+ elif icon_pos == Gtk.EntryIconPosition.SECONDARY:
+ if self.get_input_purpose() == Gtk.InputPurpose.FREE_FORM:
+ self.set_visibility(False)
+ self.set_input_purpose(Gtk.InputPurpose.PASSWORD)
+ self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
"cinnamon-screensaver-view-reveal")
+ else:
+ self.set_visibility(True)
+ self.set_input_purpose(Gtk.InputPurpose.FREE_FORM)
+ self.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY,
"cinnamon-screensaver-view-conceal")
+ self.queue_draw()
def update_layout_icon(self):
"""
@@ -223,10 +236,6 @@
self.update_layout_icon()
trackers.con_tracker_get().connect(self,
- "icon-press",
- self.on_icon_pressed)
-
- trackers.con_tracker_get().connect(self,
"draw",
self.on_draw)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/singletons.py
new/cinnamon-screensaver-6.4.0/src/singletons.py
--- old/cinnamon-screensaver-6.2.0/src/singletons.py 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/singletons.py 2024-11-26
14:51:33.000000000 +0100
@@ -15,7 +15,7 @@
# clients that the screensaver initializes, that can never fail. The actual
connection
# business to the various dbus address is performed asynchronously from within
each client.
# The following clients can fail to establish with their respective dbus
interfaces without
-# competely breaking the program (or at least that's what we're after) - it
just means that
+# completely breaking the program (or at least that's what we're after) - it
just means that
# depending on what fails, you may end up without keyboard shortcut support,
or a battery
# widget, etc...
from dbusdepot.cinnamonClient import CinnamonClient as _CinnamonClient
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/stage.py
new/cinnamon-screensaver-6.4.0/src/stage.py
--- old/cinnamon-screensaver-6.2.0/src/stage.py 2024-06-11 17:57:50.000000000
+0200
+++ new/cinnamon-screensaver-6.4.0/src/stage.py 2024-11-26 14:51:33.000000000
+0100
@@ -32,7 +32,7 @@
It is Gtk.WindowType.POPUP to avoid being managed/composited by muffin,
and to prevent animation during its creation and destruction.
- The Stage reponds pretty much only to the instructions of the
+ The Stage responds pretty much only to the instructions of the
ScreensaverManager.
"""
__gsignals__ = {
@@ -876,7 +876,7 @@
unlock_mw, unlock_nw = self.unlock_dialog.get_preferred_width()
"""
If, for whatever reason, we need more than 1/3 of the screen
to fully display
- the unlock dialog, reduce our available region width to
accomodate it, reducing
+ the unlock dialog, reduce our available region width to
accommodate it, reducing
the allocation for the floating widgets as required.
"""
if unlock_nw > region_w:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/util/eventHandler.py
new/cinnamon-screensaver-6.4.0/src/util/eventHandler.py
--- old/cinnamon-screensaver-6.2.0/src/util/eventHandler.py 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/util/eventHandler.py 2024-11-26
14:51:33.000000000 +0100
@@ -34,7 +34,7 @@
def on_motion_event(self, event):
"""
Any mouse movement is sent here - there is a threshold to reach when
- asleep, so that inadvertant motion doesn't wake the system
unintentionally.
+ asleep, so that inadvertent motion doesn't wake the system
unintentionally.
"""
if status.Awake:
self.on_user_activity()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-screensaver-6.2.0/src/util/keybindings.py
new/cinnamon-screensaver-6.4.0/src/util/keybindings.py
--- old/cinnamon-screensaver-6.2.0/src/util/keybindings.py 2024-06-11
17:57:50.000000000 +0200
+++ new/cinnamon-screensaver-6.4.0/src/util/keybindings.py 2024-11-26
14:51:33.000000000 +0100
@@ -104,7 +104,7 @@
self.manager.cancel_unlocking()
return True
- if event.keyval == Gdk.KEY_Menu:
+ if event.keyval in (Gdk.KEY_Menu, Gdk.KEY_F10):
return True
if status.Awake:
