Hello community, here is the log from the commit of package cinnamon-session for openSUSE:Factory checked in at 2016-11-15 18:00:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old) and /work/SRC/openSUSE:Factory/.cinnamon-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session" Changes: -------- --- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes 2016-10-23 12:52:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cinnamon-session.new/cinnamon-session.changes 2016-11-15 18:00:04.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Nov 8 13:01:41 UTC 2016 - sor.ale...@meowr.ru + +- Update to version 3.2.0: + * Migrate away from gnome-common deprecated vars and macros. + * Remove an old dialog icon code. + * gsettings: Stop using g_settings_list_schemas(). + * Use a qt5ct platform theme on Qt 5.7+, qgnomeplatform on 5.6 + and earlier. + * Use a build time option instead of pkgcheck. + * Incorporate feedback. + * Replace the deprecated gtk_icon_info_free() with g_object_unref(). + * main: Fix a heap overflow in dbus-launch wrapping. + * Add cinnamon-session.pot and makepot. +- Rename and rebase cinnamon-session-qt-5.7-styleoverride.patch to + cinnamon-session-fix-qt-themes.patch. + +------------------------------------------------------------------- Old: ---- cinnamon-session-3.0.1.tar.gz cinnamon-session-qt-5.7-styleoverride.patch New: ---- cinnamon-session-3.2.0.tar.gz cinnamon-session-fix-qt-themes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cinnamon-session.spec ++++++ --- /var/tmp/diff_new_pack.jv1qxH/_old 2016-11-15 18:00:06.000000000 +0100 +++ /var/tmp/diff_new_pack.jv1qxH/_new 2016-11-15 18:00:06.000000000 +0100 @@ -17,7 +17,7 @@ Name: cinnamon-session -Version: 3.0.1 +Version: 3.2.0 Release: 0 Summary: The session manager for the Cinnamon Desktop License: GPL-2.0+ and LGPL-2.1+ @@ -25,11 +25,14 @@ Url: https://github.com/linuxmint/cinnamon-session Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}-logind.gschema.override -# PATCH-FIX-OPENSUSE cinnamon-session-qt-5.7-styleoverride.patch boo#1002900 sor.ale...@meowr.ru -- On Qt 5.7+ use Gtk2 Platform Theme and don't set QT_STYLE_OVERRIDE to "gtk". -Patch0: cinnamon-session-qt-5.7-styleoverride.patch +# PATCH-FIX-OPENSUSE cinnamon-session-fix-qt-themes.patch boo#1002900 sor.ale...@meowr.ru -- Use Gtk2 Platform Theme on Qt 5.7+ and no gnome theme on 5.6. +Patch0: cinnamon-session-fix-qt-themes.patch +BuildRequires: autoconf +BuildRequires: autoconf-archive +BuildRequires: automake BuildRequires: docutils -BuildRequires: gnome-common BuildRequires: hicolor-icon-theme +BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: tcpd-devel @@ -39,7 +42,7 @@ BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libcanberra) BuildRequires: pkgconfig(libsystemd) @@ -69,7 +72,7 @@ %patch0 -p1 %build -NOCONFIGURE=1 gnome-autogen.sh +NOCONFIGURE=1 ./autogen.sh %configure \ %if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) --enable-qt57-theme-support ++++++ cinnamon-session-3.0.1.tar.gz -> cinnamon-session-3.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/.gitignore new/cinnamon-session-3.2.0/.gitignore --- old/cinnamon-session-3.0.1/.gitignore 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/.gitignore 2016-11-07 11:41:48.000000000 +0100 @@ -38,3 +38,7 @@ *.old *.bak +## IDE files ## +.idea +CMakeLists.txt + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/autogen.sh new/cinnamon-session-3.2.0/autogen.sh --- old/cinnamon-session-3.0.1/autogen.sh 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/autogen.sh 2016-11-07 11:41:48.000000000 +0100 @@ -1,22 +1,38 @@ -#!/bin/bash +#!/bin/sh # Run this to generate all the initial makefiles, etc. +test -n "$srcdir" || srcdir=$(dirname "$0") +test -n "$srcdir" || srcdir=. -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. +olddir=$(pwd) -PKG_NAME="cinnamon-session" -REQUIRED_AUTOMAKE_VERSION=1.10 +cd $srcdir -(test -f $srcdir/configure.ac \ - && test -d $srcdir/cinnamon-session) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level cinnamon-session directory" +(test -f configure.ac) || { + echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***" exit 1 } -which gnome-autogen.sh || { - echo "You need to install gnome-common from GNOME Subversion (or from" - echo "your distribution's package manager)." - exit 1 -} -USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh +# shellcheck disable=SC2016 +PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac) + +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then + echo "*** WARNING: I am going to run 'configure' with no arguments." >&2 + echo "*** If you wish to pass any to it, please specify them on the" >&2 + echo "*** '$0' command line." >&2 + echo "" >&2 +fi + +aclocal --install || exit 1 +intltoolize --force --copy --automake || exit 1 +autoreconf --verbose --force --install || exit 1 + +cd "$olddir" +if [ "$NOCONFIGURE" = "" ]; then + $srcdir/configure "$@" || exit 1 + + if [ "$1" = "--help" ]; then exit 0 else + echo "Now type 'make' to compile $PKG_NAME" || exit 1 + fi +else + echo "Skipping configure process." +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/cinnamon-session/csm-autostart-app.c new/cinnamon-session-3.2.0/cinnamon-session/csm-autostart-app.c --- old/cinnamon-session-3.0.1/cinnamon-session/csm-autostart-app.c 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/cinnamon-session/csm-autostart-app.c 2016-11-07 11:41:48.000000000 +0100 @@ -347,38 +347,33 @@ setup_gsettings_condition_monitor (CsmAutostartApp *app, const char *key) { + GSettingsSchemaSource *source; + GSettingsSchema *schema; GSettings *settings; - const char * const *schemas; char **elems; - gboolean schema_exists; - guint i; - gboolean retval; + gboolean retval = FALSE; char *signal; + retval = FALSE; + elems = g_strsplit (key, " ", 2); + if (elems == NULL) - return FALSE; - if (elems[0] == NULL || elems[1] == NULL) { - g_strfreev (elems); - return FALSE; - } - - schemas = g_settings_list_schemas (); - schema_exists = FALSE; - for (i = 0; schemas[i] != NULL; i++) { - if (g_str_equal (schemas[i], elems[0])) { - schema_exists = TRUE; - break; - } - } - - if (schema_exists == FALSE) { - g_strfreev (elems); - return FALSE; - } + goto out; + + if (elems[0] == NULL || elems[1] == NULL) + goto out; + + source = g_settings_schema_source_get_default (); + + schema = g_settings_schema_source_lookup (source, elems[0], TRUE); + + if (schema == NULL) + goto out; - settings = g_settings_new (elems[0]); + settings = g_settings_new_full (schema, NULL, NULL); retval = g_settings_get_boolean (settings, elems[1]); + g_settings_schema_unref (schema); signal = g_strdup_printf ("changed::%s", elems[1]); g_signal_connect (G_OBJECT (settings), signal, @@ -387,6 +382,7 @@ app->priv->condition_settings = settings; +out: g_strfreev (elems); return retval; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/cinnamon-session/csm-fail-whale-dialog.c new/cinnamon-session-3.2.0/cinnamon-session/csm-fail-whale-dialog.c --- old/cinnamon-session-3.0.1/cinnamon-session/csm-fail-whale-dialog.c 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/cinnamon-session/csm-fail-whale-dialog.c 2016-11-07 11:41:48.000000000 +0100 @@ -131,7 +131,6 @@ csm_fail_whale_dialog_finalize (GObject *object) { CsmFailWhaleDialog *fail_dialog = CSM_FAIL_WHALE_DIALOG (object); - CsmFailWhaleDialogPrivate *priv = fail_dialog->priv; G_OBJECT_CLASS (csm_fail_whale_dialog_parent_class)->finalize (object); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/cinnamon-session/csm-inhibit-dialog.c new/cinnamon-session-3.2.0/cinnamon-session/csm-inhibit-dialog.c --- old/cinnamon-session-3.0.1/cinnamon-session/csm-inhibit-dialog.c 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/cinnamon-session/csm-inhibit-dialog.c 2016-11-07 11:41:48.000000000 +0100 @@ -225,7 +225,7 @@ if (info) { retval = g_strdup (gtk_icon_info_get_filename (info)); - gtk_icon_info_free (info); + g_object_unref (info); } else retval = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/cinnamon-session/csm-logout-dialog.c new/cinnamon-session-3.2.0/cinnamon-session/csm-logout-dialog.c --- old/cinnamon-session-3.0.1/cinnamon-session/csm-logout-dialog.c 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/cinnamon-session/csm-logout-dialog.c 2016-11-07 11:41:48.000000000 +0100 @@ -356,7 +356,6 @@ guint32 activate_time) { CsmLogoutDialog *logout_dialog; - GtkWidget *dialog_image; GtkWidget *hbox; const char *primary_text; const char *icon_name; @@ -456,9 +455,7 @@ default: g_assert_not_reached (); } - - dialog_image = gtk_message_dialog_get_image (GTK_MESSAGE_DIALOG (logout_dialog)); - + if (logout_dialog->priv->delay_toggle) { hbox = gtk_box_new (FALSE, 0); @@ -471,8 +468,6 @@ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (logout_dialog))), hbox); } - gtk_image_set_from_icon_name (GTK_IMAGE (dialog_image), - icon_name, GTK_ICON_SIZE_DIALOG); gtk_window_set_icon_name (GTK_WINDOW (logout_dialog), icon_name); gtk_window_set_position (GTK_WINDOW (logout_dialog), GTK_WIN_POS_CENTER); gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (logout_dialog), primary_text); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/cinnamon-session/main.c new/cinnamon-session-3.2.0/cinnamon-session/main.c --- old/cinnamon-session-3.0.1/cinnamon-session/main.c 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/cinnamon-session/main.c 2016-11-07 11:41:48.000000000 +0100 @@ -253,7 +253,7 @@ TRUE); /* +2 for our new arguments, +1 for NULL */ - new_argv = g_malloc (argc + 3 * sizeof (*argv)); + new_argv = g_malloc ((argc + 3) * sizeof (*argv)); new_argv[0] = "dbus-launch"; new_argv[1] = "--exit-with-session"; @@ -296,6 +296,7 @@ { "whale", 0, 0, G_OPTION_ARG_NONE, &please_fail, N_("Show the fail whale dialog for testing"), NULL }, { NULL, 0, 0, 0, NULL, NULL, NULL } }; + char *qt_platform_theme_new = NULL; /* Make sure that we have a session bus */ if (!require_dbus_session (argc, argv, &error)) { @@ -383,8 +384,23 @@ */ csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated"); - /* Make QT5 apps follow the GTK style */ - csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk"); + + /* Make QT5 apps follow the GTK style. Starting with QT 5.7, a different + * env var has to be set than what worked in previous versions. + */ + qt_platform_theme_new = HAVE_QT57 ? "qt5ct" : "qgnomeplatform"; + + if (NULL == g_getenv ("QT_QPA_PLATFORMTHEME")) { + csm_util_setenv ("QT_QPA_PLATFORMTHEME", qt_platform_theme_new); + } + + if ( ! HAVE_QT57 && NULL == g_getenv ("QT_STYLE_OVERRIDE") ) { + csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk"); + + } else if (HAVE_QT57 && NULL != g_getenv ("QT_STYLE_OVERRIDE")) { + g_unsetenv ("QT_STYLE_OVERRIDE"); + } + /* GTK Overlay scrollbars */ settings = g_settings_new ("org.cinnamon.desktop.interface"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/cinnamon-session/org.gnome.SessionManager.ClientPrivate.xml new/cinnamon-session-3.2.0/cinnamon-session/org.gnome.SessionManager.ClientPrivate.xml --- old/cinnamon-session-3.0.1/cinnamon-session/org.gnome.SessionManager.ClientPrivate.xml 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/cinnamon-session/org.gnome.SessionManager.ClientPrivate.xml 2016-11-07 11:41:48.000000000 +0100 @@ -5,7 +5,7 @@ <method name="EndSessionResponse"> <arg name="is_ok" type="b" direction="in"> <doc:doc> - <doc:summary>Whether or not it is OK to preceed</doc:summary> + <doc:summary>Whether or not it is OK to proceed</doc:summary> </doc:doc> </arg> <arg name="reason" type="s" direction="in"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/cinnamon-session.pot new/cinnamon-session-3.2.0/cinnamon-session.pot --- old/cinnamon-session-3.0.1/cinnamon-session.pot 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-session-3.2.0/cinnamon-session.pot 2016-11-07 11:41:48.000000000 +0100 @@ -0,0 +1,346 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-11-05 17:19+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <l...@li.org>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" + +#: cinnamon-session/csm-fail-whale-dialog.c:303 +msgid "Oh no! Something has gone wrong." +msgstr "" + +#: cinnamon-session/csm-fail-whale-dialog.c:310 +msgid "" +"A problem has occurred and the system can't recover. Please contact a system " +"administrator" +msgstr "" + +#: cinnamon-session/csm-fail-whale-dialog.c:312 +msgid "" +"A problem has occurred and the system can't recover.\n" +"Please log out and try again." +msgstr "" + +#: cinnamon-session/csm-fail-whale-dialog.c:327 +#: cinnamon-session/csm-logout-dialog.c:401 cinnamon-session/csm-util.c:429 +msgid "_Log Out" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:253 +#, c-format +msgid "Icon '%s' not found" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:588 +msgid "Unknown" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:639 +msgid "A program is still running:" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:640 data/csm-inhibit-dialog.glade.h:2 +msgid "" +"Waiting for the program to finish. Interrupting the program may cause you " +"to lose work." +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:643 data/csm-inhibit-dialog.glade.h:1 +msgid "Some programs are still running:" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:644 +msgid "" +"Waiting for programs to finish. Interrupting these programs may cause you " +"to lose work." +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:874 +msgid "Switch User Anyway" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:877 +msgid "Log Out Anyway" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:880 +msgid "Suspend Anyway" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:883 +msgid "Hibernate Anyway" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:886 +msgid "Shut Down Anyway" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:889 +msgid "Restart Anyway" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:897 +msgid "Lock Screen" +msgstr "" + +#: cinnamon-session/csm-inhibit-dialog.c:900 +msgid "Cancel" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:257 +#, c-format +msgid "You will be automatically logged out in %d second." +msgid_plural "You will be logged out in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: cinnamon-session/csm-logout-dialog.c:265 +#, c-format +msgid "This system will be automatically shut down in %d second." +msgid_plural "This system will be shut down in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: cinnamon-session/csm-logout-dialog.c:273 +#, c-format +msgid "This system will be automatically restarted in %d second." +msgid_plural "This system will be restarted in %d seconds." +msgstr[0] "" +msgstr[1] "" + +#: cinnamon-session/csm-logout-dialog.c:297 +#, c-format +msgid "You are currently logged in as \"%s\"." +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:371 +msgid "Session" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:386 +msgid "Log out of this system now?" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:392 +msgid "_Switch User" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:407 +msgid "Shut down this system now?" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:413 +msgid "S_uspend" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:419 +msgid "_Hibernate" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:425 +#: cinnamon-session/csm-logout-dialog.c:451 +msgid "_Restart" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:435 +msgid "_Shut Down" +msgstr "" + +#: cinnamon-session/csm-logout-dialog.c:441 +msgid "Restart this system now?" +msgstr "" + +#: cinnamon-session/csm-manager.c:1444 +msgid "GNOME 3 Failed to Load" +msgstr "" + +#: cinnamon-session/csm-manager.c:1445 +msgid "" +"Unfortunately GNOME 3 failed to start properly and started in the " +"<i>fallback mode</i>.\n" +"\n" +"This most likely means your system (graphics hardware or driver) is not " +"capable of delivering the full GNOME 3 experience." +msgstr "" + +#: cinnamon-session/csm-manager.c:1447 +msgid "Learn more about GNOME 3" +msgstr "" + +#: cinnamon-session/csm-manager.c:1538 cinnamon-session/csm-manager.c:2319 +msgid "Not responding" +msgstr "" + +#: cinnamon-session/csm-process-helper.c:123 +#, c-format +msgid "Exited with code %d" +msgstr "" + +#: cinnamon-session/csm-process-helper.c:128 +#, c-format +msgid "Killed by signal %d" +msgstr "" + +#: cinnamon-session/csm-process-helper.c:133 +#, c-format +msgid "Stopped by signal %d" +msgstr "" + +#: cinnamon-session/csm-util.c:413 +msgid "Unable to start login session (and unable to connect to the X server)" +msgstr "" + +#: cinnamon-session/csm-xsmp-client.c:559 +msgid "Remembered Application" +msgstr "" + +#: cinnamon-session/csm-xsmp-client.c:1198 +msgid "This program is blocking logout." +msgstr "" + +#: cinnamon-session/csm-xsmp-server.c:342 +msgid "" +"Refusing new client connection because the session is currently being shut " +"down\n" +msgstr "" + +#: cinnamon-session/csm-xsmp-server.c:611 +#, c-format +msgid "Could not create ICE listening socket: %s" +msgstr "" + +#: cinnamon-session/main.c:290 +msgid "Override standard autostart directories" +msgstr "" + +#: cinnamon-session/main.c:290 +msgid "AUTOSTART_DIR" +msgstr "" + +#: cinnamon-session/main.c:291 +msgid "Session to use" +msgstr "" + +#: cinnamon-session/main.c:291 +msgid "SESSION_NAME" +msgstr "" + +#: cinnamon-session/main.c:292 +msgid "Enable debugging code" +msgstr "" + +#: cinnamon-session/main.c:293 +msgid "Do not load user-specified applications" +msgstr "" + +#: cinnamon-session/main.c:294 +msgid "Version of this application" +msgstr "" + +#: cinnamon-session/main.c:296 +msgid "Show the fail whale dialog for testing" +msgstr "" + +#: cinnamon-session/main.c:325 +msgid " - the Cinnamon session manager" +msgstr "" + +#: tools/cinnamon-session-quit.c:53 +msgid "Log out" +msgstr "" + +#: tools/cinnamon-session-quit.c:54 +msgid "Power off" +msgstr "" + +#: tools/cinnamon-session-quit.c:55 +msgid "Reboot" +msgstr "" + +#: tools/cinnamon-session-quit.c:56 +msgid "Ignoring any existing inhibitors" +msgstr "" + +#: tools/cinnamon-session-quit.c:57 +msgid "Don't prompt for user confirmation" +msgstr "" + +#: tools/cinnamon-session-quit.c:91 tools/cinnamon-session-quit.c:101 +msgid "Could not connect to the session manager" +msgstr "" + +#: tools/cinnamon-session-quit.c:203 +msgid "Program called with conflicting options" +msgstr "" + +#: egg/eggdesktopfile.c:165 +msgid "File is not a valid .desktop file" +msgstr "" + +#: egg/eggdesktopfile.c:191 +#, c-format +msgid "Unrecognized desktop file Version '%s'" +msgstr "" + +#: egg/eggdesktopfile.c:973 +#, c-format +msgid "Starting %s" +msgstr "" + +#: egg/eggdesktopfile.c:1114 +msgid "Application does not accept documents on command line" +msgstr "" + +#: egg/eggdesktopfile.c:1182 +#, c-format +msgid "Unrecognized launch option: %d" +msgstr "" + +#: egg/eggdesktopfile.c:1383 +msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgstr "" + +#: egg/eggdesktopfile.c:1404 +msgid "Not a launchable item" +msgstr "" + +#: egg/eggsmclient.c:226 +msgid "Disable connection to session manager" +msgstr "" + +#: egg/eggsmclient.c:229 +msgid "Specify file containing saved configuration" +msgstr "" + +#: egg/eggsmclient.c:229 +msgid "FILE" +msgstr "" + +#: egg/eggsmclient.c:232 +msgid "Specify session management ID" +msgstr "" + +#: egg/eggsmclient.c:232 +msgid "ID" +msgstr "" + +#: egg/eggsmclient.c:253 +msgid "Session management options:" +msgstr "" + +#: egg/eggsmclient.c:254 +msgid "Show session management options" +msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/configure.ac new/cinnamon-session-3.2.0/configure.ac --- old/cinnamon-session-3.0.1/configure.ac 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/configure.ac 2016-11-07 11:41:48.000000000 +0100 @@ -1,11 +1,13 @@ AC_INIT([cinnamon-session], - [3.0.1], + [3.2.0], [https://github.com/linuxmint/cinnamon-session/issues]) AC_CONFIG_SRCDIR([cinnamon-session]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) +m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])]) + AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) @@ -20,8 +22,8 @@ LT_PREREQ([2.2.6]) LT_INIT([dlopen disable-static]) -GNOME_MAINTAINER_MODE_DEFINES -GNOME_COMPILE_WARNINGS([maximum]) +m4_ifdef([AX_COMPILER_FLAGS], + [AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])]) AC_ARG_ENABLE(deprecation_flags, [AS_HELP_STRING([--enable-deprecation-flags], @@ -108,6 +110,20 @@ AC_SUBST(LOGIND_LIBS) dnl ==================================================================== +dnl Check for qt 5.7+ to set correct env var for theme/styling +dnl ==================================================================== +AC_ARG_ENABLE(qt57_theme_support, + AS_HELP_STRING([--enable-qt57-theme-support], [Support GTK styles for QT apps with QT 5.7+]), + [enable_qt57_theme_support=yes], + [enable_qt57_theme_support=no]) + +if test x$enable_qt57_theme_support = xyes; then + AC_DEFINE([HAVE_QT57], [1], [Have QT 5.7+]) +else + AC_DEFINE([HAVE_QT57], [0], [Have QT 5.7+]) +fi + +dnl ==================================================================== dnl X development libraries check dnl ==================================================================== @@ -141,7 +157,7 @@ AC_CHECK_LIB(Xau, XauFileName, [X_LIBS="$X_LIBS -lXau"], [AC_MSG_ERROR([ *** Can't find the Xauth library. It is needed to compile cinnamon-session.])], - $X_LIBS) + $X_LIBS) AC_SUBST(X_LIBS) @@ -194,21 +210,21 @@ AC_PATH_PROG(XMLTO, xmlto, no) AC_MSG_CHECKING([whether to build DocBook documentation]) if test x$XMLTO = xno ; then - have_docbook=no + have_docbook=no else - have_docbook=yes + have_docbook=yes fi if test x$enable_docbook_docs = xauto ; then - if test x$have_docbook = xno ; then - enable_docbook_docs=no - else - enable_docbook_docs=yes - fi + if test x$have_docbook = xno ; then + enable_docbook_docs=no + else + enable_docbook_docs=yes + fi fi if test x$enable_docbook_docs = xyes; then - if test x$have_docbook = xno; then - AC_MSG_ERROR([Building DocBook docs explicitly required, but DocBook not found]) - fi + if test x$have_docbook = xno; then + AC_MSG_ERROR([Building DocBook docs explicitly required, but DocBook not found]) + fi fi AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, test x$enable_docbook_docs = xyes) AC_MSG_RESULT($enable_docbook_docs) @@ -349,12 +365,13 @@ GConf support: ${enable_gconf} Logind support: ${have_logind} + Qt 5.7+ theme support: ${enable_qt57_theme_support} IPv6 support: ${have_full_ipv6} Backtrace support: ${have_backtrace} XRender support: ${have_xrender} XSync support: ${have_xsync} XTest support: ${have_xtest} - Legacy UPower backend: ${have_old_upower} + Legacy UPower backend: ${have_old_upower} Build documentation: ${enable_docbook_docs} " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/debian/changelog new/cinnamon-session-3.2.0/debian/changelog --- old/cinnamon-session-3.0.1/debian/changelog 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/debian/changelog 2016-11-07 11:41:48.000000000 +0100 @@ -1,3 +1,38 @@ +cinnamon-session (3.2.0) serena; urgency=medium + + [ Edgar Fournival ] + * removed old dialog icon code + + [ leigh123linux ] + * gsettings: stop using g_settings_list_schemas() + * Fix spelling (wrong word used) + + [ Dustin Falgout ] + * update .gitignore + * Add support for applying GTK style to QT apps when running QT 5.7+ Maintain backwards compatibility for earlier versions of QT. + * use build time option instead of pkgcheck for obvious reasons :sweat_smile: + * remove unecessary call to g_free + * Incorporated feedback + + [ brownsr ] + * remove unused variable + * replace deprecated gtk_icon_info_free with g_object_unref + + [ Dustin Falgout ] + * implement change described in PR comments related to "QT_STYLE_OVERRIDE" env var and qt versions 5.7+ + + [ leigh123linux ] + * main: fix heap overflow in dbus-launch wrapping + + [ Maximiliano Curia ] + * Migrate away from gnome-common deprecated vars and macros + + [ Clement Lefebvre ] + * Added cinnamon-session.pot and makepot + * Update POT file + + -- Clement Lefebvre <r...@linuxmint.com> Mon, 07 Nov 2016 10:39:17 +0000 + cinnamon-session (3.0.1) sarah; urgency=medium [ leigh123linux ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/debian/control new/cinnamon-session-3.2.0/debian/control --- old/cinnamon-session-3.0.1/debian/control 2016-05-20 13:03:13.000000000 +0200 +++ new/cinnamon-session-3.2.0/debian/control 2016-11-07 11:41:48.000000000 +0100 @@ -2,9 +2,9 @@ Section: x11 Priority: optional Maintainer: Linux Mint <r...@linuxmint.com> -Build-Depends: debhelper (>= 9), +Build-Depends: autoconf-archive, + debhelper (>= 9), dh-autoreconf, - gnome-common, gnome-pkg-tools (>= 0.13), intltool (>= 0.40.6), libcanberra-dev, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-3.0.1/makepot new/cinnamon-session-3.2.0/makepot --- old/cinnamon-session-3.0.1/makepot 1970-01-01 01:00:00.000000000 +0100 +++ new/cinnamon-session-3.2.0/makepot 2016-11-07 11:41:48.000000000 +0100 @@ -0,0 +1,7 @@ +#!/bin/bash + +intltool-extract --type=gettext/glade data/*.glade + +xgettext --language=C --keyword=_ --keyword=N_ --output=cinnamon-session.pot cinnamon-session/*.c tools/*.c egg/*.c data/*.glade.h + +rm -f data/*.glade.h ++++++ cinnamon-session-fix-qt-themes.patch ++++++ --- a/cinnamon-session/main.c +++ b/cinnamon-session/main.c @@ -388,10 +388,8 @@ main (int argc, char **argv) /* Make QT5 apps follow the GTK style. Starting with QT 5.7, a different * env var has to be set than what worked in previous versions. */ - qt_platform_theme_new = HAVE_QT57 ? "qt5ct" : "qgnomeplatform"; - - if (NULL == g_getenv ("QT_QPA_PLATFORMTHEME")) { - csm_util_setenv ("QT_QPA_PLATFORMTHEME", qt_platform_theme_new); + if (HAVE_QT57 && NULL == g_getenv ("QT_QPA_PLATFORMTHEME")) { + csm_util_setenv ("QT_QPA_PLATFORMTHEME", "gtk2"); } if ( ! HAVE_QT57 && NULL == g_getenv ("QT_STYLE_OVERRIDE") ) {
