Hello community,
here is the log from the commit of package cinnamon-session for
openSUSE:Leap:15.2 checked in at 2020-05-13 03:49:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/cinnamon-session (Old)
and /work/SRC/openSUSE:Leap:15.2/.cinnamon-session.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session"
Wed May 13 03:49:42 2020 rev:11 rq:786366 version:4.4.1
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/cinnamon-session/cinnamon-session.changes
2020-02-21 23:52:58.108997716 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.cinnamon-session.new.2738/cinnamon-session.changes
2020-05-13 03:49:43.763934861 +0200
@@ -1,0 +2,16 @@
+Mon Mar 16 15:05:31 UTC 2020 - Marguerite Su <[email protected]>
+
+- update version 4.4.1
+ * main.c: Add a setting to run the session with
+ GDK_SYNCHRONIZE=1, which allows XErrors to be
+ backtraced
+ * csm-presence.c: Don't start cinnamon-screensaver
+ during construction
+ * Clean-up remaining dbus-glib references after removal
+ in #125
+ * csm-systemd.c: Restore old check for logind
+- change in 4.4.0
+ * csm-system: Check for logind and fall back to consolekit,
+ instead of using a gsettings key to determine which to use.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-session-4.2.1.tar.gz
New:
----
cinnamon-session-4.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-session.spec ++++++
--- /var/tmp/diff_new_pack.9KuoYJ/_old 2020-05-13 03:49:44.075935516 +0200
+++ /var/tmp/diff_new_pack.9KuoYJ/_new 2020-05-13 03:49:44.075935516 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cinnamon-session
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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.2.1
+Version: 4.4.1
Release: 0
Summary: The session manager for the Cinnamon Desktop
License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -35,6 +35,7 @@
BuildRequires: xtrans
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(json-glib-1.0)
++++++ cinnamon-session-4.2.1.tar.gz -> cinnamon-session-4.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.2.1/cinnamon-session/csm-presence.c
new/cinnamon-session-4.4.1/cinnamon-session/csm-presence.c
--- old/cinnamon-session-4.2.1/cinnamon-session/csm-presence.c 2019-07-04
10:21:23.000000000 +0200
+++ new/cinnamon-session-4.4.1/cinnamon-session/csm-presence.c 2020-02-14
09:54:40.000000000 +0100
@@ -351,7 +351,7 @@
}
presence->priv->screensaver_proxy = g_dbus_proxy_new_sync
(presence->priv->connection,
-
G_DBUS_PROXY_FLAGS_NONE,
+
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
NULL,
CS_NAME,
CS_PATH,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/cinnamon-session/csm-system.c
new/cinnamon-session-4.4.1/cinnamon-session/csm-system.c
--- old/cinnamon-session-4.2.1/cinnamon-session/csm-system.c 2019-07-04
10:21:23.000000000 +0200
+++ new/cinnamon-session-4.4.1/cinnamon-session/csm-system.c 2020-02-14
09:54:40.000000000 +0100
@@ -170,22 +170,20 @@
static CsmSystem *system = NULL;
if (system == NULL) {
- GSettings *session_settings = g_settings_new
("org.cinnamon.desktop.session");
- if (g_settings_get_boolean (session_settings,
"session-manager-uses-logind")) {
- // Use logind
- system = CSM_SYSTEM (csm_systemd_new ());
- if (system != NULL) {
+ // Use logind
+ system = CSM_SYSTEM (csm_systemd_new ());
+
+ if (system != NULL) {
g_debug ("Using systemd for session tracking");
- }
}
else {
- // Use consolekit
- system = CSM_SYSTEM (csm_consolekit_new ());
- if (system != NULL) {
- g_debug ("Using ConsoleKit for session tracking");
- }
+ // Use consolekit
+ system = CSM_SYSTEM (csm_consolekit_new ());
+
+ if (system != NULL) {
+ g_debug ("Using ConsoleKit for session
tracking");
+ }
}
- g_object_unref (session_settings);
}
return g_object_ref (system);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.2.1/cinnamon-session/csm-systemd.c
new/cinnamon-session-4.4.1/cinnamon-session/csm-systemd.c
--- old/cinnamon-session-4.2.1/cinnamon-session/csm-systemd.c 2019-07-04
10:21:23.000000000 +0200
+++ new/cinnamon-session-4.4.1/cinnamon-session/csm-systemd.c 2020-02-14
09:54:40.000000000 +0100
@@ -739,7 +739,7 @@
CsmSystemd *manager;
/* logind is not running ? */
- if (access("/run/systemd/seats/", F_OK) < 0)
+ if (access("/run/systemd/seats/", F_OK) < 0) // sd_booted ()
return NULL;
manager = g_object_new (CSM_TYPE_SYSTEMD, NULL);
@@ -747,7 +747,7 @@
return manager;
}
-#else
+#else /* HAVE_LOGIND */
CsmSystemd *
csm_systemd_new (void)
@@ -755,4 +755,4 @@
return NULL;
}
-#endif
+#endif /* HAVE_LOGIND */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/cinnamon-session/csm-util.c
new/cinnamon-session-4.4.1/cinnamon-session/csm-util.c
--- old/cinnamon-session-4.2.1/cinnamon-session/csm-util.c 2019-07-04
10:21:23.000000000 +0200
+++ new/cinnamon-session-4.4.1/cinnamon-session/csm-util.c 2020-02-14
09:54:40.000000000 +0100
@@ -32,8 +32,6 @@
#include <glib/gstdio.h>
#include <gtk/gtk.h>
-#include <dbus/dbus-glib.h>
-
#include "csm-util.h"
static gchar *_saved_session_dir = NULL;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/cinnamon-session/main.c
new/cinnamon-session-4.4.1/cinnamon-session/main.c
--- old/cinnamon-session-4.2.1/cinnamon-session/main.c 2019-07-04
10:21:23.000000000 +0200
+++ new/cinnamon-session-4.4.1/cinnamon-session/main.c 2020-02-14
09:54:40.000000000 +0100
@@ -215,6 +215,13 @@
{ NULL, 0, 0, 0, NULL, NULL, NULL }
};
+ GSettings *settings;
+ settings = g_settings_new ("org.cinnamon.SessionManager");
+
+ if (g_settings_get_boolean (settings, "x-sync")) {
+ csm_util_setenv ("GDK_SYNCHRONIZE", "1");
+ }
+
/* Make sure that we have a session bus */
if (!require_dbus_session (argc, argv, &error)) {
csm_util_init_error (TRUE, "%s", error->message);
@@ -224,9 +231,6 @@
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- GSettings *settings;
-
- settings = g_settings_new ("org.cinnamon.SessionManager");
if (g_settings_get_boolean (settings, "debug")) {
debug = TRUE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/data/meson.build
new/cinnamon-session-4.4.1/data/meson.build
--- old/cinnamon-session-4.2.1/data/meson.build 2019-07-04 10:21:23.000000000
+0200
+++ new/cinnamon-session-4.4.1/data/meson.build 2020-02-14 09:54:40.000000000
+0100
@@ -15,11 +15,7 @@
)
install_data(
- configure_file(
- input : 'org.cinnamon.SessionManager.gschema.xml.in',
- output: 'org.cinnamon.SessionManager.gschema.xml',
- configuration: configuration_data(),
- ),
+ 'org.cinnamon.SessionManager.gschema.xml',
install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.2.1/data/org.cinnamon.SessionManager.gschema.xml
new/cinnamon-session-4.4.1/data/org.cinnamon.SessionManager.gschema.xml
--- old/cinnamon-session-4.2.1/data/org.cinnamon.SessionManager.gschema.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/cinnamon-session-4.4.1/data/org.cinnamon.SessionManager.gschema.xml
2020-02-14 09:54:40.000000000 +0100
@@ -0,0 +1,52 @@
+<schemalist gettext-domain="cinnamon-session">
+ <schema id="org.cinnamon.SessionManager"
path="/org/cinnamon/cinnamon-session/">
+ <key name="debug" type="b">
+ <default>false</default>
+ <summary>Show debug info</summary>
+ <description>If enabled, cinnamon-session will output debug
information.</description>
+ </key>
+ <key name="x-sync" type="b">
+ <default>false</default>
+ <summary>Start the session with GDK_SYNCHRONIZE=1</summary>
+ <description>If enabled, cinnamon-session and all (gtk) children will
make all X requests synchronously, for debugging x errors.</description>
+ </key>
+ <key name="auto-save-session" type="b">
+ <default>false</default>
+ <summary>Save sessions</summary>
+ <description>If enabled, cinnamon-session will save the session
automatically.</description>
+ </key>
+ <key name="logout-prompt" type="b">
+ <default>true</default>
+ <summary>Logout prompt</summary>
+ <description>If enabled, cinnamon-session will prompt the user before
ending a session.</description>
+ </key>
+ <key name="show-fallback-warning" type="b">
+ <default>true</default>
+ <summary>Show the fallback warning</summary>
+ <description>If enabled, cinnamon-session will display a warning dialog
after login if the session was automatically fallen back.</description>
+ </key>
+ <key name="autostart-blacklist" type="as">
+ <default>['gnome-settings-daemon', 'org.gnome.SettingsDaemon',
'gnome-fallback-mount-helper', 'gnome-screensaver', 'mate-screensaver',
'mate-keyring-daemon', 'indicator-session', 'gnome-initial-setup-copy-worker',
'gnome-initial-setup-first-login', 'gnome-welcome-tour',
'xscreensaver-autostart', 'nautilus-autostart', 'caja',
'xfce4-power-manager']</default>
+ <summary>Applications to block from autostarting or appearing in the app
system</summary>
+ <description>
+ A list of applications or desktop names (without the .desktop
extension) to prevent from
+ being accessible during the session.
+ </description>
+ </key>
+ <key name="quit-delay-toggle" type="b">
+ <default>false</default>
+ <summary>Toggles if there should be a timer when ending the
session</summary>
+ <description>Toggles whether or not there's a timer to automatically end
the current session</description>
+ </key>
+ <key name="quit-time-delay" type="i">
+ <default>60</default>
+ <summary>The time delay before quitting the system
automatically</summary>
+ <description>The time delay before the shutdown/logout dialogue quits
the system automatically</description>
+ </key>
+ <key name="prefer-hybrid-sleep" type="b">
+ <default>false</default>
+ <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>
+ </schema>
+</schemalist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cinnamon-session-4.2.1/data/org.cinnamon.SessionManager.gschema.xml.in
new/cinnamon-session-4.4.1/data/org.cinnamon.SessionManager.gschema.xml.in
--- old/cinnamon-session-4.2.1/data/org.cinnamon.SessionManager.gschema.xml.in
2019-07-04 10:21:23.000000000 +0200
+++ new/cinnamon-session-4.4.1/data/org.cinnamon.SessionManager.gschema.xml.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,47 +0,0 @@
-<schemalist gettext-domain="cinnamon-session">
- <schema id="org.cinnamon.SessionManager"
path="/org/cinnamon/cinnamon-session/">
- <key name="debug" type="b">
- <default>false</default>
- <summary>Show debug info</summary>
- <description>If enabled, cinnamon-session will output debug
information.</description>
- </key>
- <key name="auto-save-session" type="b">
- <default>false</default>
- <summary>Save sessions</summary>
- <description>If enabled, cinnamon-session will save the session
automatically.</description>
- </key>
- <key name="logout-prompt" type="b">
- <default>true</default>
- <summary>Logout prompt</summary>
- <description>If enabled, cinnamon-session will prompt the user before
ending a session.</description>
- </key>
- <key name="show-fallback-warning" type="b">
- <default>true</default>
- <summary>Show the fallback warning</summary>
- <description>If enabled, cinnamon-session will display a warning dialog
after login if the session was automatically fallen back.</description>
- </key>
- <key name="autostart-blacklist" type="as">
- <default>['gnome-settings-daemon', 'org.gnome.SettingsDaemon',
'gnome-fallback-mount-helper', 'gnome-screensaver', 'mate-screensaver',
'mate-keyring-daemon', 'indicator-session', 'gnome-initial-setup-copy-worker',
'gnome-initial-setup-first-login', 'gnome-welcome-tour',
'xscreensaver-autostart', 'nautilus-autostart', 'caja',
'xfce4-power-manager']</default>
- <summary>Applications to block from autostarting or appearing in the app
system</summary>
- <description>
- A list of applications or desktop names (without the .desktop
extension) to prevent from
- being accessible during the session.
- </description>
- </key>
- <key name="quit-delay-toggle" type="b">
- <default>false</default>
- <summary>Toggles if there should be a timer when ending the
session</summary>
- <description>Toggles whether or not there's a timer to automatically end
the current session</description>
- </key>
- <key name="quit-time-delay" type="i">
- <default>60</default>
- <summary>The time delay before quitting the system
automatically</summary>
- <description>The time delay before the shutdown/logout dialogue quits
the system automatically</description>
- </key>
- <key name="prefer-hybrid-sleep" type="b">
- <default>false</default>
- <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>
- </schema>
-</schemalist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/debian/changelog
new/cinnamon-session-4.4.1/debian/changelog
--- old/cinnamon-session-4.2.1/debian/changelog 2019-07-04 10:21:23.000000000
+0200
+++ new/cinnamon-session-4.4.1/debian/changelog 2020-02-14 09:54:40.000000000
+0100
@@ -1,3 +1,33 @@
+cinnamon-session (4.4.1) tricia; urgency=medium
+
+ [ Eli Schwartz ]
+ * build: don't try to configure a data file that has nothing to configure
+
+ [ Michael Webster ]
+ * csm-systemd.c: Restore old check for logind.
+
+ [ Sparky Bluefang ]
+ * Clean-up remaining dbus-glib references after removal in #125
+
+ [ Michael Webster ]
+ * csm-presence.c: Don't start cinnamon-screensaver during construction.
+ * main.c: Add a setting to run the session with GDK_SYNCHRONIZE=1, which
allows XErrors to be backtraced.
+
+ [ Clement Lefebvre ]
+ * Package: Remove URL
+
+ -- Clement Lefebvre <[email protected]> Fri, 14 Feb 2020 08:53:57 +0000
+
+cinnamon-session (4.4.0) tricia; urgency=medium
+
+ [ Michael Webster ]
+ * csm-system: Check for logind and fall back to consolekit, instead of using
a gsettings key to determine which to use.
+
+ [ Soapux ]
+ * meson: Update style of build options (#129)
+
+ -- Clement Lefebvre <[email protected]> Sat, 16 Nov 2019 15:12:52 +0100
+
cinnamon-session (4.2.1) tina; urgency=medium
[ Michael Webster ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/debian/control
new/cinnamon-session-4.4.1/debian/control
--- old/cinnamon-session-4.2.1/debian/control 2019-07-04 10:21:23.000000000
+0200
+++ new/cinnamon-session-4.4.1/debian/control 2020-02-14 09:54:40.000000000
+0100
@@ -7,7 +7,6 @@
gnome-pkg-tools (>= 0.13),
intltool (>= 0.40.6),
libcanberra-dev,
- libdbus-glib-1-dev (>= 0.88),
libgl1-mesa-dev,
libglib2.0-dev (>= 2.37.3),
libgtk-3-dev (>= 3.0.0),
@@ -29,7 +28,6 @@
xsltproc,
xtrans-dev,
Standards-Version: 3.9.6
-Homepage: http://cinnamon.linuxmint.com
Package: cinnamon-session
Architecture: any
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/debian/rules
new/cinnamon-session-4.4.1/debian/rules
--- old/cinnamon-session-4.2.1/debian/rules 2019-07-04 10:21:23.000000000
+0200
+++ new/cinnamon-session-4.4.1/debian/rules 2020-02-14 09:54:40.000000000
+0100
@@ -10,11 +10,11 @@
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--buildtype=plain \
- -Dwith-docbook=true \
- -Dwith-frequent-warnings=true \
- -Dwith-gconf=false \
- -Dwith-ipv6=true \
- -Dwith-xtrans=true
+ -Ddocbook=true \
+ -Dfrequent_warnings=true \
+ -Dgconf=false \
+ -Dipv6=true \
+ -Dxtrans=true
override_dh_auto_build:
ninja -C debian/build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/meson.build
new/cinnamon-session-4.4.1/meson.build
--- old/cinnamon-session-4.2.1/meson.build 2019-07-04 10:21:23.000000000
+0200
+++ new/cinnamon-session-4.4.1/meson.build 2020-02-14 09:54:40.000000000
+0100
@@ -1,7 +1,7 @@
# https://github.com/linuxmint/cinnamon-session
project('cinnamon-session',
[ 'c', ],
- version: '4.2.1',
+ version: '4.4.1',
meson_version: '>=0.37.0',
)
@@ -12,7 +12,7 @@
conf = configuration_data()
project_cflags = []
-if not get_option('with-frequent-warnings')
+if not get_option('frequent_warnings')
warnflags = [
'-Wno-deprecated-declarations',
'-Wno-unused',
@@ -42,7 +42,7 @@
xcomposite = dependency('xcomposite')
gl = dependency('gl')
-if get_option('with-gconf')
+if get_option('gconf')
gconf = dependency('gconf-2.0')
else
gconf = dependency('', required: false)
@@ -78,7 +78,7 @@
xrender = dependency('xrender', required: false)
conf.set('HAVE_XRENDER', xrender.found())
-docbook_enabled = get_option('with-docbook')
+docbook_enabled = get_option('docbook')
if docbook_enabled
xmlto = find_program('xmlto')
endif
@@ -93,7 +93,7 @@
# Check for X transport interface - allows to disable ICE Transports
# See also https://bugzilla.gnome.org/show_bug.cgi?id=725100
-if get_option('with-xtrans')
+if get_option('xtrans')
xtrans = dependency('xtrans')
else
xtrans = dependency('', required: false)
@@ -103,7 +103,7 @@
# Check whether IPv6 is enabled on the system...
have_ipv6 = false
ipv6_libs = []
-if get_option('with-ipv6')
+if get_option('ipv6')
if cc.compiles('''
#include <sys/types.h>
#include <sys/socket.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cinnamon-session-4.2.1/meson_options.txt
new/cinnamon-session-4.4.1/meson_options.txt
--- old/cinnamon-session-4.2.1/meson_options.txt 2019-07-04
10:21:23.000000000 +0200
+++ new/cinnamon-session-4.4.1/meson_options.txt 2020-02-14
09:54:40.000000000 +0100
@@ -1,5 +1,5 @@
-option('with-frequent-warnings', type: 'boolean', value: false)
-option('with-docbook', type: 'boolean', value: true)
-option('with-gconf', type: 'boolean', value: true)
-option('with-ipv6', type: 'boolean', value: true)
-option('with-xtrans', type: 'boolean', value: true)
+option('frequent_warnings', type: 'boolean', value: false)
+option('docbook', type: 'boolean', value: true)
+option('gconf', type: 'boolean', value: true)
+option('ipv6', type: 'boolean', value: true)
+option('xtrans', type: 'boolean', value: true)
