Hello community,
here is the log from the commit of package mate-session-manager for
openSUSE:Factory checked in at 2016-04-06 11:52:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-session-manager (Old)
and /work/SRC/openSUSE:Factory/.mate-session-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-session-manager"
Changes:
--------
---
/work/SRC/openSUSE:Factory/mate-session-manager/mate-session-manager.changes
2016-01-12 16:13:45.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.mate-session-manager.new/mate-session-manager.changes
2016-04-06 11:52:55.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Apr 5 13:16:34 UTC 2016 - [email protected]
+
+- Update to version 1.12.2:
+ * Fix a rare build failure with UPower >= 0.99 when both systemd
+ and UPower supports are enabled.
+ * Some more fixes.
+
+-------------------------------------------------------------------
Old:
----
mate-session-manager-1.12.1.tar.xz
New:
----
mate-session-manager-1.12.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-session-manager.spec ++++++
--- /var/tmp/diff_new_pack.S4vc9R/_old 2016-04-06 11:52:56.000000000 +0200
+++ /var/tmp/diff_new_pack.S4vc9R/_new 2016-04-06 11:52:56.000000000 +0200
@@ -18,7 +18,7 @@
%define _version 1.12
Name: mate-session-manager
-Version: 1.12.1
+Version: 1.12.2
Release: 0
Summary: MATE Session Manager
License: GPL-2.0+
++++++ mate-session-manager-1.12.1.tar.xz -> mate-session-manager-1.12.2.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/Makefile.in
new/mate-session-manager-1.12.2/Makefile.in
--- old/mate-session-manager-1.12.1/Makefile.in 2015-11-30 09:06:15.000000000
+0100
+++ new/mate-session-manager-1.12.2/Makefile.in 2016-04-05 15:11:21.000000000
+0200
@@ -314,6 +314,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/NEWS
new/mate-session-manager-1.12.2/NEWS
--- old/mate-session-manager-1.12.1/NEWS 2015-11-30 09:05:01.000000000
+0100
+++ new/mate-session-manager-1.12.2/NEWS 2016-04-05 15:09:35.000000000
+0200
@@ -1,3 +1,8 @@
+1.12.2
+ * Fix rare build failure with upower >= 0.99 when both systemd and upower
+ support are enabled
+ * Some more fixes
+
1.12.1
* Get rid of dependency on libmate-desktop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/aclocal.m4
new/mate-session-manager-1.12.2/aclocal.m4
--- old/mate-session-manager-1.12.1/aclocal.m4 2015-11-30 09:06:13.000000000
+0100
+++ new/mate-session-manager-1.12.2/aclocal.m4 2016-04-05 15:11:18.000000000
+0200
@@ -596,7 +596,7 @@
DISABLE_DEPRECATED=""
if test $USE_MAINTAINER_MODE = yes; then
- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATECONF MATECOMPONENT
MATECOMPONENT_UI MATE LIBGLADE VTE MATE_VFS WNCK LIBSOUP"
+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATE LIBGLADE VTE WNCK
LIBSOUP"
for DOMAIN in $DOMAINS; do
DISABLE_DEPRECATED="$DISABLE_DEPRECATED
-D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
done
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/capplet/Makefile.in
new/mate-session-manager-1.12.2/capplet/Makefile.in
--- old/mate-session-manager-1.12.1/capplet/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/capplet/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -288,6 +288,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/config.h.in
new/mate-session-manager-1.12.2/config.h.in
--- old/mate-session-manager-1.12.1/config.h.in 2015-11-30 09:06:14.000000000
+0100
+++ new/mate-session-manager-1.12.2/config.h.in 2016-04-05 15:11:20.000000000
+0200
@@ -78,6 +78,9 @@
/* upower support */
#undef HAVE_UPOWER
+/* upower based support for hibernate and suspend (< 0.99) */
+#undef HAVE_UPOWER_HIBERNATE_SUSPEND
+
/* Define to 1 if you have the <X11/Xtrans/Xtrans.h> header file. */
#undef HAVE_X11_XTRANS_XTRANS_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/configure
new/mate-session-manager-1.12.2/configure
--- old/mate-session-manager-1.12.1/configure 2015-11-30 09:06:13.000000000
+0100
+++ new/mate-session-manager-1.12.2/configure 2016-04-05 15:11:19.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for mate-session-manager 1.12.1.
+# Generated by GNU Autoconf 2.69 for mate-session-manager 1.12.2.
#
# Report bugs to <http://www.mate-desktop.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='mate-session-manager'
PACKAGE_TARNAME='mate-session-manager'
-PACKAGE_VERSION='1.12.1'
-PACKAGE_STRING='mate-session-manager 1.12.1'
+PACKAGE_VERSION='1.12.2'
+PACKAGE_STRING='mate-session-manager 1.12.2'
PACKAGE_BUGREPORT='http://www.mate-desktop.org/'
PACKAGE_URL=''
@@ -666,6 +666,8 @@
HAVE_UPOWER
HAVE_UPOWER_FALSE
HAVE_UPOWER_TRUE
+UPOWER_HIBERNATE_LIBS
+UPOWER_HIBERNATE_CFLAGS
UPOWER_LIBS
UPOWER_CFLAGS
HAVE_SYSTEMD
@@ -914,6 +916,8 @@
SYSTEMD_LIBS
UPOWER_CFLAGS
UPOWER_LIBS
+UPOWER_HIBERNATE_CFLAGS
+UPOWER_HIBERNATE_LIBS
XTEST_CFLAGS
XTEST_LIBS
XRENDER_CFLAGS
@@ -1458,7 +1462,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures mate-session-manager 1.12.1 to adapt to many kinds of
systems.
+\`configure' configures mate-session-manager 1.12.2 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1529,7 +1533,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-session-manager 1.12.1:";;
+ short | recursive ) echo "Configuration of mate-session-manager 1.12.2:";;
esac
cat <<\_ACEOF
@@ -1621,6 +1625,10 @@
UPOWER_CFLAGS
C compiler flags for UPOWER, overriding pkg-config
UPOWER_LIBS linker flags for UPOWER, overriding pkg-config
+ UPOWER_HIBERNATE_CFLAGS
+ C compiler flags for UPOWER_HIBERNATE, overriding pkg-config
+ UPOWER_HIBERNATE_LIBS
+ linker flags for UPOWER_HIBERNATE, overriding pkg-config
XTEST_CFLAGS
C compiler flags for XTEST, overriding pkg-config
XTEST_LIBS linker flags for XTEST, overriding pkg-config
@@ -1695,7 +1703,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-session-manager configure 1.12.1
+mate-session-manager configure 1.12.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2064,7 +2072,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by mate-session-manager $as_me 1.12.1, which was
+It was created by mate-session-manager $as_me 1.12.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2931,7 +2939,7 @@
# Define the identity of the package.
PACKAGE='mate-session-manager'
- VERSION='1.12.1'
+ VERSION='1.12.2'
cat >>confdefs.h <<_ACEOF
@@ -13114,7 +13122,7 @@
DISABLE_DEPRECATED=""
if test $USE_MAINTAINER_MODE = yes; then
- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATECONF MATECOMPONENT
MATECOMPONENT_UI MATE LIBGLADE VTE MATE_VFS WNCK LIBSOUP"
+ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK MATE LIBGLADE VTE WNCK
LIBSOUP"
for DOMAIN in $DOMAINS; do
DISABLE_DEPRECATED="$DISABLE_DEPRECATED
-D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
done
@@ -14766,6 +14774,83 @@
fi
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UPOWER_HIBERNATE" >&5
+$as_echo_n "checking for UPOWER_HIBERNATE... " >&6; }
+
+if test -n "$UPOWER_HIBERNATE_CFLAGS"; then
+ pkg_cv_UPOWER_HIBERNATE_CFLAGS="$UPOWER_HIBERNATE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"upower-glib < 0.99\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "upower-glib < 0.99") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_UPOWER_HIBERNATE_CFLAGS=`$PKG_CONFIG --cflags "upower-glib < 0.99"
2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$UPOWER_HIBERNATE_LIBS"; then
+ pkg_cv_UPOWER_HIBERNATE_LIBS="$UPOWER_HIBERNATE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"upower-glib < 0.99\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "upower-glib < 0.99") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_UPOWER_HIBERNATE_LIBS=`$PKG_CONFIG --libs "upower-glib < 0.99"
2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ UPOWER_HIBERNATE_PKG_ERRORS=`$PKG_CONFIG --short-errors
--print-errors --cflags --libs "upower-glib < 0.99" 2>&1`
+ else
+ UPOWER_HIBERNATE_PKG_ERRORS=`$PKG_CONFIG --print-errors
--cflags --libs "upower-glib < 0.99" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$UPOWER_HIBERNATE_PKG_ERRORS" >&5
+
+ has_upower_hibernate_suspend=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ has_upower_hibernate_suspend=no
+else
+ UPOWER_HIBERNATE_CFLAGS=$pkg_cv_UPOWER_HIBERNATE_CFLAGS
+ UPOWER_HIBERNATE_LIBS=$pkg_cv_UPOWER_HIBERNATE_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ has_upower_hibernate_suspend=yes
+fi
+ if test "x$has_upower_hibernate_suspend" = "xyes"; then
+
+$as_echo "#define HAVE_UPOWER_HIBERNATE_SUSPEND 1" >>confdefs.h
+
+ fi
+
fi
if test "x$has_upower" = "xyes"; then
HAVE_UPOWER_TRUE=
@@ -16777,7 +16862,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mate-session-manager $as_me 1.12.1, which was
+This file was extended by mate-session-manager $as_me 1.12.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16843,7 +16928,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-mate-session-manager config.status 1.12.1
+mate-session-manager config.status 1.12.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/configure.ac
new/mate-session-manager-1.12.2/configure.ac
--- old/mate-session-manager-1.12.1/configure.ac 2015-11-30
09:04:45.000000000 +0100
+++ new/mate-session-manager-1.12.2/configure.ac 2016-04-05
15:10:05.000000000 +0200
@@ -1,4 +1,4 @@
-AC_INIT([mate-session-manager], [1.12.1], [http://www.mate-desktop.org/])
+AC_INIT([mate-session-manager], [1.12.2], [http://www.mate-desktop.org/])
AC_CONFIG_SRCDIR([mate-session])
AC_CONFIG_HEADERS([config.h])
@@ -144,13 +144,18 @@
enable_upower=$enableval,
enable_upower=no)
if test "x$enable_upower" = "xyes"; then
- PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED, has_upower=yes,
has_upower=no)
+ PKG_CHECK_MODULES([UPOWER], [upower-glib >= $UPOWER_REQUIRED],
has_upower=yes, has_upower=no)
if test "x$has_upower" = "xyes"; then
AC_DEFINE(HAVE_UPOWER, 1, [upower support])
AC_SUBST(UPOWER_CFLAGS)
AC_SUBST(UPOWER_LIBS)
fi
+ PKG_CHECK_MODULES([UPOWER_HIBERNATE], [upower-glib < 0.99],
has_upower_hibernate_suspend=yes, has_upower_hibernate_suspend=no)
+ if test "x$has_upower_hibernate_suspend" = "xyes"; then
+ AC_DEFINE(HAVE_UPOWER_HIBERNATE_SUSPEND, 1, [upower based support for
hibernate and suspend (< 0.99)])
+ fi
+
fi
AM_CONDITIONAL(HAVE_UPOWER, test "x$has_upower" = "xyes")
AC_SUBST(HAVE_UPOWER)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/data/Makefile.in
new/mate-session-manager-1.12.2/data/Makefile.in
--- old/mate-session-manager-1.12.1/data/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/data/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -330,6 +330,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/data/icons/16x16/Makefile.in
new/mate-session-manager-1.12.2/data/icons/16x16/Makefile.in
--- old/mate-session-manager-1.12.1/data/icons/16x16/Makefile.in
2015-11-30 09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/data/icons/16x16/Makefile.in
2016-04-05 15:11:21.000000000 +0200
@@ -260,6 +260,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/data/icons/22x22/Makefile.in
new/mate-session-manager-1.12.2/data/icons/22x22/Makefile.in
--- old/mate-session-manager-1.12.1/data/icons/22x22/Makefile.in
2015-11-30 09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/data/icons/22x22/Makefile.in
2016-04-05 15:11:21.000000000 +0200
@@ -260,6 +260,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/data/icons/24x24/Makefile.in
new/mate-session-manager-1.12.2/data/icons/24x24/Makefile.in
--- old/mate-session-manager-1.12.1/data/icons/24x24/Makefile.in
2015-11-30 09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/data/icons/24x24/Makefile.in
2016-04-05 15:11:21.000000000 +0200
@@ -260,6 +260,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/data/icons/32x32/Makefile.in
new/mate-session-manager-1.12.2/data/icons/32x32/Makefile.in
--- old/mate-session-manager-1.12.1/data/icons/32x32/Makefile.in
2015-11-30 09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/data/icons/32x32/Makefile.in
2016-04-05 15:11:21.000000000 +0200
@@ -260,6 +260,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/data/icons/48x48/Makefile.in
new/mate-session-manager-1.12.2/data/icons/48x48/Makefile.in
--- old/mate-session-manager-1.12.1/data/icons/48x48/Makefile.in
2015-11-30 09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/data/icons/48x48/Makefile.in
2016-04-05 15:11:21.000000000 +0200
@@ -260,6 +260,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/data/icons/Makefile.in
new/mate-session-manager-1.12.2/data/icons/Makefile.in
--- old/mate-session-manager-1.12.1/data/icons/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/data/icons/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -290,6 +290,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/data/icons/scalable/Makefile.in
new/mate-session-manager-1.12.2/data/icons/scalable/Makefile.in
--- old/mate-session-manager-1.12.1/data/icons/scalable/Makefile.in
2015-11-30 09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/data/icons/scalable/Makefile.in
2016-04-05 15:11:21.000000000 +0200
@@ -260,6 +260,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/doc/Makefile.in
new/mate-session-manager-1.12.2/doc/Makefile.in
--- old/mate-session-manager-1.12.1/doc/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/doc/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -290,6 +290,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/doc/dbus/Makefile.in
new/mate-session-manager-1.12.2/doc/dbus/Makefile.in
--- old/mate-session-manager-1.12.1/doc/dbus/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/doc/dbus/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -261,6 +261,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/doc/man/Makefile.in
new/mate-session-manager-1.12.2/doc/man/Makefile.in
--- old/mate-session-manager-1.12.1/doc/man/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/doc/man/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -261,6 +261,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/doc/man/mate-session-inhibit.1
new/mate-session-manager-1.12.2/doc/man/mate-session-inhibit.1
--- old/mate-session-manager-1.12.1/doc/man/mate-session-inhibit.1
2015-11-30 09:06:31.000000000 +0100
+++ new/mate-session-manager-1.12.2/doc/man/mate-session-inhibit.1
2016-04-05 15:11:37.000000000 +0200
@@ -2,7 +2,7 @@
.\" Title: mate-session-inhibit
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 11/30/2015
+.\" Date: 04/05/2016
.\" Manual: User Commands
.\" Source: mate-session
.\" Language: English
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/egg/Makefile.in
new/mate-session-manager-1.12.2/egg/Makefile.in
--- old/mate-session-manager-1.12.1/egg/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/egg/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -296,6 +296,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/mate-session/Makefile.in
new/mate-session-manager-1.12.2/mate-session/Makefile.in
--- old/mate-session-manager-1.12.1/mate-session/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/mate-session/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -321,6 +321,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/mate-session/gsm-logout-dialog.c
new/mate-session-manager-1.12.2/mate-session/gsm-logout-dialog.c
--- old/mate-session-manager-1.12.1/mate-session/gsm-logout-dialog.c
2015-09-25 12:13:56.000000000 +0200
+++ new/mate-session-manager-1.12.2/mate-session/gsm-logout-dialog.c
2015-12-14 10:22:37.000000000 +0100
@@ -215,10 +215,10 @@
if (LOGIND_RUNNING())
ret = gsm_systemd_can_suspend (logout_dialog->priv->systemd);
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
else
#endif
-#ifdef HAVE_UPOWER
+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND
ret = up_client_get_can_suspend (logout_dialog->priv->up_client);
#endif
return ret;
@@ -233,10 +233,10 @@
if (LOGIND_RUNNING())
ret = gsm_systemd_can_hibernate (logout_dialog->priv->systemd);
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
else
#endif
-#ifdef HAVE_UPOWER
+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND
ret = up_client_get_can_hibernate (logout_dialog->priv->up_client);
#endif
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.1/mate-session/gsm-manager.c
new/mate-session-manager-1.12.2/mate-session/gsm-manager.c
--- old/mate-session-manager-1.12.1/mate-session/gsm-manager.c 2015-10-19
10:42:16.000000000 +0200
+++ new/mate-session-manager-1.12.2/mate-session/gsm-manager.c 2015-12-14
10:22:37.000000000 +0100
@@ -1166,11 +1166,6 @@
static void
manager_attempt_hibernate (GsmManager *manager)
{
-#ifdef HAVE_UPOWER
- gboolean can_hibernate;
- GError *error;
- gboolean ret;
-#endif
#ifdef HAVE_SYSTEMD
if (LOGIND_RUNNING()) {
@@ -1184,18 +1179,17 @@
gsm_systemd_attempt_hibernate (systemd);
}
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
else {
#endif
-#ifdef HAVE_UPOWER
- can_hibernate = up_client_get_can_hibernate (manager->priv->up_client);
+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND
+ gboolean can_hibernate = up_client_get_can_hibernate
(manager->priv->up_client);
if (can_hibernate) {
-
/* lock the screen before we suspend */
manager_perhaps_lock (manager);
- error = NULL;
- ret = up_client_hibernate_sync (manager->priv->up_client,
NULL, &error);
+ GError *error = NULL;
+ gboolean ret = up_client_hibernate_sync
(manager->priv->up_client, NULL, &error);
if (!ret) {
g_warning ("Unexpected hibernate failure: %s",
error->message);
@@ -1203,7 +1197,7 @@
}
}
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
}
#endif
}
@@ -1211,11 +1205,6 @@
static void
manager_attempt_suspend (GsmManager *manager)
{
-#ifdef HAVE_UPOWER
- gboolean can_suspend;
- GError *error;
- gboolean ret;
-#endif
#ifdef HAVE_SYSTEMD
if (LOGIND_RUNNING()) {
@@ -1229,18 +1218,17 @@
gsm_systemd_attempt_suspend (systemd);
}
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
else {
#endif
-#ifdef HAVE_UPOWER
- can_suspend = up_client_get_can_suspend (manager->priv->up_client);
+#ifdef HAVE_UPOWER_HIBERNATE_SUSPEND
+ gboolean can_suspend = up_client_get_can_suspend
(manager->priv->up_client);
if (can_suspend) {
-
/* lock the screen before we suspend */
manager_perhaps_lock (manager);
- error = NULL;
- ret = up_client_suspend_sync (manager->priv->up_client, NULL,
&error);
+ GError *error = NULL;
+ gboolean ret = up_client_suspend_sync
(manager->priv->up_client, NULL, &error);
if (!ret) {
g_warning ("Unexpected suspend failure: %s",
error->message);
@@ -1248,7 +1236,7 @@
}
}
#endif
-#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER)
+#if defined(HAVE_SYSTEMD) && defined(HAVE_UPOWER_HIBERNATE_SUSPEND)
}
#endif
}
@@ -2137,7 +2125,7 @@
manager->priv->query_clients = g_slist_remove
(manager->priv->query_clients, client);
- if (! is_ok && !manager->priv->logout_mode !=
GSM_MANAGER_LOGOUT_MODE_FORCE) {
+ if (! is_ok && manager->priv->logout_mode !=
GSM_MANAGER_LOGOUT_MODE_FORCE) {
guint cookie;
GsmInhibitor *inhibitor;
char *app_id;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.1/tools/Makefile.in
new/mate-session-manager-1.12.2/tools/Makefile.in
--- old/mate-session-manager-1.12.1/tools/Makefile.in 2015-11-30
09:06:15.000000000 +0100
+++ new/mate-session-manager-1.12.2/tools/Makefile.in 2016-04-05
15:11:21.000000000 +0200
@@ -291,6 +291,8 @@
SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
SYSTEMD_LIBS = @SYSTEMD_LIBS@
UPOWER_CFLAGS = @UPOWER_CFLAGS@
+UPOWER_HIBERNATE_CFLAGS = @UPOWER_HIBERNATE_CFLAGS@
+UPOWER_HIBERNATE_LIBS = @UPOWER_HIBERNATE_LIBS@
UPOWER_LIBS = @UPOWER_LIBS@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
