Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at 2013-05-16 10:52:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-session (Old) and /work/SRC/openSUSE:Factory/.gnome-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-session" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-session/gnome-session.changes 2013-04-26 15:47:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-session.new/gnome-session.changes 2013-05-16 10:52:11.000000000 +0200 @@ -1,0 +2,14 @@ +Wed May 15 14:10:24 UTC 2013 - [email protected] + +- Update to version 3.8.2.1: + + Always distribute session-selector.ui (bgo#700363). + +------------------------------------------------------------------- +Tue May 14 07:13:20 UTC 2013 - [email protected] + +- Update to version 3.8.2: + + Make GsmAutostartApp work with new GLib (bgo#698798). +- Disable translation-update-upstream: it fails and has no newer + translations anyway. + +------------------------------------------------------------------- Old: ---- gnome-session-3.8.1.tar.xz New: ---- gnome-session-3.8.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.07evqu/_old 2013-05-16 10:52:12.000000000 +0200 +++ /var/tmp/diff_new_pack.07evqu/_new 2013-05-16 10:52:12.000000000 +0200 @@ -19,7 +19,7 @@ %define with_systemd 1 Name: gnome-session -Version: 3.8.1 +Version: 3.8.2.1 Release: 0 Summary: Session Tools for the GNOME Desktop License: GPL-2.0+ @@ -110,7 +110,8 @@ %lang_package %prep %setup -q -translation-update-upstream +# Disabled, as it fails +#translation-update-upstream %patch0 -p1 %patch1 -p1 ++++++ gnome-session-3.8.1.tar.xz -> gnome-session-3.8.2.1.tar.xz ++++++ ++++ 4065 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/ChangeLog new/gnome-session-3.8.2.1/ChangeLog --- old/gnome-session-3.8.1/ChangeLog 2013-04-15 21:09:28.000000000 +0200 +++ new/gnome-session-3.8.2.1/ChangeLog 2013-05-15 13:00:10.000000000 +0200 @@ -1,6 +1,52 @@ # Generated by Makefile. Do not edit. -commit db50cd56c1f47a2fe73207feb62bf57e874ac7d0 +commit 529ae89ef623c7b9f71f7ff00003126aca8fd7cb +Author: Matthias Clasen <[email protected]> +Date: Wed May 15 06:48:31 2013 -0400 + + 3.8.2.1 + +M NEWS +M configure.ac + +commit ca4d940fe2df04d3bd2eaf5dc09f1c45da0b1ad8 +Author: Matthias Clasen <[email protected]> +Date: Wed May 15 06:47:46 2013 -0400 + + Some forgotten files + + It is too easy to forget --enable-session-selector when making + a release, so always distribute the files that are only relevant + for the session selector. + https://bugzilla.gnome.org/show_bug.cgi?id=700363 + +M data/Makefile.am + +commit 841bd927c8eb7c1038b874c9812571c38ffdb5cd +Author: Matthias Clasen <[email protected]> +Date: Mon May 13 23:10:43 2013 -0400 + + 3.8.2 + +M NEWS +M configure.ac + +commit 6e14faf9138dbbffd1e63e177e53d88963c379e5 +Author: Colin Walters <[email protected]> +Date: Wed Apr 24 16:40:25 2013 -0400 + + GsmAutostartApp: Don't return NULL from constructor, use GInitable + + Recent GObject changes break this; it was never a supported operation. + GInitable is the way to return errors to callers. + + https://bugzilla.gnome.org/show_bug.cgi?id=698798 + +M gnome-session/gsm-autostart-app.c +M gnome-session/gsm-autostart-app.h +M gnome-session/gsm-manager.c + +commit 43b9c06de0bb8ad81851d42378c514a7e94db9d4 Author: Matthias Clasen <[email protected]> Date: Mon Apr 15 13:49:10 2013 -0400 @@ -9,6 +55,19 @@ M NEWS M configure.ac +commit 610e76491ac6308929203b412b7aa35960d93b25 +Author: Matthias Clasen <[email protected]> +Date: Mon Apr 15 15:11:50 2013 -0400 + + Fix distcheck + +M data/icons/16x16/Makefile.am +M data/icons/22x22/Makefile.am +M data/icons/24x24/Makefile.am +M data/icons/32x32/Makefile.am +M data/icons/48x48/Makefile.am +M data/icons/scalable/Makefile.am + commit 972751ac1ed274889662ed5894bb26fa0ef60829 Author: Trần Ngọc Quân <[email protected]> Date: Sat Apr 13 17:51:28 2013 +1000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/NEWS new/gnome-session-3.8.2.1/NEWS --- old/gnome-session-3.8.1/NEWS 2013-04-15 19:48:55.000000000 +0200 +++ new/gnome-session-3.8.2.1/NEWS 2013-05-15 12:58:54.000000000 +0200 @@ -1,3 +1,15 @@ +=============== +Version 3.8.2.1 +=============== + + * Always distribute session-selector.ui (#700363) + +============== +Version 3.8.2 +============== + + * Make GsmAutostartApp work with new GLib (#698798) + ============== Version 3.8.1 ============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/configure.ac new/gnome-session-3.8.2.1/configure.ac --- old/gnome-session-3.8.1/configure.ac 2013-04-15 19:49:03.000000000 +0200 +++ new/gnome-session-3.8.2.1/configure.ac 2013-05-15 12:58:54.000000000 +0200 @@ -1,5 +1,5 @@ AC_INIT([gnome-session], - [3.8.1], + [3.8.2.1], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-session]) AC_CONFIG_SRCDIR([gnome-session]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/data/Makefile.am new/gnome-session-3.8.2.1/data/Makefile.am --- old/gnome-session-3.8.1/data/Makefile.am 2013-03-14 02:41:03.000000000 +0100 +++ new/gnome-session-3.8.2.1/data/Makefile.am 2013-05-15 12:58:46.000000000 +0200 @@ -50,6 +50,8 @@ $(xsession_in_files) \ $(session_in_in_files) \ $(gsettings_SCHEMAS:.xml=.xml.in) \ + session-selector.ui \ + gnome-custom-session.desktop.in \ $(ui_DATA) \ $(hwcompat_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/doc/man/gnome-session-inhibit.1 new/gnome-session-3.8.2.1/doc/man/gnome-session-inhibit.1 --- old/gnome-session-3.8.1/doc/man/gnome-session-inhibit.1 2013-04-15 21:09:06.000000000 +0200 +++ new/gnome-session-3.8.2.1/doc/man/gnome-session-inhibit.1 2013-05-15 13:00:04.000000000 +0200 @@ -2,7 +2,7 @@ .\" Title: gnome-session-inhibit .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 04/15/2013 +.\" Date: 05/15/2013 .\" Manual: User Commands .\" Source: gnome-session .\" Language: English diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/doc/man/gnome-session-selector.1 new/gnome-session-3.8.2.1/doc/man/gnome-session-selector.1 --- old/gnome-session-3.8.1/doc/man/gnome-session-selector.1 2013-04-15 21:09:06.000000000 +0200 +++ new/gnome-session-3.8.2.1/doc/man/gnome-session-selector.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -'\" t -.\" Title: gnome-session-selector -.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] -.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 04/15/2013 -.\" Manual: User Commands -.\" Source: gnome-session -.\" Language: English -.\" -.TH "GNOME\-SESSION\-SELE" "1" "" "gnome-session" "User Commands" -.\" ----------------------------------------------------------------- -.\" * Define some portability stuff -.\" ----------------------------------------------------------------- -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.\" http://bugs.debian.org/507673 -.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html -.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.ie \n(.g .ds Aq \(aq -.el .ds Aq ' -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -gnome-session-selector \- Selects a session to use with gnome\-session -.SH "SYNOPSIS" -.HP \w'\fBgnome\-session\-selector\fR\ 'u -\fBgnome\-session\-selector\fR [session] -.SH "DESCRIPTION" -.PP -\fBgnome\-session\-selector\fR -can be used from a xsession desktop file to select a session before gnome\-session is run\&. gnome\-session reads and stores its session in the -\fB$XDG_DATA_HOME\fR/gnome\-session/saved\-session -directory\&. -\fBgnome\-session\-selector\fR -works by replacing the saved\-session directory by a symlink to another directory\&. Since the session name is used as the directory name, it may not contain \*(Aq/\*(Aq characters or begin with a \*(Aq\&.\*(Aq\&. -.PP -When a session name is specified, -\fBgnome\-session\-selector\fR -will create a symlink to select this session\&. -.PP -When started without arguments, -\fBgnome\-session\-selector\fR -will present a dialog that allows to choose one of the existing sessions or create a new one\&. -.SH "SEE ALSO" -.PP -\fBgnome-session\fR(1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/gnome-session/gsm-autostart-app.c new/gnome-session-3.8.2.1/gnome-session/gsm-autostart-app.c --- old/gnome-session-3.8.1/gnome-session/gsm-autostart-app.c 2013-03-14 02:41:03.000000000 +0100 +++ new/gnome-session-3.8.2.1/gnome-session/gsm-autostart-app.c 2013-05-14 05:09:23.000000000 +0200 @@ -97,7 +97,10 @@ #define GSM_AUTOSTART_APP_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSM_TYPE_AUTOSTART_APP, GsmAutostartAppPrivate)) -G_DEFINE_TYPE (GsmAutostartApp, gsm_autostart_app, GSM_TYPE_APP) +static void gsm_autostart_app_initable_iface_init (GInitableIface *iface); + +G_DEFINE_TYPE_WITH_CODE (GsmAutostartApp, gsm_autostart_app, GSM_TYPE_APP, + G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, gsm_autostart_app_initable_iface_init)) static void gsm_autostart_app_init (GsmAutostartApp *app) @@ -591,8 +594,8 @@ } } -static gboolean -load_desktop_file (GsmAutostartApp *app) +static void +load_desktop_file (GsmAutostartApp *app) { char *dbus_name; char *startup_id; @@ -600,9 +603,7 @@ int phase; gboolean res; - if (app->priv->app_info == NULL) { - return FALSE; - } + g_assert (app->priv->app_info != NULL); phase_str = g_desktop_app_info_get_string (app->priv->app_info, GSM_AUTOSTART_APP_PHASE_KEY); @@ -671,8 +672,6 @@ g_free (startup_id); g_free (dbus_name); - - return TRUE; } static void @@ -681,20 +680,16 @@ { if (app->priv->app_info != NULL) { g_clear_object (&app->priv->app_info); - g_free (app->priv->desktop_id); + g_clear_pointer (&app->priv->desktop_filename, g_free); + g_clear_pointer (&app->priv->desktop_id, g_free); } if (desktop_filename == NULL) { return; } + app->priv->desktop_filename = g_strdup (desktop_filename); app->priv->desktop_id = g_path_get_basename (desktop_filename); - - app->priv->app_info = g_desktop_app_info_new_from_filename (desktop_filename); - if (app->priv->app_info == NULL) { - g_warning ("Could not parse desktop file %s or it references a not found TryExec binary", desktop_filename); - return; - } } static void @@ -758,6 +753,7 @@ g_clear_pointer (&priv->condition_string, g_free); g_clear_object (&priv->condition_settings); g_clear_object (&priv->app_info); + g_clear_pointer (&priv->desktop_filename, g_free); g_clear_pointer (&priv->desktop_id, g_free); if (priv->child_watch_id > 0) { @@ -1365,23 +1361,30 @@ } } -static GObject * -gsm_autostart_app_constructor (GType type, - guint n_construct_properties, - GObjectConstructParam *construct_properties) +static gboolean +gsm_autostart_app_initable_init (GInitable *initable, + GCancellable *cancellable, + GError **error) { - GsmAutostartApp *app; - - app = GSM_AUTOSTART_APP (G_OBJECT_CLASS (gsm_autostart_app_parent_class)->constructor (type, - n_construct_properties, - construct_properties)); + GsmAutostartApp *app = GSM_AUTOSTART_APP (initable); - if (! load_desktop_file (app)) { - g_object_unref (app); - app = NULL; + g_assert (app->priv->desktop_filename != NULL); + app->priv->app_info = g_desktop_app_info_new_from_filename (app->priv->desktop_filename); + if (app->priv->app_info == NULL) { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + "Could not parse desktop file %s or it references a not found TryExec binary", app->priv->desktop_id); + return FALSE; } - return G_OBJECT (app); + load_desktop_file (app); + + return TRUE; +} + +static void +gsm_autostart_app_initable_iface_init (GInitableIface *iface) +{ + iface->init = gsm_autostart_app_initable_init; } static void @@ -1393,7 +1396,6 @@ object_class->set_property = gsm_autostart_app_set_property; object_class->get_property = gsm_autostart_app_get_property; object_class->dispose = gsm_autostart_app_dispose; - object_class->constructor = gsm_autostart_app_constructor; app_class->impl_is_disabled = is_disabled; app_class->impl_is_conditionally_disabled = is_conditionally_disabled; @@ -1428,13 +1430,10 @@ } GsmApp * -gsm_autostart_app_new (const char *desktop_file) +gsm_autostart_app_new (const char *desktop_file, + GError **error) { - GsmAutostartApp *app; - - app = g_object_new (GSM_TYPE_AUTOSTART_APP, - "desktop-filename", desktop_file, - NULL); - - return GSM_APP (app); + return (GsmApp*) g_initable_new (GSM_TYPE_AUTOSTART_APP, NULL, error, + "desktop-filename", desktop_file, + NULL); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/gnome-session/gsm-autostart-app.h new/gnome-session-3.8.2.1/gnome-session/gsm-autostart-app.h --- old/gnome-session-3.8.1/gnome-session/gsm-autostart-app.h 2011-08-16 15:38:17.000000000 +0200 +++ new/gnome-session-3.8.2.1/gnome-session/gsm-autostart-app.h 2013-05-14 05:09:23.000000000 +0200 @@ -57,7 +57,8 @@ GType gsm_autostart_app_get_type (void) G_GNUC_CONST; -GsmApp *gsm_autostart_app_new (const char *desktop_file); +GsmApp *gsm_autostart_app_new (const char *desktop_file, + GError **error); void gsm_autostart_app_add_provides (GsmAutostartApp *aapp, const char *provides); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-session-3.8.1/gnome-session/gsm-manager.c new/gnome-session-3.8.2.1/gnome-session/gsm-manager.c --- old/gnome-session-3.8.1/gnome-session/gsm-manager.c 2013-03-14 02:41:03.000000000 +0100 +++ new/gnome-session-3.8.2.1/gnome-session/gsm-manager.c 2013-05-14 05:09:23.000000000 +0200 @@ -4003,6 +4003,7 @@ { GsmApp *app; char **internal_provides; + GError *error = NULL; g_return_val_if_fail (GSM_IS_MANAGER (manager), FALSE); g_return_val_if_fail (path != NULL, FALSE); @@ -4033,9 +4034,10 @@ } } - app = gsm_autostart_app_new (path); + app = gsm_autostart_app_new (path, &error); if (app == NULL) { - g_warning ("could not read %s", path); + g_warning ("%s", error->message); + g_clear_error (&error); return FALSE; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
