Hello community,
here is the log from the commit of package cinnamon-session for
openSUSE:Factory checked in at 2020-12-13 17:30:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-session.new.2328 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session"
Sun Dec 13 17:30:14 2020 rev:22 rq:855387 version:4.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes
2020-09-17 14:51:17.583936323 +0200
+++
/work/SRC/openSUSE:Factory/.cinnamon-session.new.2328/cinnamon-session.changes
2020-12-13 17:30:46.592412634 +0100
@@ -1,0 +2,8 @@
+Tue Dec 8 15:05:01 UTC 2020 - andy great <[email protected]>
+
+- Update to version 4.8.0.
+ * implement suspend-then-hibernate
+ * respect suspend-then-hibernate setting when suspending from
+ menu
+
+-------------------------------------------------------------------
Old:
----
cinnamon-session-4.6.2.tar.gz
New:
----
cinnamon-session-4.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-session.spec ++++++
--- /var/tmp/diff_new_pack.FAHrj0/_old 2020-12-13 17:30:47.280413332 +0100
+++ /var/tmp/diff_new_pack.FAHrj0/_new 2020-12-13 17:30:47.284413336 +0100
@@ -17,7 +17,7 @@
Name: cinnamon-session
-Version: 4.6.2
+Version: 4.8.0
Release: 0
Summary: The session manager for the Cinnamon Desktop
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ cinnamon-session-4.6.2.tar.gz -> cinnamon-session-4.8.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.6.2/cinnamon-session/csm-consolekit.c
new/cinnamon-session-4.8.0/cinnamon-session/csm-consolekit.c
--- old/cinnamon-session-4.6.2/cinnamon-session/csm-consolekit.c
2020-08-11 13:40:52.000000000 +0200
+++ new/cinnamon-session-4.8.0/cinnamon-session/csm-consolekit.c
2020-11-25 15:20:12.000000000 +0100
@@ -713,7 +713,7 @@
}
static void
-csm_consolekit_suspend (CsmSystem *system)
+csm_consolekit_suspend (CsmSystem *system, gboolean suspend_then_hibernate)
{
#ifdef HAVE_OLD_UPOWER
CsmConsolekit *consolekit = CSM_CONSOLEKIT (system);
@@ -728,8 +728,14 @@
#else
CsmConsolekit *manager = CSM_CONSOLEKIT (system);
+ gchar *method = "Suspend";
+ if (suspend_then_hibernate && csm_consolekit_can_suspend (system) &&
csm_consolekit_can_hibernate (system)) {
+ method = "SuspendThenHibernate";
+ }
+ g_debug ("Suspend using: %s", method);
+
g_dbus_proxy_call (manager->priv->ck_proxy,
- "Suspend",
+ method,
g_variant_new ("(b)", TRUE),
0,
G_MAXINT,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.6.2/cinnamon-session/csm-manager.c
new/cinnamon-session-4.8.0/cinnamon-session/csm-manager.c
--- old/cinnamon-session-4.6.2/cinnamon-session/csm-manager.c 2020-08-11
13:40:52.000000000 +0200
+++ new/cinnamon-session-4.8.0/cinnamon-session/csm-manager.c 2020-11-25
15:20:12.000000000 +0100
@@ -93,6 +93,7 @@
#define KEY_SHOW_FALLBACK_WARNING "show-fallback-warning"
#define KEY_BLACKLIST "autostart-blacklist"
#define KEY_PREFER_HYBRID_SLEEP "prefer-hybrid-sleep"
+#define KEY_SUSPEND_HIBERNATE "suspend-then-hibernate"
#define POWER_SETTINGS_SCHEMA "org.cinnamon.settings-daemon.plugins.power"
#define KEY_LOCK_ON_SUSPEND "lock-on-suspend"
@@ -1287,7 +1288,7 @@
csm_system_can_hybrid_sleep (manager->priv->system)) {
csm_system_hybrid_sleep (manager->priv->system);
} else if (csm_system_can_suspend (manager->priv->system)) {
- csm_system_suspend (manager->priv->system);
+ csm_system_suspend (manager->priv->system,
g_settings_get_boolean (manager->priv->settings, KEY_SUSPEND_HIBERNATE));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.6.2/cinnamon-session/csm-system.c
new/cinnamon-session-4.8.0/cinnamon-session/csm-system.c
--- old/cinnamon-session-4.6.2/cinnamon-session/csm-system.c 2020-08-11
13:40:52.000000000 +0200
+++ new/cinnamon-session-4.8.0/cinnamon-session/csm-system.c 2020-11-25
15:20:12.000000000 +0100
@@ -119,9 +119,9 @@
}
void
-csm_system_suspend (CsmSystem *system)
+csm_system_suspend (CsmSystem *system, gboolean suspend_then_hibernate)
{
- CSM_SYSTEM_GET_IFACE (system)->suspend (system);
+ CSM_SYSTEM_GET_IFACE (system)->suspend (system,
suspend_then_hibernate);
}
void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.6.2/cinnamon-session/csm-system.h
new/cinnamon-session-4.8.0/cinnamon-session/csm-system.h
--- old/cinnamon-session-4.6.2/cinnamon-session/csm-system.h 2020-08-11
13:40:52.000000000 +0200
+++ new/cinnamon-session-4.8.0/cinnamon-session/csm-system.h 2020-11-25
15:20:12.000000000 +0100
@@ -58,7 +58,8 @@
void (* attempt_stop) (CsmSystem *system);
void (* attempt_restart) (CsmSystem *system);
void (* hybrid_sleep) (CsmSystem *system);
- void (* suspend) (CsmSystem *system);
+ void (* suspend) (CsmSystem *system,
+ gboolean suspend_then_hibernate);
void (* hibernate) (CsmSystem *system);
void (* set_session_idle) (CsmSystem *system,
gboolean is_idle);
@@ -100,7 +101,8 @@
void csm_system_hybrid_sleep (CsmSystem *system);
-void csm_system_suspend (CsmSystem *system);
+void csm_system_suspend (CsmSystem *system,
+ gboolean suspend_then_hibernate);
void csm_system_hibernate (CsmSystem *system);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.6.2/cinnamon-session/csm-systemd.c
new/cinnamon-session-4.8.0/cinnamon-session/csm-systemd.c
--- old/cinnamon-session-4.6.2/cinnamon-session/csm-systemd.c 2020-08-11
13:40:52.000000000 +0200
+++ new/cinnamon-session-4.8.0/cinnamon-session/csm-systemd.c 2020-11-25
15:20:12.000000000 +0100
@@ -542,12 +542,18 @@
}
static void
-csm_systemd_suspend (CsmSystem *system)
+csm_systemd_suspend (CsmSystem *system, gboolean suspend_then_hibernate)
{
+ gchar *method = "Suspend";
+ if (suspend_then_hibernate && csm_systemd_can_suspend (system) &&
csm_systemd_can_hibernate (system)) {
+ method = "SuspendThenHibernate";
+ }
+ g_debug ("Suspend using: %s", method);
+
CsmSystemd *manager = CSM_SYSTEMD (system);
g_dbus_proxy_call (manager->priv->sd_proxy,
- "Suspend",
+ method,
g_variant_new ("(b)", TRUE),
0,
G_MAXINT,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.6.2/data/org.cinnamon.SessionManager.gschema.xml
new/cinnamon-session-4.8.0/data/org.cinnamon.SessionManager.gschema.xml
--- old/cinnamon-session-4.6.2/data/org.cinnamon.SessionManager.gschema.xml
2020-08-11 13:40:52.000000000 +0200
+++ new/cinnamon-session-4.8.0/data/org.cinnamon.SessionManager.gschema.xml
2020-11-25 15:20:12.000000000 +0100
@@ -48,5 +48,10 @@
<summary>If your hardware and login service supports 'Hybrid Sleep' then
use it instead of normal Suspend</summary>
<description>Whether or not to attempt to use hybrid sleep mode for
suspend. If it is unsupported, normal sleep will be used instead</description>
</key>
+ <key name="suspend-then-hibernate" type="b">
+ <default>false</default>
+ <summary>The system is suspended and put into hibernation after being
suspended for a certain time. (Defaults to 2h, see systemd-sleep.conf)</summary>
+ <description>Whether or not to attempt to use suspend-then-hibernate. If
it is unsupported, normal suspend will be used instead</description>
+ </key>
</schema>
</schemalist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.6.2/debian/changelog
new/cinnamon-session-4.8.0/debian/changelog
--- old/cinnamon-session-4.6.2/debian/changelog 2020-08-11 13:40:52.000000000
+0200
+++ new/cinnamon-session-4.8.0/debian/changelog 2020-11-25 15:20:12.000000000
+0100
@@ -1,3 +1,14 @@
+cinnamon-session (4.8.0) ulyssa; urgency=medium
+
+ [ miniskipper ]
+ * implement suspend-then-hibernate (issue #237)
+ * respect suspend-then-hibernate setting when suspending from menu
+
+ [ Fabio Fantoni ]
+ * use debhelper 11 for integrated meson support
+
+ -- Clement Lefebvre <[email protected]> Wed, 25 Nov 2020 14:19:53 +0000
+
cinnamon-session (4.6.2) ulyana; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.6.2/debian/compat
new/cinnamon-session-4.8.0/debian/compat
--- old/cinnamon-session-4.6.2/debian/compat 2020-08-11 13:40:52.000000000
+0200
+++ new/cinnamon-session-4.8.0/debian/compat 2020-11-25 15:20:12.000000000
+0100
@@ -1 +1 @@
-10
+11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.6.2/debian/control
new/cinnamon-session-4.8.0/debian/control
--- old/cinnamon-session-4.6.2/debian/control 2020-08-11 13:40:52.000000000
+0200
+++ new/cinnamon-session-4.8.0/debian/control 2020-11-25 15:20:12.000000000
+0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Linux Mint <[email protected]>
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11.1~),
gnome-pkg-tools (>= 0.13),
intltool (>= 0.40.6),
libcanberra-dev,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.6.2/debian/rules
new/cinnamon-session-4.8.0/debian/rules
--- old/cinnamon-session-4.6.2/debian/rules 2020-08-11 13:40:52.000000000
+0200
+++ new/cinnamon-session-4.8.0/debian/rules 2020-11-25 15:20:12.000000000
+0100
@@ -1,27 +1,21 @@
#!/usr/bin/make -f
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
+
%:
dh $@
override_dh_auto_configure:
- mkdir -p debian/build
- meson debian/build \
- --prefix=/usr \
- --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ dh_auto_configure -- \
--libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
- --buildtype=plain \
-Ddocbook=true \
-Dfrequent_warnings=true \
-Dgconf=false \
-Dipv6=true \
-Dxtrans=true
-override_dh_auto_build:
- ninja -C debian/build
-
-override_dh_auto_test:
- ninja -C debian/build test
+# --list-missing will be default in compat 12
+override_dh_missing:
+ dh_missing --list-missing
-override_dh_auto_install:
- DESTDIR=${CURDIR}/debian/tmp \
- ninja -C debian/build install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.6.2/meson.build
new/cinnamon-session-4.8.0/meson.build
--- old/cinnamon-session-4.6.2/meson.build 2020-08-11 13:40:52.000000000
+0200
+++ new/cinnamon-session-4.8.0/meson.build 2020-11-25 15:20:12.000000000
+0100
@@ -1,7 +1,7 @@
# https://github.com/linuxmint/cinnamon-session
project('cinnamon-session',
[ 'c', ],
- version: '4.6.2',
+ version: '4.8.0',
meson_version: '>=0.37.0',
)
_______________________________________________
openSUSE Commits mailing list -- [email protected]
To unsubscribe, email [email protected]
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/[email protected]
