Hello community, here is the log from the commit of package cinnamon-session for openSUSE:Factory checked in at 2017-05-27 13:14:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old) and /work/SRC/openSUSE:Factory/.cinnamon-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session" Sat May 27 13:14:51 2017 rev:8 rq:493350 version:3.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes 2016-11-15 18:00:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cinnamon-session.new/cinnamon-session.changes 2017-05-27 13:14:51.757214464 +0200 @@ -1,0 +2,9 @@ +Sun May 7 11:23:03 UTC 2017 - [email protected] + +- Update to version 3.4.0: + * Check stricter for presence of xtrans (with option to disable). + * Remove aclocal from autogen.sh. + * Fix redundant redeclarations. + * manager: Don't wait for all clients to exit before exiting. + +------------------------------------------------------------------- Old: ---- cinnamon-session-3.2.0.tar.gz New: ---- cinnamon-session-3.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-session.spec ++++++ --- /var/tmp/diff_new_pack.BG6oKD/_old 2017-05-27 13:14:52.273141523 +0200 +++ /var/tmp/diff_new_pack.BG6oKD/_new 2017-05-27 13:14:52.277140958 +0200 @@ -1,7 +1,7 @@ # # spec file for package cinnamon-session # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # 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: 3.2.0 +Version: 3.4.0 Release: 0 Summary: The session manager for the Cinnamon Desktop License: GPL-2.0+ and LGPL-2.1+ ++++++ cinnamon-session-3.2.0.tar.gz -> cinnamon-session-3.4.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/autogen.sh new/cinnamon-session-3.4.0/autogen.sh --- old/cinnamon-session-3.2.0/autogen.sh 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/autogen.sh 2017-05-04 14:38:10.000000000 +0200 @@ -22,7 +22,8 @@ echo "" >&2 fi -aclocal --install || exit 1 +mkdir -p m4 + intltoolize --force --copy --automake || exit 1 autoreconf --verbose --force --install || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/cinnamon-session/cs-idle-monitor.c new/cinnamon-session-3.4.0/cinnamon-session/cs-idle-monitor.c --- old/cinnamon-session-3.2.0/cinnamon-session/cs-idle-monitor.c 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/cinnamon-session/cs-idle-monitor.c 2017-05-04 14:38:10.000000000 +0200 @@ -39,8 +39,6 @@ #include "cs-idle-monitor.h" -static void cs_idle_monitor_class_init (CSIdleMonitorClass *klass); -static void cs_idle_monitor_init (CSIdleMonitor *idle_monitor); static void cs_idle_monitor_finalize (GObject *object); #define CS_IDLE_MONITOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CS_TYPE_IDLE_MONITOR, CSIdleMonitorPrivate)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/cinnamon-session/csm-consolekit.c new/cinnamon-session-3.4.0/cinnamon-session/csm-consolekit.c --- old/cinnamon-session-3.2.0/cinnamon-session/csm-consolekit.c 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/cinnamon-session/csm-consolekit.c 2017-05-04 14:38:10.000000000 +0200 @@ -63,8 +63,6 @@ #endif }; -static void csm_consolekit_class_init (CsmConsolekitClass *klass); -static void csm_consolekit_init (CsmConsolekit *ck); static void csm_consolekit_finalize (GObject *object); static void csm_consolekit_free_dbus (CsmConsolekit *manager); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/cinnamon-session/csm-inhibit-dialog.c new/cinnamon-session-3.4.0/cinnamon-session/csm-inhibit-dialog.c --- old/cinnamon-session-3.2.0/cinnamon-session/csm-inhibit-dialog.c 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/cinnamon-session/csm-inhibit-dialog.c 2017-05-04 14:38:10.000000000 +0200 @@ -86,8 +86,6 @@ NUMBER_OF_COLUMNS }; -static void csm_inhibit_dialog_class_init (CsmInhibitDialogClass *klass); -static void csm_inhibit_dialog_init (CsmInhibitDialog *inhibit_dialog); static void csm_inhibit_dialog_finalize (GObject *object); G_DEFINE_TYPE (CsmInhibitDialog, csm_inhibit_dialog, GTK_TYPE_DIALOG) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/cinnamon-session/csm-manager.c new/cinnamon-session-3.4.0/cinnamon-session/csm-manager.c --- old/cinnamon-session-3.2.0/cinnamon-session/csm-manager.c 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/cinnamon-session/csm-manager.c 2017-05-04 14:38:10.000000000 +0200 @@ -79,11 +79,6 @@ */ #define CSM_MANAGER_PHASE_TIMEOUT 30 /* seconds */ -/* In the exit phase, all apps were already given the chance to inhibit the session end - * At that stage we don't want to wait much for apps to respond, we want to exit, and fast. - */ -#define CSM_MANAGER_EXIT_PHASE_TIMEOUT 1 /* seconds */ - #define MDM_FLEXISERVER_COMMAND "mdmflexiserver" #define MDM_FLEXISERVER_ARGS "--startnew Standard" @@ -192,8 +187,6 @@ static guint signals [LAST_SIGNAL] = { 0 }; -static void csm_manager_class_init (CsmManagerClass *klass); -static void csm_manager_init (CsmManager *manager); static void csm_manager_finalize (GObject *object); static void maybe_save_session (CsmManager *manager); @@ -677,15 +670,6 @@ } static gboolean -_client_failed_to_stop (const char *id, - CsmClient *client, - gpointer user_data) -{ - g_debug ("CsmManager: client failed to stop: %s, %s", csm_client_peek_id (client), csm_client_peek_app_id (client)); - return FALSE; -} - -static gboolean on_phase_timeout (CsmManager *manager) { GSList *a; @@ -715,9 +699,6 @@ case CSM_MANAGER_PHASE_END_SESSION: break; case CSM_MANAGER_PHASE_EXIT: - csm_store_foreach (manager->priv->clients, - (CsmStoreFunc)_client_failed_to_stop, - NULL); break; default: g_assert_not_reached (); @@ -960,16 +941,11 @@ do_phase_exit (CsmManager *manager) { if (csm_store_size (manager->priv->clients) > 0) { - manager->priv->phase_timeout_id = g_timeout_add_seconds (CSM_MANAGER_EXIT_PHASE_TIMEOUT, - (GSourceFunc)on_phase_timeout, - manager); - csm_store_foreach (manager->priv->clients, (CsmStoreFunc)_client_stop, NULL); - } else { - end_phase (manager); } + end_phase (manager); } static gboolean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/cinnamon-session/csm-store.c new/cinnamon-session-3.4.0/cinnamon-session/csm-store.c --- old/cinnamon-session-3.2.0/cinnamon-session/csm-store.c 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/cinnamon-session/csm-store.c 2017-05-04 14:38:10.000000000 +0200 @@ -53,8 +53,6 @@ static guint signals [LAST_SIGNAL] = { 0 }; -static void csm_store_class_init (CsmStoreClass *klass); -static void csm_store_init (CsmStore *store); static void csm_store_finalize (GObject *object); G_DEFINE_TYPE (CsmStore, csm_store, G_TYPE_OBJECT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/cinnamon-session/csm-xsmp-server.c new/cinnamon-session-3.4.0/cinnamon-session/csm-xsmp-server.c --- old/cinnamon-session-3.2.0/cinnamon-session/csm-xsmp-server.c 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/cinnamon-session/csm-xsmp-server.c 2017-05-04 14:38:10.000000000 +0200 @@ -40,14 +40,14 @@ #include <X11/ICE/ICEconn.h> #include <X11/SM/SMlib.h> -#ifdef HAVE_X11_XTRANS_XTRANS_H +#if HAVE_XTRANS /* Get the proto for _IceTransNoListen */ #define ICE_t #define TRANS_SERVER #include <X11/Xtrans/Xtrans.h> #undef ICE_t #undef TRANS_SERVER -#endif /* HAVE_X11_XTRANS_XTRANS_H */ +#endif /* HAVE_XTRANS */ #include "csm-xsmp-server.h" #include "csm-xsmp-client.h" @@ -80,8 +80,6 @@ PROP_CLIENT_STORE }; -static void csm_xsmp_server_class_init (CsmXsmpServerClass *klass); -static void csm_xsmp_server_init (CsmXsmpServer *xsmp_server); static void csm_xsmp_server_finalize (GObject *object); static gpointer xsmp_server_object = NULL; @@ -584,7 +582,7 @@ csm_util_init_error (TRUE, "Could not initialize libSM: %s", error); } -#ifdef HAVE_X11_XTRANS_XTRANS_H +#if HAVE_XTRANS /* By default, IceListenForConnections will open one socket for each * transport type known to X. We don't want connections from remote * hosts, so for security reasons it would be best if ICE didn't @@ -636,7 +634,7 @@ csm_util_init_error (TRUE, "IceListenForConnections did not return a local listener!"); } -#ifdef HAVE_X11_XTRANS_XTRANS_H +#ifdef HAVE_XTRANS if (server->priv->num_local_xsmp_sockets != server->priv->num_xsmp_sockets) { /* Xtrans was apparently compiled with support for some * non-local transport besides TCP (which we disabled above); we diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/cinnamon-session/mdm-signal-handler.c new/cinnamon-session-3.4.0/cinnamon-session/mdm-signal-handler.c --- old/cinnamon-session-3.2.0/cinnamon-session/mdm-signal-handler.c 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/cinnamon-session/mdm-signal-handler.c 2017-05-04 14:38:10.000000000 +0200 @@ -60,8 +60,6 @@ gpointer fatal_data; }; -static void mdm_signal_handler_class_init (MdmSignalHandlerClass *klass); -static void mdm_signal_handler_init (MdmSignalHandler *signal_handler); static void mdm_signal_handler_finalize (GObject *object); static gpointer signal_handler_object = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/configure.ac new/cinnamon-session-3.4.0/configure.ac --- old/cinnamon-session-3.2.0/configure.ac 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/configure.ac 2017-05-04 14:38:10.000000000 +0200 @@ -1,5 +1,5 @@ AC_INIT([cinnamon-session], - [3.2.0], + [3.4.0], [https://github.com/linuxmint/cinnamon-session/issues]) AC_CONFIG_SRCDIR([cinnamon-session]) @@ -266,12 +266,18 @@ AC_SUBST(EXECINFO_LIBS) dnl ==================================================================== -dnl Check for newish X interface +dnl Check for X transport interface - allows to disable ICE Transports +dnl See also https://bugzilla.gnome.org/show_bug.cgi?id=725100 dnl ==================================================================== -oCFLAGS="$CFLAGS" -CFLAGS="$CFLAGS $X_CFLAGS" -AC_CHECK_HEADERS(X11/Xtrans/Xtrans.h) -CFLAGS="$oCFLAGS" +AC_ARG_WITH([xtrans], + [AS_HELP_STRING([--without-xtrans], + [Build without xtrans support (results in ICE listening on remote TCP ports)])], + [], + [with_xtrans=yes]) +AS_IF([test "$with_xtrans" != "no"], + [PKG_CHECK_MODULES(XTRANS, xtrans, + [AC_DEFINE(HAVE_XTRANS, 1, [Have the X Transport library])])]) +AC_SUBST(HAVE_XTRANS) dnl ==================================================================== dnl Code for checking whether IPv6 is enabled on the system.... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.2.0/debian/changelog new/cinnamon-session-3.4.0/debian/changelog --- old/cinnamon-session-3.2.0/debian/changelog 2016-11-07 11:41:48.000000000 +0100 +++ new/cinnamon-session-3.4.0/debian/changelog 2017-05-04 14:38:10.000000000 +0200 @@ -1,3 +1,15 @@ +cinnamon-session (3.4.0) sonya; urgency=medium + + [ leigh123linux ] + * Check stricter for presence of xtrans (with option to disable) + * remove aclocal from autogen + * Fix redundant redeclarations + + [ Clement Lefebvre ] + * manager: don't wait for all clients to exit before exiting + + -- Clement Lefebvre <[email protected]> Thu, 04 May 2017 13:37:33 +0100 + cinnamon-session (3.2.0) serena; urgency=medium [ Edgar Fournival ]
