Hello community,
here is the log from the commit of package mate-session-manager for
openSUSE:Factory checked in at 2015-12-01 09:19:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-11-11 10:30:56.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.mate-session-manager.new/mate-session-manager.changes
2015-12-01 09:20:13.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 30 10:20:18 UTC 2015 - [email protected]
+
+- Update to 1.12.1:
+ * Get rid of dependency on libmate-desktop.
+
+-------------------------------------------------------------------
Old:
----
mate-session-manager-1.12.0.tar.xz
New:
----
mate-session-manager-1.12.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-session-manager.spec ++++++
--- /var/tmp/diff_new_pack.821TCs/_old 2015-12-01 09:20:14.000000000 +0100
+++ /var/tmp/diff_new_pack.821TCs/_new 2015-12-01 09:20:14.000000000 +0100
@@ -18,7 +18,7 @@
%define _version 1.12
Name: mate-session-manager
-Version: 1.12.0
+Version: 1.12.1
Release: 0
Summary: MATE Session Manager
License: GPL-2.0+
@@ -37,7 +37,6 @@
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(ice)
-BuildRequires: pkgconfig(mate-desktop-2.0) >= %{_version}
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xext)
++++++ mate-session-manager-1.12.0.tar.xz -> mate-session-manager-1.12.1.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.0/Makefile.in
new/mate-session-manager-1.12.1/Makefile.in
--- old/mate-session-manager-1.12.0/Makefile.in 2015-11-03 19:19:31.000000000
+0100
+++ new/mate-session-manager-1.12.1/Makefile.in 2015-11-30 09:06:15.000000000
+0100
@@ -82,7 +82,7 @@
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in COPYING compile config.guess config.sub \
- install-sh missing ltmain.sh
+ depcomp install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.0/NEWS
new/mate-session-manager-1.12.1/NEWS
--- old/mate-session-manager-1.12.0/NEWS 2015-11-03 19:18:02.000000000
+0100
+++ new/mate-session-manager-1.12.1/NEWS 2015-11-30 09:05:01.000000000
+0100
@@ -1,3 +1,6 @@
+1.12.1
+ * Get rid of dependency on libmate-desktop
+
1.12.0
* Add support for an optional dock, such as Plank
* Retrieve strings directly from gschema (requires intltool 0.50.1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.0/aclocal.m4
new/mate-session-manager-1.12.1/aclocal.m4
--- old/mate-session-manager-1.12.0/aclocal.m4 2015-11-03 19:19:27.000000000
+0100
+++ new/mate-session-manager-1.12.1/aclocal.m4 2015-11-30 09:06:13.000000000
+0100
@@ -1095,10 +1095,9 @@
# configured tree to be moved without reconfiguration.
AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
])
# AM_CONDITIONAL -*- Autoconf -*-
@@ -1565,7 +1564,8 @@
END
AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
fi
-fi])
+fi
+])
dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.0/config.sub
new/mate-session-manager-1.12.1/config.sub
--- old/mate-session-manager-1.12.0/config.sub 2015-11-03 19:19:31.000000000
+0100
+++ new/mate-session-manager-1.12.1/config.sub 2015-11-30 09:06:14.000000000
+0100
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2014-07-28'
+timestamp='2014-09-11'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -302,6 +302,7 @@
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
| pyramid \
+ | riscv32 | riscv64 \
| rl78 | rx \
| score \
| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb |
shbe | shle | sh[1234]le | sh3ele \
@@ -1016,7 +1017,7 @@
;;
ppc64) basic_machine=powerpc64-unknown
;;
- ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed
's/^[^-]*-//'`
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed
's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.0/configure
new/mate-session-manager-1.12.1/configure
--- old/mate-session-manager-1.12.0/configure 2015-11-03 19:19:28.000000000
+0100
+++ new/mate-session-manager-1.12.1/configure 2015-11-30 09:06:13.000000000
+0100
@@ -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.0.
+# Generated by GNU Autoconf 2.69 for mate-session-manager 1.12.1.
#
# 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.0'
-PACKAGE_STRING='mate-session-manager 1.12.0'
+PACKAGE_VERSION='1.12.1'
+PACKAGE_STRING='mate-session-manager 1.12.1'
PACKAGE_BUGREPORT='http://www.mate-desktop.org/'
PACKAGE_URL=''
@@ -1458,7 +1458,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.0 to adapt to many kinds of
systems.
+\`configure' configures mate-session-manager 1.12.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1529,7 +1529,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-session-manager 1.12.0:";;
+ short | recursive ) echo "Configuration of mate-session-manager 1.12.1:";;
esac
cat <<\_ACEOF
@@ -1695,7 +1695,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-session-manager configure 1.12.0
+mate-session-manager configure 1.12.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2064,7 +2064,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.0, which was
+It was created by mate-session-manager $as_me 1.12.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2617,8 +2617,8 @@
ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
@@ -2931,7 +2931,7 @@
# Define the identity of the package.
PACKAGE='mate-session-manager'
- VERSION='1.12.0'
+ VERSION='1.12.1'
cat >>confdefs.h <<_ACEOF
@@ -3023,6 +3023,7 @@
as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
fi
fi
+
# Check whether --enable-silent-rules was given.
if test "${enable_silent_rules+set}" = set; then :
enableval=$enable_silent_rules;
@@ -6603,7 +6604,8 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -7004,10 +7006,6 @@
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -7046,11 +7044,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern
/lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -8143,12 +8141,19 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
- powerpc64le-*linux*)
+ powerpc64le-*)
LD="${LD-ld} -m elf32lppclinux"
;;
- powerpc64-*linux*)
+ powerpc64-*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -8167,10 +8172,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*linux*)
+ powerpcle-*)
LD="${LD-ld} -m elf64lppc"
;;
- powerpc-*linux*)
+ powerpc-*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -9728,7 +9733,7 @@
lt_prog_compiler_static='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -10206,6 +10211,9 @@
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@ -10427,7 +10435,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -10604,6 +10612,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ link_all_deplibs=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -11057,7 +11066,7 @@
link_all_deplibs=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
# a.out
else
@@ -11894,17 +11903,6 @@
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -12021,7 +12019,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -12070,14 +12068,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s
2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' <
/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/
/g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -12089,6 +12083,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -13257,14 +13263,13 @@
GIO_REQUIRED=2.25.0
DBUS_GLIB_REQUIRED=0.76
UPOWER_REQUIRED=0.9.0
-MATE_DESKTOP_REQUIRED=1.9.3
case "$with_gtk" in
2.0) GTK_API_VERSION=2.0
GTK_REQUIRED=2.24.0
;;
3.0) GTK_API_VERSION=3.0
- GTK_REQUIRED=2.90.0
+ GTK_REQUIRED=3.0.0
;;
esac
@@ -13402,13 +13407,11 @@
gio-2.0 >= \$GIO_REQUIRED
gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= \$MATE_DESKTOP_REQUIRED
\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -13417,7 +13420,6 @@
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
@@ -13434,13 +13436,11 @@
gio-2.0 >= \$GIO_REQUIRED
gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED
dbus-glib-1 >= \$DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= \$MATE_DESKTOP_REQUIRED
\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -13449,7 +13449,6 @@
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
@@ -13475,14 +13474,12 @@
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
" 2>&1`
else
MATE_SESSION_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags
--libs "glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
@@ -13492,7 +13489,6 @@
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
) were not met:
$MATE_SESSION_PKG_ERRORS
@@ -16781,7 +16777,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.0, which was
+This file was extended by mate-session-manager $as_me 1.12.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16847,7 +16843,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.0
+mate-session-manager config.status 1.12.1
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.0/configure.ac
new/mate-session-manager-1.12.1/configure.ac
--- old/mate-session-manager-1.12.0/configure.ac 2015-11-03
19:18:02.000000000 +0100
+++ new/mate-session-manager-1.12.1/configure.ac 2015-11-30
09:04:45.000000000 +0100
@@ -1,4 +1,4 @@
-AC_INIT([mate-session-manager], [1.12.0], [http://www.mate-desktop.org/])
+AC_INIT([mate-session-manager], [1.12.1], [http://www.mate-desktop.org/])
AC_CONFIG_SRCDIR([mate-session])
AC_CONFIG_HEADERS([config.h])
@@ -55,14 +55,13 @@
GIO_REQUIRED=2.25.0
DBUS_GLIB_REQUIRED=0.76
UPOWER_REQUIRED=0.9.0
-MATE_DESKTOP_REQUIRED=1.9.3
case "$with_gtk" in
2.0) GTK_API_VERSION=2.0
GTK_REQUIRED=2.24.0
;;
3.0) GTK_API_VERSION=3.0
- GTK_REQUIRED=2.90.0
+ GTK_REQUIRED=3.0.0
;;
esac
@@ -76,7 +75,6 @@
gio-2.0 >= $GIO_REQUIRED
gtk+-$GTK_API_VERSION >= $GTK_REQUIRED
dbus-glib-1 >= $DBUS_GLIB_REQUIRED
- mate-desktop-2.0 >= $MATE_DESKTOP_REQUIRED
)
PKG_CHECK_MODULES(SESSION_PROPERTIES,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-session-manager-1.12.0/doc/man/mate-session-inhibit.1
new/mate-session-manager-1.12.1/doc/man/mate-session-inhibit.1
--- old/mate-session-manager-1.12.0/doc/man/mate-session-inhibit.1
2015-11-03 19:20:01.000000000 +0100
+++ new/mate-session-manager-1.12.1/doc/man/mate-session-inhibit.1
2015-11-30 09:06:31.000000000 +0100
@@ -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/03/2015
+.\" Date: 11/30/2015
.\" Manual: User Commands
.\" Source: mate-session
.\" Language: English
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.0/ltmain.sh
new/mate-session-manager-1.12.1/ltmain.sh
--- old/mate-session-manager-1.12.0/ltmain.sh 2015-11-03 19:19:23.000000000
+0100
+++ new/mate-session-manager-1.12.1/ltmain.sh 2015-11-30 09:06:10.000000000
+0100
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.11
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
+VERSION="2.4.2 Debian-2.4.2-1.11"
TIMESTAMP=""
package_revision=1.3337
@@ -6124,7 +6124,10 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
@@ -6444,19 +6447,19 @@
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if $opt_preserve_dup_deps ; then
+ case "$tmp_libs " in
+ *" $deplib "*) func_append specialdeplibs " $deplib" ;;
+ esac
+ fi
+ func_append tmp_libs " $deplib"
+ done
elif test "$linkmode" != prog && test "$linkmode" != lib; then
func_fatal_error "\`$lib' is not a convenience library"
fi
- tmp_libs=
- for deplib in $dependency_libs; do
- deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
- case "$tmp_libs " in
- *" $deplib "*) func_append specialdeplibs " $deplib" ;;
- esac
- fi
- func_append tmp_libs " $deplib"
- done
continue
fi # $pass = conv
@@ -7349,6 +7352,9 @@
revision="$number_minor"
lt_irix_increment=no
;;
+ *)
+ func_fatal_configuration "$modename: unknown library version type
\`$version_type'"
+ ;;
esac
;;
no)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.0/m4/libtool.m4
new/mate-session-manager-1.12.1/m4/libtool.m4
--- old/mate-session-manager-1.12.0/m4/libtool.m4 2015-11-03
19:19:24.000000000 +0100
+++ new/mate-session-manager-1.12.1/m4/libtool.m4 2015-11-30
09:06:10.000000000 +0100
@@ -1324,12 +1324,19 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
- powerpc64le-*linux*)
+ powerpc64le-*)
LD="${LD-ld} -m elf32lppclinux"
;;
- powerpc64-*linux*)
+ powerpc64-*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1348,10 +1355,10 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
- powerpcle-*linux*)
+ powerpcle-*)
LD="${LD-ld} -m elf64lppc"
;;
- powerpc-*linux*)
+ powerpc-*)
LD="${LD-ld} -m elf64ppc"
;;
s390*-*linux*|s390*-*tpf*)
@@ -1694,7 +1701,8 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -2518,17 +2526,6 @@
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
@@ -2645,7 +2642,7 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
@@ -2675,14 +2672,10 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Add ABI-specific directories to the system library path.
- sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s
2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' <
/etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/
/g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
+ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2694,6 +2687,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
+netbsdelf*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ dynamic_linker='NetBSD ld.elf_so'
+ ;;
+
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -3253,10 +3258,6 @@
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3295,11 +3296,11 @@
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
-netbsd*)
+netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern
/lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -4047,7 +4048,7 @@
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4111,7 +4112,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4346,7 +4347,7 @@
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
@@ -4588,6 +4589,9 @@
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience |
$global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -4650,6 +4654,9 @@
openbsd*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -4871,7 +4878,7 @@
fi
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs
$linker_flags -o $lib'
wlarc=
@@ -5048,6 +5055,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
# not using gcc
if test "$host_cpu" = ia64; then
@@ -5352,7 +5360,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags' # a.out
else
@@ -6232,9 +6240,6 @@
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags ${wl}-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -6396,7 +6401,7 @@
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-session-manager-1.12.0/mate-session/main.c
new/mate-session-manager-1.12.1/mate-session/main.c
--- old/mate-session-manager-1.12.0/mate-session/main.c 2015-10-06
17:27:38.000000000 +0200
+++ new/mate-session-manager-1.12.1/mate-session/main.c 2015-11-30
09:04:34.000000000 +0100
@@ -39,8 +39,6 @@
#include <dbus/dbus-glib-bindings.h>
#include <dbus/dbus-glib-lowlevel.h>
-#include <libmate-desktop/mate-gsettings.h>
-
#include "mdm-signal-handler.h"
#include "mdm-log.h"
@@ -537,6 +535,22 @@
mdm_log_set_debug (debug);
}
+static gboolean
+schema_exists (const gchar* schema_name)
+{
+ GSettingsSchemaSource *source;
+ GSettingsSchema *schema;
+ gboolean exists;
+
+ source = g_settings_schema_source_get_default();
+ schema = g_settings_schema_source_lookup (source, schema_name, FALSE);
+ exists = (schema != NULL);
+ if (schema)
+ g_settings_schema_unref (schema);
+
+ return exists;
+}
+
static void set_overlay_scroll (void)
{
GSettings *settings;
@@ -608,7 +622,7 @@
mdm_log_init();
/* Allows to enable/disable debug from GSettings only if it is not set
from argument */
- if (!debug && mate_gsettings_schema_exists(DEBUG_SCHEMA))
+ if (!debug && schema_exists(DEBUG_SCHEMA))
{
debug_settings = g_settings_new (DEBUG_SCHEMA);
g_signal_connect (debug_settings, "changed::" DEBUG_KEY,
G_CALLBACK (debug_changed), NULL);
