Hello community,
here is the log from the commit of package mate-settings-daemon for
openSUSE:Factory checked in at 2017-04-07 13:56:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mate-settings-daemon (Old)
and /work/SRC/openSUSE:Factory/.mate-settings-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mate-settings-daemon"
Fri Apr 7 13:56:15 2017 rev:19 rq:485909 version:1.18.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/mate-settings-daemon/mate-settings-daemon.changes
2017-03-20 17:12:41.939300495 +0100
+++
/work/SRC/openSUSE:Factory/.mate-settings-daemon.new/mate-settings-daemon.changes
2017-04-07 13:56:19.261930759 +0200
@@ -1,0 +2,8 @@
+Wed Apr 5 18:48:13 UTC 2017 - [email protected]
+
+- Update to version 1.18.1:
+ * mouse: Make pointer locater always click through.
+ * mouse: Also grab button presses so as to replay them on pointer
+ locater.
+
+-------------------------------------------------------------------
Old:
----
mate-settings-daemon-1.18.0.tar.xz
New:
----
mate-settings-daemon-1.18.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mate-settings-daemon.spec ++++++
--- /var/tmp/diff_new_pack.t14vQL/_old 2017-04-07 13:56:19.857846581 +0200
+++ /var/tmp/diff_new_pack.t14vQL/_new 2017-04-07 13:56:19.861846016 +0200
@@ -18,7 +18,7 @@
%define _version 1.18
Name: mate-settings-daemon
-Version: 1.18.0
+Version: 1.18.1
Release: 0
Summary: MATE session settings daemon
License: GPL-2.0 and LGPL-2.1
++++++ mate-settings-daemon-1.18.0.tar.xz -> mate-settings-daemon-1.18.1.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/ChangeLog
new/mate-settings-daemon-1.18.1/ChangeLog
--- old/mate-settings-daemon-1.18.0/ChangeLog 2017-03-13 20:19:32.000000000
+0100
+++ new/mate-settings-daemon-1.18.1/ChangeLog 2017-04-05 00:09:52.000000000
+0200
@@ -1,3 +1,36 @@
+commit 3e295156e3bd77007984dedf8d326b6c412ff925
+Author: Rui Matos <[email protected]>
+Date: Sat Oct 6 01:39:41 2012 +0200
+
+ mouse: Also grab button presses so as to replay them on pointer locater
+
+ Applications might want to establish keyboard grabs on button presses so we
+ should also ungrab the keyboard when a button press occurs after the locate
+ pointer key is pressed.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=125618
+
+ plugins/mouse/msd-locate-pointer.c | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+commit 889f0f2336640314d966dfe9c02d74169c255d5c
+Author: Alexei Sorokin <[email protected]>
+Date: Sat Mar 18 22:17:36 2017 +0300
+
+ mouse: More pointer locater refactoring
+
+ plugins/mouse/msd-locate-pointer.c | 110 ++++++++++++++++++-------------------
+ 1 file changed, 55 insertions(+), 55 deletions(-)
+
+commit 280c1746b557369793e41f39e1d6b5edb1a1bf2b
+Author: Alexei Sorokin <[email protected]>
+Date: Tue Mar 14 15:58:27 2017 +0300
+
+ Make pointer locater always pass through
+
+ plugins/mouse/msd-locate-pointer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
commit e801231c947bf3112c6c8491ec995a9253596df6
Author: raveit65 <[email protected]>
Date: Mon Mar 13 20:17:00 2017 +0100
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/Makefile.in
new/mate-settings-daemon-1.18.1/Makefile.in
--- old/mate-settings-daemon-1.18.0/Makefile.in 2017-03-13 20:18:20.000000000
+0100
+++ new/mate-settings-daemon-1.18.1/Makefile.in 2017-04-05 00:09:38.000000000
+0200
@@ -399,6 +399,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -664,7 +665,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c
>$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -689,7 +690,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+ shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -707,7 +708,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -717,7 +718,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/NEWS
new/mate-settings-daemon-1.18.1/NEWS
--- old/mate-settings-daemon-1.18.0/NEWS 2017-03-13 13:33:27.000000000
+0100
+++ new/mate-settings-daemon-1.18.1/NEWS 2017-04-05 00:02:16.000000000
+0200
@@ -1,3 +1,9 @@
+### mate-settings-daemon 1.18.1
+
+ * mouse: Also grab button presses so as to replay them on pointer locater
+ * mouse: More pointer locater refactoring
+ * Make pointer locater always pass through
+
### mate-settings-daemon 1.18.0
* NEWS: use consistent, project wide, markdown-like formatting to make
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/aclocal.m4
new/mate-settings-daemon-1.18.1/aclocal.m4
--- old/mate-settings-daemon-1.18.0/aclocal.m4 2017-03-13 20:18:17.000000000
+0100
+++ new/mate-settings-daemon-1.18.1/aclocal.m4 2017-04-05 00:09:37.000000000
+0200
@@ -574,32 +574,63 @@
AC_SUBST([USE_NLS])
])
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <[email protected]>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29.1)
+dnl
+dnl Copyright © 2004 Scott James Remnant <[email protected]>.
+dnl Copyright © 2012-2015 Dan Nicholson <[email protected]>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl [m4_fatal([must install pkg-config 0.29 or later before running
autoconf/autogen])])
+dnl
+dnl See the "Since" comment for each macro you use to see what version
+dnl of the macros you require.
+m4_defun([PKG_PREREQ],
+[m4_define([PKG_MACROS_VERSION], [0.29.1])
+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
+ [m4_fatal([pkg.m4 version $1 or higher is required but
]PKG_MACROS_VERSION[ found])])
+])dnl PKG_PREREQ
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -621,18 +652,19 @@
PKG_CONFIG=""
fi
fi[]dnl
-])# PKG_PROG_PKG_CONFIG
+])dnl PKG_PROG_PKG_CONFIG
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
@@ -642,8 +674,10 @@
$3])dnl
fi])
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
m4_define([_PKG_CONFIG],
[if test -n "$$1"; then
pkg_cv_[]$1="$$1"
@@ -655,10 +689,11 @@
else
pkg_failed=untried
fi[]dnl
-])# _PKG_CONFIG
+])dnl _PKG_CONFIG
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
@@ -666,19 +701,17 @@
else
_pkg_short_errors_supported=no
fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
AC_DEFUN([PKG_CHECK_MODULES],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
@@ -732,15 +765,40 @@
AC_MSG_RESULT([yes])
$3
fi[]dnl
-])# PKG_CHECK_MODULES
+])dnl PKG_CHECK_MODULES
+
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
AC_DEFUN([PKG_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -751,16 +809,18 @@
AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
+])dnl PKG_INSTALLDIR
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
AC_DEFUN([PKG_NOARCH_INSTALLDIR],
[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
m4_pushdef([pkg_description],
@@ -771,13 +831,15 @@
AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
m4_popdef([pkg_default])
m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
+])dnl PKG_NOARCH_INSTALLDIR
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
@@ -786,81 +848,7 @@
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-
-# PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-# [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
-# [DESCRIPTION], [DEFAULT])
-#
-# Prepare a "--with-" configure option using the lowercase [VARIABLE-PREFIX]
-# name, merging the behaviour of AC_ARG_WITH and PKG_CHECK_MODULES in a single
-# macro
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_WITH_MODULES],
-[
-m4_pushdef([with_arg], m4_tolower([$1]))
-
-m4_pushdef([description],
- [m4_default([$5], [build with ]with_arg[ support])])
-
-m4_pushdef([def_arg], [m4_default([$6], [auto])])
-m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes])
-m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no])
-
-m4_case(def_arg,
- [yes],[m4_pushdef([with_without], [--without-]with_arg)],
- [m4_pushdef([with_without],[--with-]with_arg)])
-
-AC_ARG_WITH(with_arg,
- AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),,
- [AS_TR_SH([with_]with_arg)=def_arg])
-
-AS_CASE([$AS_TR_SH([with_]with_arg)],
- [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)],
- [auto],[PKG_CHECK_MODULES([$1],[$2],
- [m4_n([def_action_if_found]) $3],
- [m4_n([def_action_if_not_found]) $4])])
-
-m4_popdef([with_arg])
-m4_popdef([description])
-m4_popdef([def_arg])
-
-]) dnl PKG_WITH_MODULES
-
-# PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-# [DESCRIPTION], [DEFAULT])
-#
-# Convenience macro to trigger AM_CONDITIONAL after
-# PKG_WITH_MODULES check.
-#
-# HAVE_[VARIABLE-PREFIX] is exported as make variable.
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_HAVE_WITH_MODULES],
-[
-PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
-
-AM_CONDITIONAL([HAVE_][$1],
- [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
-])
-
-# PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
-# [DESCRIPTION], [DEFAULT])
-#
-# Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
-# PKG_WITH_MODULES check.
-#
-# HAVE_[VARIABLE-PREFIX] is exported as make and preprocessor variable.
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
-[
-PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
-
-AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
- [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
-])
+])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/config.sub
new/mate-settings-daemon-1.18.1/config.sub
--- old/mate-settings-daemon-1.18.0/config.sub 2017-03-13 20:18:20.000000000
+0100
+++ new/mate-settings-daemon-1.18.1/config.sub 2017-04-05 00:09:38.000000000
+0200
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2016 Free Software Foundation, Inc.
-timestamp='2016-09-05'
+timestamp='2016-11-04'
# 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
@@ -301,6 +301,7 @@
| open8 | or1k | or1knd | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle \
+ | pru \
| pyramid \
| riscv32 | riscv64 \
| rl78 | rx \
@@ -428,6 +429,7 @@
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+ | pru-* \
| pyramid-* \
| riscv32-* | riscv64-* \
| rl78-* | romp-* | rs6000-* | rx-* \
@@ -1038,7 +1040,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)
basic_machine=powerpc64le-unknown
@@ -1407,7 +1409,7 @@
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
- | -onefs* | -tirtos* | -phoenix*)
+ | -onefs* | -tirtos* | -phoenix* | -fuchsia*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/configure
new/mate-settings-daemon-1.18.1/configure
--- old/mate-settings-daemon-1.18.0/configure 2017-03-13 20:18:18.000000000
+0100
+++ new/mate-settings-daemon-1.18.1/configure 2017-04-05 00:09:38.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-settings-daemon 1.18.0.
+# Generated by GNU Autoconf 2.69 for mate-settings-daemon 1.18.1.
#
# Report bugs to <http://www.mate-desktop.org/>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='mate-settings-daemon'
PACKAGE_TARNAME='mate-settings-daemon'
-PACKAGE_VERSION='1.18.0'
-PACKAGE_STRING='mate-settings-daemon 1.18.0'
+PACKAGE_VERSION='1.18.1'
+PACKAGE_STRING='mate-settings-daemon 1.18.1'
PACKAGE_BUGREPORT='http://www.mate-desktop.org/'
PACKAGE_URL=''
@@ -846,6 +846,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -981,6 +982,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1233,6 +1235,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1370,7 +1381,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1483,7 +1494,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-settings-daemon 1.18.0 to adapt to many kinds of
systems.
+\`configure' configures mate-settings-daemon 1.18.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1523,6 +1534,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1558,7 +1570,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mate-settings-daemon 1.18.0:";;
+ short | recursive ) echo "Configuration of mate-settings-daemon 1.18.1:";;
esac
cat <<\_ACEOF
@@ -1751,7 +1763,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-mate-settings-daemon configure 1.18.0
+mate-settings-daemon configure 1.18.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2241,7 +2253,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-settings-daemon $as_me 1.18.0, which was
+It was created by mate-settings-daemon $as_me 1.18.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3108,7 +3120,7 @@
# Define the identity of the package.
PACKAGE='mate-settings-daemon'
- VERSION='1.18.0'
+ VERSION='1.18.1'
cat >>confdefs.h <<_ACEOF
@@ -6366,7 +6378,7 @@
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
@@ -9819,6 +9831,9 @@
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs=no
+ ;;
esac
ld_shlibs=yes
@@ -10073,7 +10088,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=
@@ -10743,6 +10758,7 @@
if test yes = "$lt_cv_irix_exported_symbol"; then
archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs
$compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all
"$wl-set_version $wl$verstring"` $wl-update_registry
$wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ link_all_deplibs=no
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname
$soname `test -n "$verstring" && func_echo_all "-set_version $verstring"`
-update_registry $output_objdir/so_locations -o $lib'
archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags
-soname $soname `test -n "$verstring" && func_echo_all "-set_version
$verstring"` -update_registry $output_objdir/so_locations -exports_file
$export_symbols -o $lib'
@@ -10764,7 +10780,7 @@
esac
;;
- 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
@@ -11859,9 +11875,6 @@
# 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"
-
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -11870,7 +11883,7 @@
# appending ld.so.conf contents (and includes) 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
@@ -11882,6 +11895,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
@@ -14776,7 +14801,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -15151,6 +15176,9 @@
;;
esac
;;
+ linux* | k*bsd*-gnu | gnu*)
+ link_all_deplibs_CXX=no
+ ;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe |
$SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -15824,9 +15852,6 @@
# 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"
-
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -15835,7 +15860,7 @@
# appending ld.so.conf contents (and includes) 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
@@ -15847,6 +15872,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
@@ -21071,7 +21108,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by mate-settings-daemon $as_me 1.18.0, which was
+This file was extended by mate-settings-daemon $as_me 1.18.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21137,7 +21174,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-settings-daemon config.status 1.18.0
+mate-settings-daemon config.status 1.18.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -22405,7 +22442,6 @@
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/configure.ac
new/mate-settings-daemon-1.18.1/configure.ac
--- old/mate-settings-daemon-1.18.0/configure.ac 2017-03-13
13:35:43.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/configure.ac 2017-04-04
23:52:57.000000000 +0200
@@ -2,7 +2,7 @@
m4_define([msd_api_version_major],[1])
m4_define([msd_api_version_minor],[18])
-m4_define([msd_api_version_micro],[0])
+m4_define([msd_api_version_micro],[1])
m4_define([msd_api_version],
[msd_api_version_major.msd_api_version_minor.msd_api_version_micro])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/data/Makefile.in
new/mate-settings-daemon-1.18.1/data/Makefile.in
--- old/mate-settings-daemon-1.18.0/data/Makefile.in 2017-03-13
20:18:20.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/data/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -397,6 +397,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/install-sh
new/mate-settings-daemon-1.18.1/install-sh
--- old/mate-settings-daemon-1.18.0/install-sh 2017-03-13 20:18:20.000000000
+0100
+++ new/mate-settings-daemon-1.18.1/install-sh 2017-04-05 00:09:38.000000000
+0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2014-09-12.12; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -324,34 +324,41 @@
# is incompatible with FreeBSD 'install' when (umask & 300) != 0.
;;
*)
+ # $RANDOM is not portable (e.g. dash); use it when possible to
+ # lower collision chance
tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
2>/dev/null; exit $ret' 0
+ # As "mkdir -p" follows symlinks and we work in /tmp possibly; so
+ # create the $tmpdir first (and fail if unsuccessful) to make sure
+ # that nobody tries to guess the $tmpdir name.
if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ $mkdirprog $mkdir_mode "$tmpdir" &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null
2>&1
then
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ test_tmpdir="$tmpdir/a"
+ ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
case $ls_ld_tmpdir in
d????-?r-*) different_mode=700;;
d????-?--*) different_mode=755;;
*) false;;
esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
}
}
then posix_mkdir=:
fi
- rmdir "$tmpdir/d" "$tmpdir"
+ rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
else
# Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
fi
trap '' 0;;
esac;;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/ltmain.sh
new/mate-settings-daemon-1.18.1/ltmain.sh
--- old/mate-settings-daemon-1.18.0/ltmain.sh 2017-03-13 20:18:12.000000000
+0100
+++ new/mate-settings-daemon-1.18.1/ltmain.sh 2017-04-05 00:09:36.000000000
+0200
@@ -31,7 +31,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.6
+VERSION="2.4.6 Debian-2.4.6-2"
package_revision=2.4.6
@@ -2068,12 +2068,12 @@
compiler: $LTCC
compiler flags: $LTCFLAGS
linker: $LD (gnu? $with_gnu_ld)
- version: $progname (GNU libtool) 2.4.6
+ version: $progname $scriptversion Debian-2.4.6-2
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
Report bugs to <[email protected]>.
-GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+GNU libtool home page: <http://www.gnu.org/s/libtool/>.
General help using GNU software: <http://www.gnu.org/gethelp/>."
exit 0
}
@@ -7272,10 +7272,13 @@
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time
optimization
+ # -specs=* GCC specs files
# -stdlib=* select c++ std lib with clang
+ # -fsanitize=* Clang/GCC memory and address sanitizer
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
+
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+ -specs=*|-fsanitize=*)
func_quote_for_eval "$arg"
arg=$func_quote_for_eval_result
func_append compile_command " $arg"
@@ -7568,7 +7571,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 lib,dlpreopen = "$linkmode,$pass"; then
@@ -7887,19 +7893,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 prog != "$linkmode" && test lib != "$linkmode"; 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
@@ -8823,6 +8829,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-settings-daemon-1.18.0/m4/libtool.m4
new/mate-settings-daemon-1.18.1/m4/libtool.m4
--- old/mate-settings-daemon-1.18.0/m4/libtool.m4 2017-03-13
20:18:12.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/m4/libtool.m4 2017-04-05
00:09:36.000000000 +0200
@@ -728,7 +728,6 @@
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
# Generated automatically by $as_me ($PACKAGE) $VERSION
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
# Provide generalized library-building support services.
@@ -2867,9 +2866,6 @@
# 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"
-
# Ideally, we could use ldconfig to report *all* directores which are
# searched for libraries, however this is still not possible. Aside from not
# being certain /sbin/ldconfig is available, command
@@ -2878,7 +2874,7 @@
# appending ld.so.conf contents (and includes) 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
@@ -2890,6 +2886,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
@@ -3549,7 +3557,7 @@
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
@@ -4427,7 +4435,7 @@
;;
esac
;;
- netbsd*)
+ netbsd* | netbsdelf*-gnu)
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4939,6 +4947,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'
;;
@@ -5001,6 +5012,9 @@
openbsd* | bitrig*)
with_gnu_ld=no
;;
+ linux* | k*bsd*-gnu | gnu*)
+ _LT_TAGVAR(link_all_deplibs, $1)=no
+ ;;
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
@@ -5255,7 +5269,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=
@@ -5776,6 +5790,7 @@
if test yes = "$lt_cv_irix_exported_symbol"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs
$deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" &&
func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry
$wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
+ _LT_TAGVAR(link_all_deplibs, $1)=no
else
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -soname $soname `test -n "$verstring" && func_echo_all
"-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs
$compiler_flags -soname $soname `test -n "$verstring" && func_echo_all
"-set_version $verstring"` -update_registry $output_objdir/so_locations
-exports_file $export_symbols -o $lib'
@@ -5797,7 +5812,7 @@
esac
;;
- 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/mate-settings-daemon/Makefile.in
new/mate-settings-daemon-1.18.1/mate-settings-daemon/Makefile.in
--- old/mate-settings-daemon-1.18.0/mate-settings-daemon/Makefile.in
2017-03-13 20:18:20.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/mate-settings-daemon/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -420,6 +420,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/plugins/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/Makefile.in 2017-03-13
20:18:20.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -377,6 +377,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/a11y-keyboard/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/a11y-keyboard/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/a11y-keyboard/Makefile.in
2017-03-13 20:18:20.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/a11y-keyboard/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -426,6 +426,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/a11y-settings/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/a11y-settings/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/a11y-settings/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/a11y-settings/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -402,6 +402,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/background/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/background/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/background/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/background/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -421,6 +421,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/clipboard/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/clipboard/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/clipboard/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/clipboard/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -405,6 +405,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/common/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/common/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/common/Makefile.in 2017-03-13
20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/common/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -372,6 +372,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/datetime/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/datetime/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/datetime/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/datetime/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -402,6 +402,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/dummy/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/dummy/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/dummy/Makefile.in 2017-03-13
20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/dummy/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -400,6 +400,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/housekeeping/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/housekeeping/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/housekeeping/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/housekeeping/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -405,6 +405,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/keybindings/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/keybindings/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/keybindings/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/keybindings/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -406,6 +406,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/keyboard/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/keyboard/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/keyboard/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/keyboard/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -407,6 +407,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/media-keys/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/media-keys/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/media-keys/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/media-keys/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -446,6 +446,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/mouse/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/mouse/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/mouse/Makefile.in 2017-03-13
20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/mouse/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -417,6 +417,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/mouse/msd-locate-pointer.c
new/mate-settings-daemon-1.18.1/plugins/mouse/msd-locate-pointer.c
--- old/mate-settings-daemon-1.18.0/plugins/mouse/msd-locate-pointer.c
2017-03-13 20:15:56.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/mouse/msd-locate-pointer.c
2017-03-26 00:26:21.000000000 +0100
@@ -190,7 +190,7 @@
{
/* only invalidate window each circle interval */
update_shape (data);
- gdk_window_invalidate_rect (data->window, NULL, FALSE);
+ gtk_widget_queue_draw (GTK_WIDGET (data->widget));
data->progress += CIRCLES_PROGRESS_INTERVAL;
}
@@ -267,7 +267,9 @@
/* set transparent shape and hide window */
if (!gdk_screen_is_composited (screen))
- set_transparent_shape (data->window);
+ {
+ set_transparent_shape (data->window);
+ }
gtk_widget_hide (GTK_WIDGET (data->widget));
}
@@ -333,7 +335,7 @@
gpointer user_data)
{
MsdLocatePointerData *data = (MsdLocatePointerData *) user_data;
- GdkScreen *screen = gtk_window_get_screen (data->widget);
+ GdkScreen *screen = gdk_window_get_screen (data->window);
if (gtk_cairo_should_draw_window (cr, data->window))
{
@@ -344,15 +346,12 @@
}
static MsdLocatePointerData *
-msd_locate_pointer_data_new (GdkDisplay *display)
+msd_locate_pointer_data_new (void)
{
MsdLocatePointerData *data;
data = g_new0 (MsdLocatePointerData, 1);
- /* this widget will never be shown, it's
- * mainly used to get signals/events from
- */
data->widget = GTK_WINDOW (gtk_window_new (GTK_WINDOW_POPUP));
g_signal_connect (GTK_WIDGET (data->widget), "unrealize",
@@ -417,9 +416,8 @@
0);
cr = cairo_create (mask);
- cairo_set_source_rgb (cr, 0., 0., 0.);
- cairo_rectangle (cr, 0., 0., WINDOW_SIZE, WINDOW_SIZE);
- cairo_fill (cr);
+ cairo_set_source_rgba (cr, 0., 0., 0., 0.);
+ cairo_paint (cr);
region = gdk_cairo_region_create_from_surface (mask);
@@ -437,7 +435,7 @@
if (data == NULL)
{
- data = msd_locate_pointer_data_new (display);
+ data = msd_locate_pointer_data_new ();
}
msd_timeline_pause (data->timeline);
@@ -461,51 +459,82 @@
/* Owen magic */
static GdkFilterReturn
-filter (GdkXEvent *xevent,
- GdkEvent *event,
- gpointer data)
+event_filter (GdkXEvent *gdkxevent,
+ GdkEvent *event,
+ gpointer user_data)
{
- XEvent *xev = (XEvent *) xevent;
- guint keyval;
- gint group;
-
- GdkDisplay *display = (GdkDisplay *) data;
+ XEvent *xevent = (XEvent *) gdkxevent;
+ GdkDisplay *display = (GdkDisplay *) user_data;
- if (xev->type == KeyPress || xev->type == KeyRelease)
+ if (xevent->xany.type == KeyPress || xevent->xany.type == KeyRelease)
{
+ guint keyval;
+ gint group;
+
/* get the keysym */
- group = (xev->xkey.state & KEYBOARD_GROUP_MASK) >> KEYBOARD_GROUP_SHIFT;
- gdk_keymap_translate_keyboard_state (gdk_keymap_get_default (),
- xev->xkey.keycode,
- xev->xkey.state,
+ group = (xevent->xkey.state & KEYBOARD_GROUP_MASK) >>
KEYBOARD_GROUP_SHIFT;
+ gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display
(display),
+ xevent->xkey.keycode,
+ xevent->xkey.state,
group,
&keyval,
NULL, NULL, NULL);
+
if (keyval == GDK_KEY_Control_L || keyval == GDK_KEY_Control_R)
{
- if (xev->type == KeyPress)
- {
- XAllowEvents (xev->xkey.display,
- SyncKeyboard,
- xev->xkey.time);
+ if (xevent->xany.type == KeyRelease)
+ {
+ XUngrabButton (xevent->xany.display,
+ AnyButton,
+ AnyModifier,
+ xevent->xany.window);
+ XAllowEvents (xevent->xany.display,
+ AsyncKeyboard,
+ xevent->xkey.time);
+ msd_locate_pointer (display);
}
else
{
- XAllowEvents (xev->xkey.display,
- AsyncKeyboard,
- xev->xkey.time);
- msd_locate_pointer (display);
+ XAllowEvents (xevent->xany.display,
+ SyncKeyboard,
+ xevent->xkey.time);
+ XGrabButton (xevent->xany.display,
+ AnyButton,
+ AnyModifier,
+ xevent->xany.window,
+ False,
+ ButtonPressMask,
+ GrabModeSync,
+ GrabModeAsync,
+ None,
+ None);
}
}
else
{
- XAllowEvents (xev->xkey.display,
+ XAllowEvents (xevent->xany.display,
ReplayKeyboard,
- xev->xkey.time);
- XUngrabKeyboard (GDK_DISPLAY_XDISPLAY (display),
- xev->xkey.time);
+ xevent->xkey.time);
+ XUngrabButton (xevent->xany.display,
+ AnyButton,
+ AnyModifier,
+ xevent->xany.window);
+ XUngrabKeyboard (xevent->xany.display,
+ xevent->xkey.time);
}
}
+ else if (xevent->xany.type == ButtonPress)
+ {
+ XAllowEvents (xevent->xany.display,
+ ReplayPointer,
+ xevent->xbutton.time);
+ XUngrabButton (xevent->xany.display,
+ AnyButton,
+ AnyModifier,
+ xevent->xany.window);
+ XUngrabKeyboard (xevent->xany.display,
+ xevent->xbutton.time);
+ }
return GDK_FILTER_CONTINUE;
}
@@ -517,65 +546,66 @@
GdkDisplay *display;
GdkScreen *screen;
int n_keys;
- gboolean has_entries;
+ gboolean has_entries = FALSE;
static const guint keyvals[] = { GDK_KEY_Control_L, GDK_KEY_Control_R };
- unsigned int j;
+ unsigned int i, j;
display = gdk_display_get_default ();
screen = gdk_display_get_default_screen (display);
- for (j = 0 ; j < G_N_ELEMENTS (keyvals) ; j++)
+ for (i = 0; i < G_N_ELEMENTS (keyvals); ++i)
{
- has_entries = gdk_keymap_get_entries_for_keyval (gdk_keymap_get_default
(),
- keyvals[j],
- &keys,
- &n_keys);
- if (has_entries)
+ if (gdk_keymap_get_entries_for_keyval (gdk_keymap_get_for_display
(display),
+ keyvals[i],
+ &keys,
+ &n_keys))
{
- gint i;
- for (i = 0; i < n_keys; i++)
+ has_entries = TRUE;
+ for (j = 0; j < n_keys; ++j)
{
Window xroot;
xroot = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));
XGrabKey (GDK_DISPLAY_XDISPLAY (display),
- keys[i].keycode,
+ keys[j].keycode,
0,
xroot,
False,
GrabModeAsync,
GrabModeSync);
XGrabKey (GDK_DISPLAY_XDISPLAY (display),
- keys[i].keycode,
+ keys[j].keycode,
LockMask,
xroot,
False,
GrabModeAsync,
GrabModeSync);
XGrabKey (GDK_DISPLAY_XDISPLAY (display),
- keys[i].keycode,
+ keys[j].keycode,
Mod2Mask,
xroot,
False,
GrabModeAsync,
GrabModeSync);
XGrabKey (GDK_DISPLAY_XDISPLAY (display),
- keys[i].keycode,
+ keys[j].keycode,
Mod4Mask,
xroot,
False,
GrabModeAsync,
GrabModeSync);
}
-
g_free (keys);
-
- gdk_window_add_filter (gdk_screen_get_root_window (screen),
- filter,
- display);
}
}
+
+ if (has_entries)
+ {
+ gdk_window_add_filter (gdk_screen_get_root_window (screen),
+ (GdkFilterFunc) event_filter,
+ display);
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/mpris/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/mpris/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/mpris/Makefile.in 2017-03-13
20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/mpris/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -400,6 +400,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/smartcard/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/smartcard/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/smartcard/Makefile.in
2017-03-13 20:18:21.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/smartcard/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -403,6 +403,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/sound/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/sound/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/sound/Makefile.in 2017-03-13
20:18:22.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/sound/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -400,6 +400,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/typing-break/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/typing-break/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/typing-break/Makefile.in
2017-03-13 20:18:22.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/typing-break/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -405,6 +405,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/xrandr/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/xrandr/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/xrandr/Makefile.in 2017-03-13
20:18:22.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/xrandr/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -403,6 +403,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/plugins/xrdb/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/xrdb/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/xrdb/Makefile.in 2017-03-13
20:18:22.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/xrdb/Makefile.in 2017-04-05
00:09:39.000000000 +0200
@@ -443,6 +443,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/xrdb/data/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/xrdb/data/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/xrdb/data/Makefile.in
2017-03-13 20:18:22.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/xrdb/data/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -346,6 +346,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/mate-settings-daemon-1.18.0/plugins/xsettings/Makefile.in
new/mate-settings-daemon-1.18.1/plugins/xsettings/Makefile.in
--- old/mate-settings-daemon-1.18.0/plugins/xsettings/Makefile.in
2017-03-13 20:18:22.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/plugins/xsettings/Makefile.in
2017-04-05 00:09:39.000000000 +0200
@@ -406,6 +406,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/mate-settings-daemon-1.18.0/po/POTFILES.skip
new/mate-settings-daemon-1.18.1/po/POTFILES.skip
--- old/mate-settings-daemon-1.18.0/po/POTFILES.skip 2016-11-16
13:43:06.000000000 +0100
+++ new/mate-settings-daemon-1.18.1/po/POTFILES.skip 2017-04-05
00:09:30.000000000 +0200
@@ -7,3 +7,4 @@
# remove these unless you fix "make distcheck" a different way.
#
data/mate-settings-daemon.desktop.in
+sub/data/mate-settings-daemon.desktop.in
