Hello community,
here is the log from the commit of package cinnamon-session for
openSUSE:Factory checked in at 2020-09-17 14:48:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-session.new.4249 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session"
Thu Sep 17 14:48:13 2020 rev:21 rq:834952 version:4.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes
2020-03-17 13:11:13.381848617 +0100
+++
/work/SRC/openSUSE:Factory/.cinnamon-session.new.4249/cinnamon-session.changes
2020-09-17 14:51:17.583936323 +0200
@@ -1,0 +2,6 @@
+Mon Sep 14 14:03:11 UTC 2020 - andy great <[email protected]>
+
+- Update to version 4.6.2.
+ * csm-autostart-app.c: Respect the Path key in desktop files.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-session-4.4.1.tar.gz
New:
----
cinnamon-session-4.6.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-session.spec ++++++
--- /var/tmp/diff_new_pack.WxIXPl/_old 2020-09-17 14:51:19.207937873 +0200
+++ /var/tmp/diff_new_pack.WxIXPl/_new 2020-09-17 14:51:19.211937876 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-session
#
-# Copyright (c) 2020 SUSE LLC.
+# Copyright (c) 2020 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-session
-Version: 4.4.1
+Version: 4.6.2
Release: 0
Summary: The session manager for the Cinnamon Desktop
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -34,8 +34,8 @@
BuildRequires: xmlto
BuildRequires: xtrans
BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(gconf-2.0)
+BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(json-glib-1.0)
++++++ cinnamon-session-4.4.1.tar.gz -> cinnamon-session-4.6.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.4.1/.circleci/config.yml
new/cinnamon-session-4.6.2/.circleci/config.yml
--- old/cinnamon-session-4.4.1/.circleci/config.yml 2020-02-14
09:54:40.000000000 +0100
+++ new/cinnamon-session-4.6.2/.circleci/config.yml 2020-08-11
13:40:52.000000000 +0200
@@ -47,19 +47,19 @@
fi
jobs:
- "mint19":
+ "mint20":
<<: *shared
docker:
- - image: linuxmintd/mint19-amd64
+ - image: linuxmintd/mint20-amd64
- "lmde3":
+ "lmde4":
<<: *shared
docker:
- - image: linuxmintd/lmde3-amd64
+ - image: linuxmintd/lmde4-amd64
workflows:
version: 2
build:
jobs:
- - "mint19"
- - "lmde3"
+ - "mint20"
+ - "lmde4"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.4.1/cinnamon-session/csm-autostart-app.c
new/cinnamon-session-4.6.2/cinnamon-session/csm-autostart-app.c
--- old/cinnamon-session-4.4.1/cinnamon-session/csm-autostart-app.c
2020-02-14 09:54:40.000000000 +0100
+++ new/cinnamon-session-4.6.2/cinnamon-session/csm-autostart-app.c
2020-08-11 13:40:52.000000000 +0200
@@ -70,6 +70,7 @@
gboolean condition;
gboolean autorestart;
int autostart_delay;
+ char *working_dir;
GFileMonitor *condition_monitor;
guint condition_notify_id;
@@ -108,6 +109,7 @@
app->priv->condition_monitor = NULL;
app->priv->condition = FALSE;
app->priv->autostart_delay = -1;
+ app->priv->working_dir = NULL;
}
static gboolean
@@ -722,6 +724,10 @@
csm_app_peek_id (CSM_APP (app)));
app->priv->autostart_delay = -1;
}
+
+ app->priv->working_dir = egg_desktop_file_get_string
(app->priv->desktop_file,
+
EGG_DESKTOP_FILE_KEY_PATH,
+ NULL);
}
g_object_set (app,
@@ -859,6 +865,8 @@
priv->desktop_id = NULL;
}
+ g_clear_pointer (&priv->working_dir, g_free);
+
if (priv->child_watch_id > 0) {
g_source_remove (priv->child_watch_id);
priv->child_watch_id = 0;
@@ -1123,6 +1131,7 @@
EGG_DESKTOP_FILE_LAUNCH_FLAGS,
G_SPAWN_DO_NOT_REAP_CHILD,
EGG_DESKTOP_FILE_LAUNCH_RETURN_PID,
&app->priv->pid,
EGG_DESKTOP_FILE_LAUNCH_RETURN_STARTUP_ID, &app->priv->startup_id,
+ EGG_DESKTOP_FILE_LAUNCH_DIRECTORY,
app->priv->working_dir,
NULL);
g_free (env[0]);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.4.1/cinnamon-session/csm-manager.c
new/cinnamon-session-4.6.2/cinnamon-session/csm-manager.c
--- old/cinnamon-session-4.4.1/cinnamon-session/csm-manager.c 2020-02-14
09:54:40.000000000 +0100
+++ new/cinnamon-session-4.6.2/cinnamon-session/csm-manager.c 2020-08-11
13:40:52.000000000 +0200
@@ -2470,7 +2470,8 @@
}
}
- if (manager->priv->phase == CSM_MANAGER_PHASE_QUERY_END_SESSION) {
+ switch (manager->priv->phase) {
+ case CSM_MANAGER_PHASE_QUERY_END_SESSION:
/* Instead of answering our end session query, the client just
exited.
* Treat that as an "okay, end the session" answer.
*
@@ -2486,6 +2487,32 @@
"query end session phase "
"instead of end session "
"phase");
+ break;
+ case CSM_MANAGER_PHASE_END_SESSION:
+ if (! g_slist_find (manager->priv->query_clients, client)) {
+ /* the client sent its EndSessionResponse and we
already
+ * processed it.
+ */
+ break;
+ }
+
+ /* Client exited without sending EndSessionResponse.
+ * The likely reason is that its exit code is written in a way
+ * that never returns, and sending EndSessionResponse is
handled
+ * in library code after the callback. Or maybe the application
+ * crashed while handling EndSession. Or it was lazy.
+ */
+ _handle_client_end_session_response (manager,
+ client,
+ TRUE,
+ FALSE,
+ FALSE,
+ "Client exited in "
+ "end session phase
without "
+ "sending
EndSessionResponse");
+ default:
+ /* do nothing */
+ break;
}
if (manager->priv->dbus_disconnected && CSM_IS_DBUS_CLIENT (client)) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.4.1/cinnamon-session/csm-systemd.c
new/cinnamon-session-4.6.2/cinnamon-session/csm-systemd.c
--- old/cinnamon-session-4.4.1/cinnamon-session/csm-systemd.c 2020-02-14
09:54:40.000000000 +0100
+++ new/cinnamon-session-4.6.2/cinnamon-session/csm-systemd.c 2020-08-11
13:40:52.000000000 +0200
@@ -23,7 +23,7 @@
#include "config.h"
#include "csm-systemd.h"
-#ifdef HAVE_LOGIND
+#if defined(HAVE_LOGIND) || defined(HAVE_ELOGIND)
#include <errno.h>
#include <string.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.4.1/cinnamon-session/meson.build
new/cinnamon-session-4.6.2/cinnamon-session/meson.build
--- old/cinnamon-session-4.4.1/cinnamon-session/meson.build 2020-02-14
09:54:40.000000000 +0100
+++ new/cinnamon-session-4.6.2/cinnamon-session/meson.build 2020-08-11
13:40:52.000000000 +0200
@@ -74,7 +74,7 @@
xext,
xrender,
xtest,
- # elogind,
+ elogind,
],
link_with: [
libegg,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.4.1/debian/changelog
new/cinnamon-session-4.6.2/debian/changelog
--- old/cinnamon-session-4.4.1/debian/changelog 2020-02-14 09:54:40.000000000
+0100
+++ new/cinnamon-session-4.6.2/debian/changelog 2020-08-11 13:40:52.000000000
+0200
@@ -1,3 +1,27 @@
+cinnamon-session (4.6.2) ulyana; urgency=medium
+
+ [ Michael Webster ]
+ * csm-autostart-app.c: Respect the Path key in desktop files.
+
+ [ Clement Lefebvre ]
+ * CI: Update targets
+
+ -- Clement Lefebvre <[email protected]> Tue, 11 Aug 2020 12:40:31 +0100
+
+cinnamon-session (4.6.1) ulyana; urgency=medium
+
+ [ Garry Filakhtov ]
+ * Fix elogind support
+
+ -- Clement Lefebvre <[email protected]> Wed, 27 May 2020 12:41:48 +0100
+
+cinnamon-session (4.6.0) ulyana; urgency=medium
+
+ [ Michael Webster ]
+ * csm-manager.c: Don't let programs that exit without responding to
cinnamon-session's request delay the shutdown.
+
+ -- Clement Lefebvre <[email protected]> Tue, 12 May 2020 13:59:00 +0100
+
cinnamon-session (4.4.1) tricia; urgency=medium
[ Eli Schwartz ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.4.1/meson.build
new/cinnamon-session-4.6.2/meson.build
--- old/cinnamon-session-4.4.1/meson.build 2020-02-14 09:54:40.000000000
+0100
+++ new/cinnamon-session-4.6.2/meson.build 2020-08-11 13:40:52.000000000
+0200
@@ -1,7 +1,7 @@
# https://github.com/linuxmint/cinnamon-session
project('cinnamon-session',
[ 'c', ],
- version: '4.4.1',
+ version: '4.6.2',
meson_version: '>=0.37.0',
)
