Hello community, here is the log from the commit of package cinnamon-session for openSUSE:Factory checked in at 2018-07-14 20:25:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old) and /work/SRC/openSUSE:Factory/.cinnamon-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session" Sat Jul 14 20:25:00 2018 rev:15 rq:622473 version:3.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes 2018-04-26 13:37:05.230156485 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-session.new/cinnamon-session.changes 2018-07-14 20:25:10.940180196 +0200 @@ -1,0 +2,8 @@ +Thu Jul 5 13:05:25 UTC 2018 - [email protected] + +- Update to version 3.8.2: + * build: Fix PKGDATADIR define / use only one define. + * Autostart: Do not let a buggy GSettings condition break the + session. + +------------------------------------------------------------------- Old: ---- cinnamon-session-3.8.1.tar.gz New: ---- cinnamon-session-3.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-session.spec ++++++ --- /var/tmp/diff_new_pack.2vRMTI/_old 2018-07-14 20:25:11.608181912 +0200 +++ /var/tmp/diff_new_pack.2vRMTI/_new 2018-07-14 20:25:11.608181912 +0200 @@ -17,7 +17,7 @@ Name: cinnamon-session -Version: 3.8.1 +Version: 3.8.2 Release: 0 Summary: The session manager for the Cinnamon Desktop License: GPL-2.0-or-later AND LGPL-2.1-or-later ++++++ cinnamon-session-3.8.1.tar.gz -> cinnamon-session-3.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.8.1/cinnamon-session/csm-autostart-app.c new/cinnamon-session-3.8.2/cinnamon-session/csm-autostart-app.c --- old/cinnamon-session-3.8.1/cinnamon-session/csm-autostart-app.c 2018-04-19 13:06:26.000000000 +0200 +++ new/cinnamon-session-3.8.2/cinnamon-session/csm-autostart-app.c 2018-07-04 22:34:06.000000000 +0200 @@ -344,6 +344,30 @@ } static gboolean +contained (const gchar * const *items, + const gchar *item) +{ + while (*items) + if (strcmp (*items++, item) == 0) + return TRUE; + return FALSE; +} + +static gboolean +check_gsettings_schema_has_key (GSettingsSchema *schema, + const gchar *key) +{ + gboolean good; + gchar **keys; + + keys = g_settings_schema_list_keys (schema); + good = contained ((const gchar **) keys, key); + g_strfreev (keys); + + return good; +} + +static gboolean setup_gsettings_condition_monitor (CsmAutostartApp *app, const char *key) { @@ -371,6 +395,13 @@ if (schema == NULL) goto out; + if (!check_gsettings_schema_has_key(schema, elems[1])) { + g_warning ("Gsettings key %s %s could not be found!", + elems[0], + elems[1]); + goto out; + } + settings = g_settings_new_full (schema, NULL, NULL); retval = g_settings_get_boolean (settings, elems[1]); g_settings_schema_unref (schema); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.8.1/cinnamon-session/csm-inhibit-dialog.c new/cinnamon-session-3.8.2/cinnamon-session/csm-inhibit-dialog.c --- old/cinnamon-session-3.8.1/cinnamon-session/csm-inhibit-dialog.c 2018-04-19 13:06:26.000000000 +0200 +++ new/cinnamon-session-3.8.2/cinnamon-session/csm-inhibit-dialog.c 2018-07-04 22:34:06.000000000 +0200 @@ -1075,7 +1075,7 @@ error = NULL; if (!gtk_builder_add_from_file (dialog->priv->xml, - GTKBUILDER_DIR "/" GTKBUILDER_FILE, + PKGDATADIR "/" GTKBUILDER_FILE, &error)) { if (error) { g_warning ("Could not load inhibitor UI file: %s", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.8.1/debian/changelog new/cinnamon-session-3.8.2/debian/changelog --- old/cinnamon-session-3.8.1/debian/changelog 2018-04-19 13:06:26.000000000 +0200 +++ new/cinnamon-session-3.8.2/debian/changelog 2018-07-04 22:34:06.000000000 +0200 @@ -1,3 +1,13 @@ +cinnamon-session (3.8.2) tara; urgency=medium + + [ itzexor ] + * build: fix PKGDATADIR define / use only one define + + [ Clement Lefebvre ] + * Autostart: Don't let buggy GSettings condition break the session + + -- Clement Lefebvre <[email protected]> Wed, 04 Jul 2018 22:33:18 +0200 + cinnamon-session (3.8.1) tara; urgency=medium [ Fabio Fantoni ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.8.1/meson.build new/cinnamon-session-3.8.2/meson.build --- old/cinnamon-session-3.8.1/meson.build 2018-04-19 13:06:26.000000000 +0200 +++ new/cinnamon-session-3.8.2/meson.build 2018-07-04 22:34:06.000000000 +0200 @@ -1,7 +1,7 @@ # https://github.com/linuxmint/cinnamon-session project('cinnamon-session', [ 'c', ], - version: '3.8.1', + version: '3.8.2', meson_version: '>=0.37.0', ) @@ -143,11 +143,7 @@ rootInclude = include_directories('.') -pkgdatadir = join_paths(get_option('datadir'), meson.project_name()) - -conf.set_quoted('GTKBUILDER_DIR', pkgdatadir) -conf.set_quoted('DATA_DIR', pkgdatadir) -conf.set_quoted('PKGDATADIR', pkgdatadir) +conf.set_quoted('PKGDATADIR', join_paths(get_option('prefix'), get_option('datadir'), meson.project_name())) conf.set_quoted('LIBEXECDIR', get_option('libexecdir')) conf.set_quoted('LOCALE_DIR', join_paths(get_option('prefix'), get_option('localedir')))
