diff -Nru at-spi2-core-2.22.0/aclocal.m4 at-spi2-core-2.24.1/aclocal.m4 --- at-spi2-core-2.22.0/aclocal.m4 2016-09-26 01:11:48.000000000 +0000 +++ at-spi2-core-2.24.1/aclocal.m4 2017-05-08 22:43:12.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -268,7 +268,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])# PKG_CHECK_VAR -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -280,10 +280,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -299,12 +299,12 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -324,7 +324,8 @@ : ${AR=ar} AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface], - [am_cv_ar_interface=ar + [AC_LANG_PUSH([C]) + am_cv_ar_interface=ar AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])], [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([am_ar_try]) @@ -341,7 +342,7 @@ fi rm -f conftest.lib libconftest.a ]) - ]) + AC_LANG_POP([C])]) case $am_cv_ar_interface in ar) @@ -365,7 +366,7 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -417,7 +418,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -448,7 +449,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -639,7 +640,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -715,7 +716,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -724,6 +725,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -799,8 +806,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -832,6 +839,51 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -840,7 +892,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -862,7 +913,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -873,7 +924,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -883,7 +934,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -904,7 +955,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -954,7 +1005,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -993,7 +1044,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1022,9 +1073,73 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1105,7 +1220,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1165,7 +1280,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1193,7 +1308,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1212,7 +1327,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru at-spi2-core-2.22.0/atspi/atspi-application.c at-spi2-core-2.24.1/atspi/atspi-application.c --- at-spi2-core-2.22.0/atspi/atspi-application.c 2013-11-18 16:19:37.000000000 +0000 +++ at-spi2-core-2.24.1/atspi/atspi-application.c 2017-04-24 22:42:13.000000000 +0000 @@ -58,6 +58,7 @@ if (application->root) { + g_clear_object (&application->root->parent.app); g_object_unref (application->root); application->root = NULL; } diff -Nru at-spi2-core-2.22.0/atspi/atspi-constants.h at-spi2-core-2.24.1/atspi/atspi-constants.h --- at-spi2-core-2.22.0/atspi/atspi-constants.h 2016-07-18 23:45:01.000000000 +0000 +++ at-spi2-core-2.24.1/atspi/atspi-constants.h 2017-04-24 22:42:13.000000000 +0000 @@ -1017,7 +1017,7 @@ * onscreen viewport. * @ATSPI_ROLE_WINDOW: A top level window with no title or border. * @ATSPI_ROLE_EXTENDED: means that the role for this item is known, but not - * included in the core enumeration. + * included in the core enumeration. Deprecated since 2.24. * @ATSPI_ROLE_HEADER: An object that serves as a document header. * @ATSPI_ROLE_FOOTER: An object that serves as a document footer. * @ATSPI_ROLE_PARAGRAPH: An object which is contains a single paragraph of diff -Nru at-spi2-core-2.22.0/atspi/atspi-table-cell.c at-spi2-core-2.24.1/atspi/atspi-table-cell.c --- at-spi2-core-2.22.0/atspi/atspi-table-cell.c 2016-07-18 23:45:01.000000000 +0000 +++ at-spi2-core-2.24.1/atspi/atspi-table-cell.c 2017-04-24 22:42:13.000000000 +0000 @@ -97,27 +97,6 @@ } /** - * atspi_table_cell_get_column_index: - * @obj: a GObject instance that implements AtspiTableCellIface - * - * Translates this cell accessible into the corresponding column index. - * - * Returns: the column index for this cell, or -1 if unimplemented. - */ -gint -atspi_table_cell_get_column_index (AtspiTableCell *obj, GError **error) -{ - dbus_int32_t retval = -1; - - g_return_val_if_fail (obj != NULL, -1); - - _atspi_dbus_get_property (obj, atspi_interface_table_cell, "ColumnIndex", - error, "i", &retval); - - return retval; -} - -/** * atspi_table_cell_get_row_span: * @obj: a GObject instance that implements AtspiTableCellIface * @@ -174,7 +153,7 @@ atspi_table_cell_get_position (AtspiTableCell *obj, gint *row, gint *column, - GError *error) + GError **error) { DBusMessage *reply; DBusMessageIter iter, iter_struct, iter_variant; @@ -184,9 +163,12 @@ g_return_val_if_fail (obj != NULL, -1); reply = _atspi_dbus_call_partial (obj, "org.freedesktop.DBus.Properties", - "Get", NULL, "ss", + "Get", error, "ss", atspi_interface_table_cell, "Position"); + if (!reply) + return -1; + dbus_message_iter_init (reply, &iter); /* TODO: Return error here */ diff -Nru at-spi2-core-2.22.0/atspi/atspi-table-cell.h at-spi2-core-2.24.1/atspi/atspi-table-cell.h --- at-spi2-core-2.22.0/atspi/atspi-table-cell.h 2015-01-15 21:17:31.000000000 +0000 +++ at-spi2-core-2.24.1/atspi/atspi-table-cell.h 2017-04-24 22:42:13.000000000 +0000 @@ -58,7 +58,10 @@ GPtrArray *atspi_table_cell_get_row_header_cells (AtspiTableCell *obj, GError **error); -gint atspi_table_cell_get_row_index (AtspiTableCell *obj, GError **error); +gint atspi_table_cell_get_position (AtspiTableCell *obj, + gint *row, + gint *column, + GError **error); void atspi_table_cell_get_row_column_span (AtspiTableCell *obj, gint *row, diff -Nru at-spi2-core-2.22.0/atspi/Makefile.in at-spi2-core-2.24.1/atspi/Makefile.in --- at-spi2-core-2.22.0/atspi/Makefile.in 2016-09-26 01:11:49.000000000 +0000 +++ at-spi2-core-2.24.1/atspi/Makefile.in 2017-05-08 22:43:13.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +17,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ @HAVE_INTROSPECTION_TRUE@am__append_1 = --c-include='atspi/atspi.h' @HAVE_INTROSPECTION_TRUE@am__append_2 = Atspi-2.0.gir subdir = atspi -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(libatspiinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ @@ -93,6 +101,8 @@ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(libatspiinclude_HEADERS) \ + $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -217,6 +227,7 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -556,7 +567,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign atspi/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign atspi/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -650,14 +660,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1125,6 +1135,8 @@ uninstall-girDATA uninstall-libLTLIBRARIES \ uninstall-libatspiincludeHEADERS uninstall-typelibDATA +.PRECIOUS: Makefile + atspi-enum-types.h: atspi-enum-types.h.template $(ENUM_TYPES) $(GLIB_MKENUMS) $(AM_V_GEN) (cd $(srcdir) && $(GLIB_MKENUMS) --template atspi-enum-types.h.template $(ENUM_TYPES)) > $@ diff -Nru at-spi2-core-2.22.0/bus/at-spi-bus-launcher.c at-spi2-core-2.24.1/bus/at-spi-bus-launcher.c --- at-spi2-core-2.22.0/bus/at-spi-bus-launcher.c 2016-09-14 17:15:37.000000000 +0000 +++ at-spi2-core-2.24.1/bus/at-spi-bus-launcher.c 2017-04-24 22:42:13.000000000 +0000 @@ -61,11 +61,6 @@ char *a11y_launch_error_message; } A11yBusLauncher; -#define SM_DBUS_NAME "org.gnome.SessionManager" -#define SM_DBUS_PATH "/org/gnome/SessionManager" -#define SM_DBUS_INTERFACE "org.gnome.SessionManager" - -#define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate" static A11yBusLauncher *_global_app = NULL; static const gchar introspection_xml[] = @@ -134,12 +129,11 @@ G_CALLBACK (g_signal_cb), app); } -static GDBusProxy *sm_proxy; - static void register_client (A11yBusLauncher *app) { GDBusProxyFlags flags; + GDBusProxy *sm_proxy; GError *error; const gchar *app_id; const gchar *autostart_id; @@ -147,12 +141,24 @@ GVariant *parameters; GVariant *variant; gchar *object_path; - static gboolean session_registered = FALSE; - if (session_registered) - return; + flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | + G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS; error = NULL; + sm_proxy = g_dbus_proxy_new_sync (app->session_bus, flags, NULL, + "org.gnome.SessionManager", + "/org/gnome/SessionManager", + "org.gnome.SessionManager", + NULL, &error); + + if (error != NULL) + { + g_warning ("Failed to get session manager proxy: %s", error->message); + g_error_free (error); + + return; + } app_id = "at-spi-bus-launcher"; autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID"); @@ -196,75 +202,17 @@ NULL, client_proxy_ready_cb, app); g_free (object_path); - - session_registered = TRUE; } static void -on_session_signal (GDBusProxy *proxy, - gchar *sender_name, - gchar *signal_name, - GVariant *parameters, - gpointer user_data) +name_appeared_handler (GDBusConnection *connection, + const gchar *name, + const gchar *name_owner, + gpointer user_data) { A11yBusLauncher *app = user_data; - if (g_strcmp0 (signal_name, "SessionOver") == 0) { - g_main_loop_quit (app->loop); - } else if (g_strcmp0 (signal_name, "SessionRunning") == 0) { - register_client (app); - } -} - -static void -is_session_running_ready_cb (GObject *source_object, - GAsyncResult *res, - gpointer user_data) -{ - GDBusProxy *proxy; - A11yBusLauncher *app = user_data; - GVariant *values; - GError *error = NULL; - gboolean is_running = FALSE; - - proxy = G_DBUS_PROXY (source_object); - values = g_dbus_proxy_call_finish (proxy, res, &error); - if (values) { - g_variant_get (values, "(b)", &is_running); - g_variant_unref (values); - } - if (is_running) { - register_client (app); - } - } - -static gboolean -session_manager_connect (A11yBusLauncher *app) -{ - GVariant *res; - GError *error = NULL; - - sm_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL, - SM_DBUS_NAME, - SM_DBUS_PATH, - SM_DBUS_INTERFACE, NULL, &error); - - if (error != NULL) - { - g_warning ("Failed to get session manager proxy: %s", error->message); - g_error_free (error); - - return FALSE; - } - - g_dbus_proxy_call (sm_proxy, - "IsSessionRunning", NULL, - 0, 1000, NULL, is_session_running_ready_cb, app); - - g_signal_connect (G_OBJECT (sm_proxy), "g-signal", - G_CALLBACK (on_session_signal), app); - - return (sm_proxy != NULL); + register_client (app); } static void @@ -651,9 +599,11 @@ const gchar *name, gpointer user_data) { - A11yBusLauncher *app = user_data; - - session_manager_connect (app); + g_bus_watch_name (G_BUS_TYPE_SESSION, + "org.gnome.SessionManager", + G_BUS_NAME_WATCHER_FLAGS_NONE, + name_appeared_handler, NULL, + user_data, NULL); } static int sigterm_pipefd[2]; diff -Nru at-spi2-core-2.22.0/bus/Makefile.in at-spi2-core-2.24.1/bus/Makefile.in --- at-spi2-core-2.22.0/bus/Makefile.in 2016-09-26 01:11:49.000000000 +0000 +++ at-spi2-core-2.24.1/bus/Makefile.in 2017-05-08 22:43:13.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,8 +91,6 @@ host_triplet = @host@ libexec_PROGRAMS = at-spi-bus-launcher$(EXEEXT) subdir = bus -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ @@ -91,6 +99,7 @@ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -203,6 +212,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \ + README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -420,7 +431,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign bus/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign bus/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -505,14 +515,14 @@ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -840,6 +850,8 @@ uninstall-dbusserviceDATA uninstall-default_sessionDATA \ uninstall-libexecPROGRAMS uninstall-systemd_userDATA +.PRECIOUS: Makefile + at-spi-dbus-bus.desktop: at-spi-dbus-bus.desktop.in sed -e$ $(substitutions) $< > $@.tmp && mv $@.tmp $@ diff -Nru at-spi2-core-2.22.0/config/ar-lib at-spi2-core-2.24.1/config/ar-lib --- at-spi2-core-2.22.0/config/ar-lib 2016-07-18 23:49:17.000000000 +0000 +++ at-spi2-core-2.24.1/config/ar-lib 2017-04-24 22:46:04.000000000 +0000 @@ -4,7 +4,7 @@ me=ar-lib scriptversion=2012-03-01.08; # UTC -# Copyright (C) 2010-2013 Free Software Foundation, Inc. +# Copyright (C) 2010-2014 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify diff -Nru at-spi2-core-2.22.0/config/compile at-spi2-core-2.24.1/config/compile --- at-spi2-core-2.22.0/config/compile 1970-01-01 00:00:00.000000000 +0000 +++ at-spi2-core-2.24.1/config/compile 2017-04-24 22:46:04.000000000 +0000 @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# 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, 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, see . + +# 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. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff -Nru at-spi2-core-2.22.0/config/config.guess at-spi2-core-2.24.1/config/config.guess --- at-spi2-core-2.22.0/config/config.guess 2016-07-18 23:49:17.000000000 +0000 +++ at-spi2-core-2.24.1/config/config.guess 2017-04-24 22:46:04.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-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 @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -589,8 +589,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi @@ -836,7 +837,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -979,10 +980,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-${VENDOR}-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1012,7 +1013,7 @@ echo powerpcle-${VENDOR}-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-${VENDOR}-linux-${LIBC} @@ -1270,16 +1271,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1371,154 +1382,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -257,7 +257,7 @@ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -265,6 +265,7 @@ | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -282,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -295,11 +298,11 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | 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 \ @@ -310,6 +313,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -324,7 +328,10 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -372,7 +379,7 @@ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -381,6 +388,7 @@ | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -400,8 +408,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -413,6 +423,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -430,6 +441,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -767,6 +779,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux @@ -794,7 +809,7 @@ os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -822,6 +837,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -830,7 +849,7 @@ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1039,12 +1058,18 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) + s390) basic_machine=s390-ibm ;; - s390x | s390x-*) + s390-*) + basic_machine=s390-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + s390x) basic_machine=s390x-ibm ;; + s390x-*) + basic_machine=s390x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sa29200) basic_machine=a29k-amd os=-udi @@ -1367,14 +1392,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1546,6 +1571,9 @@ c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1589,9 +1617,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -Nru at-spi2-core-2.22.0/config/depcomp at-spi2-core-2.24.1/config/depcomp --- at-spi2-core-2.22.0/config/depcomp 2016-07-18 23:49:18.000000000 +0000 +++ at-spi2-core-2.24.1/config/depcomp 2017-04-24 22:46:05.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # 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 diff -Nru at-spi2-core-2.22.0/config/install-sh at-spi2-core-2.24.1/config/install-sh --- at-spi2-core-2.22.0/config/install-sh 2016-07-18 23:49:17.000000000 +0000 +++ at-spi2-core-2.24.1/config/install-sh 2017-04-24 22:46:04.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/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"` - 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"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/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"` + 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"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru at-spi2-core-2.22.0/config/missing at-spi2-core-2.24.1/config/missing --- at-spi2-core-2.22.0/config/missing 2016-07-18 23:49:17.000000000 +0000 +++ at-spi2-core-2.24.1/config/missing 2017-04-24 22:46:04.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) diff -Nru at-spi2-core-2.22.0/config/test-driver at-spi2-core-2.24.1/config/test-driver --- at-spi2-core-2.22.0/config/test-driver 2016-07-18 23:49:17.000000000 +0000 +++ at-spi2-core-2.24.1/config/test-driver 2017-04-24 22:46:05.000000000 +0000 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC +scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # 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 @@ -44,35 +44,52 @@ Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. expect_failure=no color_tests=no enable_hard_errors=yes -while test $# -gt 0; do - case $1 in +while test $# -gt 1; do + arg=${1%=*} + val=${1#*=} + if [ $arg == $val ]; then + val=$2 + shift + fi + case $arg in --help) print_usage; exit $?;; --version) echo "test-driver $scriptversion"; exit $?;; - --test-name) test_name=$2; shift;; - --log-file) log_file=$2; shift;; - --trs-file) trs_file=$2; shift;; - --color-tests) color_tests=$2; shift;; - --expect-failure) expect_failure=$2; shift;; - --enable-hard-errors) enable_hard_errors=$2; shift;; - --) shift; break;; + --test-name) test_name=$val;; + --log-file) log_file=$val;; + --trs-file) trs_file=$val;; + --color-tests) color_tests=$val;; + --expect-failure) expect_failure=$val;; + --enable-hard-errors) enable_hard_errors=$val;; + --) break;; -*) usage_error "invalid option: '$1'";; esac - shift + [[ $arg != $val ]] && shift done +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='' # Red. @@ -94,11 +111,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -107,6 +127,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -Nru at-spi2-core-2.22.0/configure at-spi2-core-2.24.1/configure --- at-spi2-core-2.22.0/configure 2016-09-26 01:11:49.000000000 +0000 +++ at-spi2-core-2.24.1/configure 2017-05-08 22:43:13.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for at-spi2-core 2.22.0. +# Generated by GNU Autoconf 2.69 for at-spi2-core 2.24.1. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='at-spi2-core' PACKAGE_TARNAME='at-spi2-core' -PACKAGE_VERSION='2.22.0' -PACKAGE_STRING='at-spi2-core 2.22.0' +PACKAGE_VERSION='2.24.1' +PACKAGE_STRING='at-spi2-core 2.24.1' PACKAGE_BUGREPORT='accessibility-atspi@lists.linux-foundation.org' PACKAGE_URL='' @@ -1432,7 +1432,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 at-spi2-core 2.22.0 to adapt to many kinds of systems. +\`configure' configures at-spi2-core 2.24.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1506,7 +1506,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of at-spi2-core 2.22.0:";; + short | recursive ) echo "Configuration of at-spi2-core 2.24.1:";; esac cat <<\_ACEOF @@ -1643,7 +1643,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -at-spi2-core configure 2.22.0 +at-spi2-core configure 2.24.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2195,7 +2195,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by at-spi2-core $as_me 2.22.0, which was +It was created by at-spi2-core $as_me 2.24.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2592,7 +2592,7 @@ -am__api_version='1.13' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2784,7 +2784,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -3078,7 +3078,7 @@ # Define the identity of the package. PACKAGE='at-spi2-core' - VERSION='2.22.0' + VERSION='2.24.1' cat >>confdefs.h <<_ACEOF @@ -3112,8 +3112,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -3129,6 +3129,48 @@ +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # Support silent build rules. Disable # by either passing --disable-silent-rules to configure or passing V=1 @@ -3961,6 +4003,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -4261,7 +4362,13 @@ if ${am_cv_ar_interface+:} false; then : $as_echo_n "(cached) " >&6 else - am_cv_ar_interface=ar + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + am_cv_ar_interface=ar cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int some_variable = 0; @@ -4292,6 +4399,11 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5 @@ -15501,7 +15613,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by at-spi2-core $as_me 2.22.0, which was +This file was extended by at-spi2-core $as_me 2.24.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15567,7 +15679,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -at-spi2-core config.status 2.22.0 +at-spi2-core config.status 2.24.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru at-spi2-core-2.22.0/configure.ac at-spi2-core-2.24.1/configure.ac --- at-spi2-core-2.22.0/configure.ac 2016-09-26 01:11:31.000000000 +0000 +++ at-spi2-core-2.24.1/configure.ac 2017-05-08 22:43:02.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-core], [2.22.0], [accessibility-atspi@lists.linux-foundation.org]) +AC_INIT([at-spi2-core], [2.24.1], [accessibility-atspi@lists.linux-foundation.org]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) AC_CONFIG_MACRO_DIR([m4]) diff -Nru at-spi2-core-2.22.0/dbind/Makefile.in at-spi2-core-2.24.1/dbind/Makefile.in --- at-spi2-core-2.22.0/dbind/Makefile.in 2016-09-26 01:11:49.000000000 +0000 +++ at-spi2-core-2.24.1/dbind/Makefile.in 2017-05-08 22:43:13.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,8 +91,6 @@ TESTS = dbtest$(EXEEXT) check_PROGRAMS = dbtest$(EXEEXT) subdir = dbind -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/config/depcomp $(top_srcdir)/config/test-driver ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ @@ -91,6 +99,7 @@ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -375,6 +384,8 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/config/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp \ + $(top_srcdir)/config/test-driver DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -590,7 +601,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dbind/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign dbind/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -768,7 +778,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -1060,6 +1070,8 @@ pdf pdf-am ps ps-am recheck tags tags-am uninstall \ uninstall-am +.PRECIOUS: Makefile + -include $(top_srcdir)/git.mk diff -Nru at-spi2-core-2.22.0/debian/changelog at-spi2-core-2.24.1/debian/changelog --- at-spi2-core-2.22.0/debian/changelog 2017-03-22 23:37:56.000000000 +0000 +++ at-spi2-core-2.24.1/debian/changelog 2017-07-04 18:31:25.000000000 +0000 @@ -1,29 +1,35 @@ -at-spi2-core (2.22.0-5ubuntu4) zesty; urgency=medium +at-spi2-core (2.24.1-1) unstable; urgency=medium - * Add patch from upstream to stop crashes when accessible apps are shut down + * Team upload - -- Luke Yelavich Thu, 23 Mar 2017 10:37:56 +1100 + [ Jeremy Bicha ] + * New upstream release. + * Drop patches applied in new release: + - revert-register-late + - register-client-not-too-early + - git-329ef2c4ebcb3aec6dcfcac15357fd583a60c969 + - git-eba079f3e72e61e6b55d81727ab50c85d505d296 + + [ Samuel Thibault ] + * Use canonical anonscm vcs URL. + * control: Update maintainer mailing list. + * re-enable PIE, gobject-introspection doesn't pose problem any more + (Closes: Bug#865597). + + [ Paul Gevers ] + * Rewrite d/copyright + + -- Paul Gevers Tue, 04 Jul 2017 20:31:25 +0200 + +at-spi2-core (2.22.0-6) unstable; urgency=medium + + * patches/git-329ef2c4ebcb3aec6dcfcac15357fd583a60c969: + clear root accessible's ref to the app, fixes Orca sometimes hanging when + apps are quit. + * patches/git-eba079f3e72e61e6b55d81727ab50c85d505d296: + atspi_table_cell_get_position: don't crash on error -at-spi2-core (2.22.0-5ubuntu3) zesty; urgency=medium - - * Drop extra systemd service, it doesn't really help us in all - circumstances, and at-spi-dbus-bus not being loaded is a problem - that probably needs solvnig further up the stack - - -- Luke Yelavich Fri, 03 Mar 2017 16:18:08 +1100 - -at-spi2-core (2.22.0-5ubuntu2) zesty; urgency=medium - - * Move the systemd service into graphical-session-pre.target.wants, so - a11y works properly in MATE as well - - -- Luke Yelavich Fri, 24 Feb 2017 10:27:52 +1100 - -at-spi2-core (2.22.0-5ubuntu1) zesty; urgency=medium - - * Add systemd service file to start at-spi when Unity 7 is started - - -- Luke Yelavich Thu, 09 Feb 2017 19:46:44 +1100 + -- Samuel Thibault Tue, 09 May 2017 21:44:08 +0200 at-spi2-core (2.22.0-5) unstable; urgency=medium diff -Nru at-spi2-core-2.22.0/debian/control at-spi2-core-2.24.1/debian/control --- at-spi2-core-2.22.0/debian/control 2017-03-03 04:37:55.000000000 +0000 +++ at-spi2-core-2.24.1/debian/control 2017-06-28 20:23:20.000000000 +0000 @@ -1,8 +1,7 @@ Source: at-spi2-core Section: misc Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Accessibility Team +Maintainer: Debian Accessibility Team Uploaders: Samuel Thibault , Jordi Mallach Vcs-Browser: https://anonscm.debian.org/git/pkg-a11y/at-spi2-core.git Vcs-Git: https://anonscm.debian.org/git/pkg-a11y/at-spi2-core.git diff -Nru at-spi2-core-2.22.0/debian/copyright at-spi2-core-2.24.1/debian/copyright --- at-spi2-core-2.22.0/debian/copyright 2016-10-20 10:20:26.000000000 +0000 +++ at-spi2-core-2.24.1/debian/copyright 2017-06-30 17:52:08.000000000 +0000 @@ -1,118 +1,361 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: at-spi2-core -Source: http://download.gnome.org/sources/at-spi2-core/ +Source: https://download.gnome.org/sources/at-spi2-core/ -Files: registryd/de-marshaller.c -Copyright: Copyright 2008 Novell, Inc. +Files: * +Copyright: 2001-2003 Sun Microsystems Inc. + 2001-2003 Ximian, Inc. + 2007 IBM Corp. + 2008 Novell, Inc. + 2008-2010 Codethink Ltd. +License: LGPL-2+ + +Files: Makefile.in + aclocal.m4 +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. +License: LGPL-2+ + +Files: atspi/* +Copyright: 2010, 2011, Novell, Inc. + 2002, Ximian, Inc. +License: LGPL-2+ + +Files: atspi/Makefile.am + atspi/atspi-enum-types.c + atspi/atspi-enum-types.c.template + atspi/atspi-enum-types.h + atspi/atspi-enum-types.h.template +Copyright: 2001-2003 Sun Microsystems Inc. + 2001-2003 Ximian, Inc. + 2007 IBM Corp. + 2008 Novell, Inc. + 2008-2010 Codethink Ltd. +License: LGPL-2+ + +Files: atspi/Makefile.in +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. +License: LGPL-2+ + +Files: atspi/atspi-accessible.c + atspi/atspi-hyperlink.c + atspi/atspi-hypertext.c + atspi/atspi-image.c + atspi/atspi-matchrule.c + atspi/atspi-misc.c + atspi/atspi-relation.c + atspi/atspi-selection.c + atspi/atspi-stateset.c + atspi/atspi-stateset.h + atspi/atspi-table.c + atspi/atspi-text.c + atspi/atspi-value.c +Copyright: 2010, 2011, Novell, Inc. + 2001, 2002, Ximian, Inc. + 2001, 2002, Sun Microsystems Inc. +License: LGPL-2+ + +Files: atspi/atspi-action.c + atspi/atspi-application.c + atspi/atspi-component.c + atspi/atspi-document.c + atspi/atspi-editabletext.c + atspi/atspi-object.c + atspi/atspi-registry.c + atspi/atspi.h +Copyright: 2001, 2002, Ximian, Inc. + 2001, 2002, Sun Microsystems Inc. +License: LGPL-2+ + +Files: atspi/atspi-action.h + atspi/atspi-application.h + atspi/atspi-component.h + atspi/atspi-device-listener-private.h + atspi/atspi-document.h + atspi/atspi-editabletext.h + atspi/atspi-object.h + atspi/atspi-private.h + atspi/atspi-registry.h + atspi/atspi-types.h +Copyright: 2002, Ximian, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: registryd/registry.c -Copyright: Copyright 2008, 2010 Codethink Ltd. - Copyright 2001, 2002 Sun Microsystems Inc. - Copyright 2001, 2002 Ximian, Inc. +Files: atspi/atspi-collection.c +Copyright: 2010, 2011, Novell, Inc. + 2007, IBM Corp. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: registryd/deviceeventcontroller.c registryd/deviceeventcontroller-x11.c -Copyright: Copyright 2001, 2003 Sun Microsystems Inc. - Copyright 2001, 2002 Ximian, Inc. +Files: atspi/atspi-constants.h +Copyright: 2012, SUSE LINUX Products GmbH, Nuernberg, Germany. + 2010, 2011, Novell, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Lesser General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: registryd/reentrant-list.c registryd/registry-main.c -Copyright: Copyright 2001, 2002 Sun Microsystems Inc. - Copyright 2001, 2002 Ximian, Inc. +Files: atspi/atspi-device-listener.c + atspi/atspi-event-listener.c +Copyright: 2010, 2011, Novell, Inc. + 2002, Ximian Inc. + 2002, Sun Microsystems, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Lesser General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: registryd/display.c registryd/event-source.c -Copyright: Copyright 2009 Nokia. +Files: atspi/atspi-gmain.c +Copyright: 2005, Red Hat, Inc. + 2002, 2003, CodeFactory AB +License: AFL-2.1 or GPL-2+ + +Files: atspi/atspi-gmain.h +Copyright: Copyright 2002, 2003 CodeFactory AB + Copyright 2005 Red Hat, Inc. +License: AFL-2.1 or GPL-2+ + +Files: atspi/atspi-table-cell.c +Copyright: 2013, SUSE LLC. + 2001, 2002, Ximian, Inc. + 2001, 2002, Sun Microsystems Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Lesser General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: registryd/ucs2keysym.c -Copyright: Copyright Markus G. Kuhn, http://www.cl.cam.ac.uk/~mgk25/ University of Cambridge, April 2001 -License: Public domain +Files: bus/Makefile.in +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. +License: LGPL-2+ -Files: atspi/atspi-accessible.c atspi/atspi-action.c atspi/atspi-application.c - atspi/atspi-component.c atspi/atspi-document.c atspi/atspi-editabletext.c - atspi/atspi.h atspi/atspi-hyperlink.c atspi/atspi-hypertext.c - atspi/atspi-image.c atspi/atspi-matchrule.c atspi/atspi-misc.c - atspi/atspi-object.c atspi/atspi-registry.c atspi/atspi-relation.c - atspi/atspi-selection.c atspi/atspi-table.c atspi/atspi-text.c - atspi/atspi-value.c -Copyright: Copyright 2001, 2002 Ximian, Inc - Copyright 2001, 2002 Sun Microsystems Inc. -License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. - -Files: atspi/atspi-accessible.h atspi/atspi-action.h atspi/atspi-application.h - atspi/atspi-collection.h atspi/atspi-component.h atspi/atspi-device-listener.h - atspi/atspi-device-listener-private.h atspi/atspi-document.h - atspi/atspi-editabletext.h atspi/atspi-event-listener.h - atspi/atspi-event-listener-private.h atspi/atspi-device-listener.c - atspi/atspi-event-listener.c atspi/atspi-hyperlink.h atspi/atspi-hypertext.h - atspi/atspi-image.h atspi/atspi-matchrule.h atspi/atspi-matchrule-private.h - atspi/atspi-misc.h atspi/atspi-misc-private.h atspi/atspi-object.h - atspi/atspi-private.h atspi/atspi-registry.h atspi/atspi-relation.h - atspi/atspi-selection.h atspi/atspi-table.h atspi/atspi-text.h - atspi/atspi-types.h atspi/atspi-value.h -Copyright: Copyright 2002 Ximian Inc - Copyright 2002 Sun Microsystems, Inc +Files: bus/at-spi-bus-launcher.c +Copyright: 2011, Red Hat, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: atspi/atspi-constants.h -Copyright: Copyright 2010, 2011 Novell, Inc. - Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +Files: config/* +Copyright: 1996-2014, Free Software Foundation, Inc. +License: GPL-2+ + +Files: config/config.guess + config/config.sub +Copyright: 1992-2014, Free Software Foundation, Inc. +License: GPL-3 + +Files: config/install-sh +Copyright: 1994, X Consortium +License: Expat + +Files: configure +Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc. +License: Unlimited + +Files: dbind/* +Copyright: 2008-2011, Novell, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: atspi/atspi-collection.c -Copyright: Copyright: 2007 IBM Corp +Files: dbind/Makefile.in +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: atspi/atspi-stateset.* -Copyright: 2001, 2002 Sun Microsystems Inc. - 2001, 2002 Ximian, Inc. - 2010, 2011 Novell, Inc. +Files: debian/* +Copyright: Copyright 2009, Mario Lang +License: GPL-2 + +Files: doc/Makefile.in +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: atspi/atspi-gmain.c atspi/atspi-gmain.h -Copyright: Copyright 2002, 2003 CodeFactory AB - Copyright 2005 Red Hat, Inc. +Files: doc/libatspi/Makefile.in +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: dbind/*.[ch] -Copyright: 2008-2011 Novell, Inc. +Files: m4/* +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: bus/at-spi-bus-launcher.c -Copyright: Copyright 2011 Red Hat, Inc. +Files: m4/gtk-doc.m4 +Copyright: 2001-2003 Sun Microsystems Inc. + 2001-2003 Ximian, Inc. + 2007 IBM Corp. + 2008 Novell, Inc. + 2008-2010 Codethink Ltd. License: LGPL-2+ - On Debian systems the full text of the GNU Library General Public License can - be found in the `/usr/share/common-licenses/LGPL-2' file. -Files: debian/* -Copyright: Copyright 2009, Mario Lang +Files: m4/intltool.m4 +Copyright: 2001, Eazel, Inc. +License: GPL-2+ + +Files: m4/introspection.m4 +Copyright: 2009, Johan Dahlin +License: LGPL-2+ + +Files: m4/libtool.m4 +Copyright: 1996-2001, 2003-2011, Free Software +License: GPL-2+ + +Files: m4/ltoptions.m4 +Copyright: 2004, 2005, 2007-2009, 2011, 2015, Free Software Foundation +License: LGPL-2+ + +Files: po/Makefile.in.in +Copyright: 2004-2008, Rodney Dawes + 1995-1997, Ulrich Drepper +License: LGPL-2+ + +Files: po/bg.po +Copyright: 2004, 2005, 2007-2009, 2011, 2015, Free Software Foundation +License: LGPL-2+ + +Files: po/bs.po +Copyright: 2013, Rosetta Contributors and Canonical Ltd 2013 +License: LGPL-2+ + +Files: po/eo.po + po/ga.po + po/it.po + po/sq.po + po/sv.po +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. +License: LGPL-2+ + +Files: po/fa.po +Copyright: 2011, Iranian Free Software Users Group (IFSUG.org)translation team. +License: LGPL-2+ + +Files: po/fi.po +Copyright: 2011, Tommi Vainikainen +License: LGPL-2+ + +Files: po/fr.po + po/oc.po +Copyright: 2011, Listed translators +License: LGPL-2+ + +Files: po/sk.po +Copyright: 2012, Free Software Foundation, Inc +License: LGPL-2+ + +Files: po/tr.po +Copyright: 2011, the Free Software Foundation, Inc. +License: LGPL-2+ + +Files: registryd/* +Copyright: 2001, 2002, Ximian, Inc. + 2001, 2002, Sun Microsystems Inc. +License: LGPL-2+ + +Files: registryd/Makefile.am + registryd/introspection.c + registryd/introspection.h + registryd/org.a11y.atspi.Registry.service.in +Copyright: 2001-2003 Sun Microsystems Inc. + 2001-2003 Ximian, Inc. + 2007 IBM Corp. + 2008 Novell, Inc. + 2008-2010 Codethink Ltd. +License: LGPL-2+ + +Files: registryd/Makefile.in +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. +License: LGPL-2+ + +Files: registryd/de-marshaller.c +Copyright: 2008-2011, Novell, Inc. +License: LGPL-2+ + +Files: registryd/de-marshaller.h + registryd/de-types.h +Copyright: 2009, Codethink Ltd + 2001, 2002, Ximian, Inc. + 2001, 2002, Sun Microsystems Inc. +License: LGPL-2+ + +Files: registryd/deviceeventcontroller-x11.c + registryd/deviceeventcontroller.c +Copyright: 2001, 2003, Sun Microsystems Inc. + 2001, 2002, Ximian, Inc. +License: LGPL-2+ + +Files: registryd/display.c + registryd/display.h + registryd/event-source.c + registryd/event-source.h +Copyright: 2009, Nokia. +License: LGPL-2+ + +Files: registryd/registry.c +Copyright: 2008, 2010, Codethink Ltd. + 2001, 2002, Ximian, Inc. + 2001, 2002, Sun Microsystems Inc. +License: LGPL-2+ + +Files: registryd/ucs2keysym.c +Copyright: NA +License: public-domain + This software is in the public domain. Share and enjoy! + +Files: test/Makefile.in +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. +License: LGPL-2+ + +Files: xml/Makefile.in +Copyright: 1991, 1994-2014, Free Software Foundation, Inc. +License: LGPL-2+ + +License: AFL-2.1 + Licensed under the Academic Free License version 2.1 + +License: Expat + The MIT License + . + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the Software + without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to + whom the Software is furnished to do so, subject to the + following conditions: + . + The above copyright notice and this permission notice shall + be included in all copies or substantial portions of the + Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT + WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE AND NONINFRINGEMENT. IN NO EVENT + SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + License: GPL-2 - On Debian systems the full text of the GNU General Public License can be found - in the `/usr/share/common-licenses/GPL-2' file. + 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; version 2 dated June, 1991. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-2'. + +License: GPL-2+ + 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; version 2 dated June, 1991, or (at + your option) any later version. + . + On Debian systems, the complete text of version 2 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-2'. + +License: GPL-3 + 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; version 3 dated June, 2007. + . + On Debian systems, the complete text of version 3 of the GNU General + Public License can be found in '/usr/share/common-licenses/GPL-3'. + +License: LGPL-2+ + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by the + Free Software Foundation; version 2 of the License, or (at + your option) any later version. + . + On Debian systems, the complete text of version 2 of the GNU Library + General Public License can be found in `/usr/share/common-licenses/LGPL-2'. + +License: Unlimited + This configure script is free software; the Free Software Foundation + gives unlimited permission to copy, distribute and modify it. diff -Nru at-spi2-core-2.22.0/debian/gbp.conf at-spi2-core-2.24.1/debian/gbp.conf --- at-spi2-core-2.22.0/debian/gbp.conf 2017-03-03 04:37:55.000000000 +0000 +++ at-spi2-core-2.24.1/debian/gbp.conf 2017-06-27 19:51:04.000000000 +0000 @@ -1,3 +1,2 @@ [DEFAULT] pristine-tar = True -debian-branch = ubuntu diff -Nru at-spi2-core-2.22.0/debian/patches/0001-atspi_application_dispose-clear-root-accessible-s-re.patch at-spi2-core-2.24.1/debian/patches/0001-atspi_application_dispose-clear-root-accessible-s-re.patch --- at-spi2-core-2.22.0/debian/patches/0001-atspi_application_dispose-clear-root-accessible-s-re.patch 2017-03-22 23:03:43.000000000 +0000 +++ at-spi2-core-2.24.1/debian/patches/0001-atspi_application_dispose-clear-root-accessible-s-re.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From f26e079504df24446bdbcc351c54771ca387d2be Mon Sep 17 00:00:00 2001 -From: Mike Gorse -Date: Tue, 24 Jan 2017 18:10:52 -0600 -Subject: [PATCH] atspi_application_dispose: clear root accessible's ref to the - app - -Hoping that this might fix https://bugzilla.gnome.org/show_bug.cgi?id=767074 ---- - atspi/atspi-application.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/atspi/atspi-application.c b/atspi/atspi-application.c -index 65cabdc..f7dd225 100644 ---- a/atspi/atspi-application.c -+++ b/atspi/atspi-application.c -@@ -58,6 +58,7 @@ atspi_application_dispose (GObject *object) - - if (application->root) - { -+ g_clear_object (&application->root->parent.app); - g_object_unref (application->root); - application->root = NULL; - } --- -2.11.0 - diff -Nru at-spi2-core-2.22.0/debian/patches/register-client-not-too-early at-spi2-core-2.24.1/debian/patches/register-client-not-too-early --- at-spi2-core-2.22.0/debian/patches/register-client-not-too-early 2017-02-09 06:10:13.000000000 +0000 +++ at-spi2-core-2.24.1/debian/patches/register-client-not-too-early 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -commit 685ad09cf927b0f48727839c13a01478154ca863 -Author: Alberts Muktupāvels -Date: Sun Dec 4 15:42:01 2016 +0200 - - at-spi-bus-launcher: session management fixes - -diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c -index 54aa07f..93d8fad 100644 ---- a/bus/at-spi-bus-launcher.c -+++ b/bus/at-spi-bus-launcher.c -@@ -205,6 +205,17 @@ register_client (A11yBusLauncher *app) - } - - static void -+name_appeared_handler (GDBusConnection *connection, -+ const gchar *name, -+ const gchar *name_owner, -+ gpointer user_data) -+{ -+ A11yBusLauncher *app = user_data; -+ -+ register_client (app); -+} -+ -+static void - setup_bus_child (gpointer data) - { - A11yBusLauncher *app = data; -@@ -588,9 +599,11 @@ on_name_acquired (GDBusConnection *connection, - const gchar *name, - gpointer user_data) - { -- A11yBusLauncher *app = user_data; -- -- register_client (app); -+ g_bus_watch_name (G_BUS_TYPE_SESSION, -+ "org.gnome.SessionManager", -+ G_BUS_NAME_WATCHER_FLAGS_NONE, -+ name_appeared_handler, NULL, -+ user_data, NULL); - } - - static int sigterm_pipefd[2]; diff -Nru at-spi2-core-2.22.0/debian/patches/revert-register-late at-spi2-core-2.24.1/debian/patches/revert-register-late --- at-spi2-core-2.22.0/debian/patches/revert-register-late 2017-02-09 06:02:33.000000000 +0000 +++ at-spi2-core-2.24.1/debian/patches/revert-register-late 1970-01-01 00:00:00.000000000 +0000 @@ -1,199 +0,0 @@ -See https://bugzilla.gnome.org/show_bug.cgi?id=774441 -This series reverts some commits, before another proposed fix - -commit f66c04544575532849a60b1d145fd69fc0261352 -Author: Ting-Wei Lan -Date: Sat Jul 16 21:12:08 2016 +0800 - - Fix return value error in session_manager_connect - - https://bugzilla.gnome.org/show_bug.cgi?id=768881 - -diff --git b/bus/at-spi-bus-launcher.c a/bus/at-spi-bus-launcher.c -index 5125180..9a17c50 100644 ---- b/bus/at-spi-bus-launcher.c -+++ a/bus/at-spi-bus-launcher.c -@@ -254,7 +254,7 @@ session_manager_connect (A11yBusLauncher *app) - g_warning ("Failed to get session manager proxy: %s", error->message); - g_error_free (error); - -- return FALSE; -+ return; - } - - g_dbus_proxy_call (sm_proxy, -commit 995a8cd70cad2a1e8d434a59d87e8cebd5817612 -Author: Mike Gorse -Date: Wed Jul 27 11:59:29 2016 -0500 - - At-spi-bus-launcher: fix uninitialized variable - -diff --git b/bus/at-spi-bus-launcher.c a/bus/at-spi-bus-launcher.c -index 9a17c50..50e76f4 100644 ---- b/bus/at-spi-bus-launcher.c -+++ a/bus/at-spi-bus-launcher.c -@@ -225,7 +225,7 @@ is_session_running_ready_cb (GObject *source_object, - A11yBusLauncher *app = user_data; - GVariant *values; - GError *error = NULL; -- gboolean is_running = FALSE; -+ gboolean is_running; - - proxy = G_DBUS_PROXY (source_object); - values = g_dbus_proxy_call_finish (proxy, res, &error); -commit 253ada975e0a374e7b1a6a07d2a483dd1d8c52fa -Author: Mike Gorse -Date: Thu Jul 14 11:38:25 2016 -0500 - - at-spi-bus-launcher: session management fixes - - At-spi-bus-launcher was attempting to register with gnome-session but - typically failed because it was started before gnome-session is initialized. - Now we check whether gnome-session is running and only attempt to register - if it is; otherwise watch for SessionRunning and register when se wee it. - - Also, handle SessionOver. - -diff --git b/bus/at-spi-bus-launcher.c a/bus/at-spi-bus-launcher.c -index 50e76f4..54aa07f 100644 ---- b/bus/at-spi-bus-launcher.c -+++ a/bus/at-spi-bus-launcher.c -@@ -61,11 +61,6 @@ typedef struct { - char *a11y_launch_error_message; - } A11yBusLauncher; - --#define SM_DBUS_NAME "org.gnome.SessionManager" --#define SM_DBUS_PATH "/org/gnome/SessionManager" --#define SM_DBUS_INTERFACE "org.gnome.SessionManager" -- --#define SM_CLIENT_DBUS_INTERFACE "org.gnome.SessionManager.ClientPrivate" - static A11yBusLauncher *_global_app = NULL; - - static const gchar introspection_xml[] = -@@ -134,12 +129,11 @@ client_proxy_ready_cb (GObject *source_object, - G_CALLBACK (g_signal_cb), app); - } - --static GDBusProxy *sm_proxy; -- - static void - register_client (A11yBusLauncher *app) - { - GDBusProxyFlags flags; -+ GDBusProxy *sm_proxy; - GError *error; - const gchar *app_id; - const gchar *autostart_id; -@@ -147,12 +141,24 @@ register_client (A11yBusLauncher *app) - GVariant *parameters; - GVariant *variant; - gchar *object_path; -- static gboolean session_registered = FALSE; - -- if (session_registered) -- return; -+ flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | -+ G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS; - - error = NULL; -+ sm_proxy = g_dbus_proxy_new_sync (app->session_bus, flags, NULL, -+ "org.gnome.SessionManager", -+ "/org/gnome/SessionManager", -+ "org.gnome.SessionManager", -+ NULL, &error); -+ -+ if (error != NULL) -+ { -+ g_warning ("Failed to get session manager proxy: %s", error->message); -+ g_error_free (error); -+ -+ return; -+ } - - app_id = "at-spi-bus-launcher"; - autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID"); -@@ -196,75 +202,6 @@ register_client (A11yBusLauncher *app) - NULL, client_proxy_ready_cb, app); - - g_free (object_path); -- -- session_registered = TRUE; --} -- --static void --on_session_signal (GDBusProxy *proxy, -- gchar *sender_name, -- gchar *signal_name, -- GVariant *parameters, -- gpointer user_data) --{ -- A11yBusLauncher *app = user_data; -- -- if (g_strcmp0 (signal_name, "SessionOver") == 0) { -- g_main_loop_quit (app->loop); -- } else if (g_strcmp0 (signal_name, "SessionRunning") == 0) { -- register_client (app); -- } --} -- --static void --is_session_running_ready_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GDBusProxy *proxy; -- A11yBusLauncher *app = user_data; -- GVariant *values; -- GError *error = NULL; -- gboolean is_running; -- -- proxy = G_DBUS_PROXY (source_object); -- values = g_dbus_proxy_call_finish (proxy, res, &error); -- if (values) { -- g_variant_get (values, "(b)", &is_running); -- g_variant_unref (values); -- } -- if (is_running) { -- register_client (app); -- } -- } -- --static gboolean --session_manager_connect (A11yBusLauncher *app) --{ -- GVariant *res; -- GError *error = NULL; -- -- sm_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, 0, NULL, -- SM_DBUS_NAME, -- SM_DBUS_PATH, -- SM_DBUS_INTERFACE, NULL, &error); -- -- if (error != NULL) -- { -- g_warning ("Failed to get session manager proxy: %s", error->message); -- g_error_free (error); -- -- return; -- } -- -- g_dbus_proxy_call (sm_proxy, -- "IsSessionRunning", NULL, -- 0, 1000, NULL, is_session_running_ready_cb, app); -- -- g_signal_connect (G_OBJECT (sm_proxy), "g-signal", -- G_CALLBACK (on_session_signal), app); -- -- return (sm_proxy != NULL); - } - - static void -@@ -653,7 +590,7 @@ on_name_acquired (GDBusConnection *connection, - { - A11yBusLauncher *app = user_data; - -- session_manager_connect (app); -+ register_client (app); - } - - static int sigterm_pipefd[2]; diff -Nru at-spi2-core-2.22.0/debian/patches/series at-spi2-core-2.24.1/debian/patches/series --- at-spi2-core-2.22.0/debian/patches/series 2017-03-22 23:24:18.000000000 +0000 +++ at-spi2-core-2.24.1/debian/patches/series 2017-06-27 19:51:04.000000000 +0000 @@ -1,4 +1 @@ at-spi-by-default -revert-register-late -register-client-not-too-early -0001-atspi_application_dispose-clear-root-accessible-s-re.patch diff -Nru at-spi2-core-2.22.0/debian/rules at-spi2-core-2.24.1/debian/rules --- at-spi2-core-2.22.0/debian/rules 2017-02-09 06:02:33.000000000 +0000 +++ at-spi2-core-2.24.1/debian/rules 2017-06-28 20:23:20.000000000 +0000 @@ -1,8 +1,6 @@ #!/usr/bin/make -f -export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-pie -export DEB_CFLAGS_MAINT_APPEND = -no-pie -fno-pie -fno-PIE -export DEB_LDFLAGS_MAINT_APPEND = -no-pie +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ --with autoreconf diff -Nru at-spi2-core-2.22.0/doc/libatspi/html/api-index-full.html at-spi2-core-2.24.1/doc/libatspi/html/api-index-full.html --- at-spi2-core-2.22.0/doc/libatspi/html/api-index-full.html 2016-09-26 01:12:22.000000000 +0000 +++ at-spi2-core-2.24.1/doc/libatspi/html/api-index-full.html 2017-05-08 22:43:17.000000000 +0000 @@ -1079,6 +1079,10 @@
+atspi_table_cell_get_position, function in atspi-table-cell +
+
+
atspi_table_cell_get_row_column_span, function in atspi-table-cell
diff -Nru at-spi2-core-2.22.0/doc/libatspi/html/index.html at-spi2-core-2.24.1/doc/libatspi/html/index.html --- at-spi2-core-2.22.0/doc/libatspi/html/index.html 2016-09-26 01:12:22.000000000 +0000 +++ at-spi2-core-2.24.1/doc/libatspi/html/index.html 2017-05-08 22:43:17.000000000 +0000 @@ -15,7 +15,7 @@

- for libatspi 2.22.0 + for libatspi 2.25.1 . The latest version of this documentation can be found on-line at http://developer.gnome.org/libatspi/. diff -Nru at-spi2-core-2.22.0/doc/libatspi/html/libatspi-atspi-constants.html at-spi2-core-2.24.1/doc/libatspi/html/libatspi-atspi-constants.html --- at-spi2-core-2.22.0/doc/libatspi/html/libatspi-atspi-constants.html 2016-09-26 01:12:22.000000000 +0000 +++ at-spi2-core-2.24.1/doc/libatspi/html/libatspi-atspi-constants.html 2017-05-08 22:43:17.000000000 +0000 @@ -2316,7 +2316,7 @@

ATSPI_ROLE_EXTENDED

means that the role for this item is known, but not -included in the core enumeration.

+included in the core enumeration. Deprecated since 2.24.

  diff -Nru at-spi2-core-2.22.0/doc/libatspi/html/libatspi-atspi-table-cell.html at-spi2-core-2.24.1/doc/libatspi/html/libatspi-atspi-table-cell.html --- at-spi2-core-2.22.0/doc/libatspi/html/libatspi-atspi-table-cell.html 2016-09-26 01:12:22.000000000 +0000 +++ at-spi2-core-2.24.1/doc/libatspi/html/libatspi-atspi-table-cell.html 2017-05-08 22:43:17.000000000 +0000 @@ -83,6 +83,14 @@ +gint + + +atspi_table_cell_get_position () + + + + void @@ -167,6 +175,15 @@
+

atspi_table_cell_get_position ()

+
gint
+atspi_table_cell_get_position (AtspiTableCell *obj,
+                               gint *row,
+                               gint *column,
+                               GError **error);
+
+
+

atspi_table_cell_get_row_column_span ()

void
 atspi_table_cell_get_row_column_span (AtspiTableCell *obj,
diff -Nru at-spi2-core-2.22.0/doc/libatspi/html/libatspi.devhelp2 at-spi2-core-2.24.1/doc/libatspi/html/libatspi.devhelp2
--- at-spi2-core-2.22.0/doc/libatspi/html/libatspi.devhelp2	2016-09-26 01:12:21.000000000 +0000
+++ at-spi2-core-2.24.1/doc/libatspi/html/libatspi.devhelp2	2017-05-08 22:43:17.000000000 +0000
@@ -203,6 +203,7 @@
     
     
     
+    
     
     
     
diff -Nru at-spi2-core-2.22.0/doc/libatspi/Makefile.in at-spi2-core-2.24.1/doc/libatspi/Makefile.in
--- at-spi2-core-2.22.0/doc/libatspi/Makefile.in	2016-09-26 01:11:49.000000000 +0000
+++ at-spi2-core-2.24.1/doc/libatspi/Makefile.in	2017-05-08 22:43:13.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,17 @@
 # Everything below here is generic #
 ####################################
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -83,8 +93,6 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \
-	$(srcdir)/Makefile.am $(srcdir)/version.xml.in
 subdir = doc/libatspi
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
@@ -94,6 +102,7 @@
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version.xml
@@ -118,6 +127,8 @@
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.xml.in \
+	$(top_srcdir)/gtk-doc.make
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -465,7 +476,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/libatspi/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign doc/libatspi/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -474,7 +484,7 @@
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/gtk-doc.make:
+$(top_srcdir)/gtk-doc.make $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -651,6 +661,8 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am uninstall-local
 
+.PRECIOUS: Makefile
+
 
 gtkdoc-check.test: Makefile
 	$(AM_V_GEN)echo "#!/bin/sh -e" > $@; \
diff -Nru at-spi2-core-2.22.0/doc/Makefile.in at-spi2-core-2.24.1/doc/Makefile.in
--- at-spi2-core-2.22.0/doc/Makefile.in	2016-09-26 01:11:49.000000000 +0000
+++ at-spi2-core-2.24.1/doc/Makefile.in	2017-05-08 22:43:13.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,7 +88,6 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
@@ -87,6 +96,7 @@
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -146,6 +156,7 @@
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -365,7 +376,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign doc/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -660,6 +670,8 @@
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 -include $(top_srcdir)/git.mk
 
diff -Nru at-spi2-core-2.22.0/Makefile.in at-spi2-core-2.24.1/Makefile.in
--- at-spi2-core-2.22.0/Makefile.in	2016-09-26 01:11:49.000000000 +0000
+++ at-spi2-core-2.24.1/Makefile.in	2017-05-08 22:43:13.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -79,17 +89,6 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/config.h.in $(srcdir)/atspi-2.pc.in \
-	$(srcdir)/atspi-2-uninstalled.pc.in AUTHORS COPYING INSTALL \
-	NEWS README config/ar-lib config/config.guess \
-	config/config.sub config/depcomp config/install-sh \
-	config/missing config/ltmain.sh $(top_srcdir)/config/ar-lib \
-	$(top_srcdir)/config/config.guess \
-	$(top_srcdir)/config/config.sub \
-	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
-	$(top_srcdir)/config/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
@@ -98,6 +97,8 @@
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -190,6 +191,16 @@
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in \
+	$(srcdir)/atspi-2-uninstalled.pc.in $(srcdir)/atspi-2.pc.in \
+	$(srcdir)/config.h.in $(top_srcdir)/config/ar-lib \
+	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
+	$(top_srcdir)/config/config.sub \
+	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
+	$(top_srcdir)/config/missing AUTHORS COPYING INSTALL NEWS \
+	README config/ar-lib config/compile config/config.guess \
+	config/config.sub config/depcomp config/install-sh \
+	config/ltmain.sh config/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -452,7 +463,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -473,8 +483,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -692,7 +702,7 @@
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
 	$(am__post_remove_distdir)
 
 dist-bzip2: distdir
@@ -707,11 +717,17 @@
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	@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
 	$(am__post_remove_distdir)
 
 dist-zip: distdir
@@ -729,7 +745,7 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lz*) \
@@ -739,22 +755,23 @@
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
 	chmod -R a-w $(distdir)
 	chmod u+w $(distdir)
-	mkdir $(distdir)/_build $(distdir)/_inst
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -936,6 +953,8 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-pkgconfigDATA
 
+.PRECIOUS: Makefile
+
 
 -include $(INTROSPECTION_MAKEFILE)
 
diff -Nru at-spi2-core-2.22.0/NEWS at-spi2-core-2.24.1/NEWS
--- at-spi2-core-2.22.0/NEWS	2016-09-26 01:11:21.000000000 +0000
+++ at-spi2-core-2.24.1/NEWS	2017-05-08 22:43:02.000000000 +0000
@@ -1,3 +1,27 @@
+What's new in at-spi2-core 2.24.1:
+
+* atspi_table_cell_get_position: Don't crash on error.
+
+What's new in at-spi2-core 2.23.92:
+
+* Table cell API fixes (bgo#779835).
+
+What's new in at-spi2-core 2.23.90:
+
+* Fix an occasional crash when an application is closed (bgo#767074).
+
+What's new in at-spi2-core 2.23.4:
+
+* Don't pull in X headers if x11 is disabled (bgo#773710).
+
+* at-spi-bus-launcher: session management fixes (bgo#774441).
+
+
+* events: add recently added page changed event (bgo#719898).
+
+* roles: EXTENDED roles are deprecated (bgo#W720123).
+    
+
 What's new in at-spi2-core 2.2.0:
 
 * at-spi-bus-launcher: fix uninitialized variable.
diff -Nru at-spi2-core-2.22.0/po/be.po at-spi2-core-2.24.1/po/be.po
--- at-spi2-core-2.22.0/po/be.po	2013-11-18 16:19:37.000000000 +0000
+++ at-spi2-core-2.24.1/po/be.po	2017-04-24 22:42:13.000000000 +0000
@@ -1,84 +1,79 @@
+# Yuras Shumovich , 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: at-spi2-core.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-04-23 15:10+0200\n"
-"PO-Revision-Date: 2011-04-23 16:08+0200\n"
-"Last-Translator: Ігар \n"
-"Language-Team: LANGUAGE \n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=at-"
+"spi&keywords=I18N+L10N&component=at-spi2-core\n"
+"POT-Creation-Date: 2017-03-13 21:58+0000\n"
+"PO-Revision-Date: 2017-03-26 18:30+0300\n"
+"Last-Translator: Yuras Shumovich \n"
+"Language-Team: Belarusian \n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Pootle 2.1.6\n"
-
-#: ../atspi/atspi-misc.c:290
-msgid "AT-SPI: Unknown signature %s for RemoveAccessible"
-msgstr "AT-SPI: Невядомы подпіс %s для RemoveAccessible"
-
-#: ../atspi/atspi-misc.c:327
-msgid "AT-SPI: Error calling getRoot for %s: %s"
-msgstr "AT-SPI: Памылка выкліку getRoot для %s: %s"
-
-#: ../atspi/atspi-misc.c:485
-msgid "AT-SPI: Error in GetItems, sender=%s, error=%s"
-msgstr "AT-SPI: Памылка ў GetItems, адпраўнік=%s, памылка=%s"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Poedit 1.8.11\n"
 
-#: ../atspi/atspi-misc.c:587
-msgid ""
-"AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange "
-"signature %s"
-msgstr ""
-"AT-SPI: Функцыя _atspi_dbus_return_accessible_from_message выкліканая з "
-"дзіўным подпісам %s"
-
-#: ../atspi/atspi-misc.c:616
-msgid ""
-"AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange "
-"signature %s"
-msgstr ""
-"AT-SPI: Функцыя _atspi_dbus_return_hyperlink_from_message выкліканая з "
-"дзіўным подпісам %s"
-
-#: ../atspi/atspi-misc.c:641
-msgid "AT-SPI: AddAccessible with unknown signature %s\n"
-msgstr "AT-SPI: AddAccessible з дзіўным подпісам %s\n"
-
-#: ../atspi/atspi-misc.c:934
-#: ../atspi/atspi-misc.c:985
-#: ../atspi/atspi-misc.c:1026
+#: ../atspi/atspi-component.c:326 ../atspi/atspi-misc.c:1073
+#: ../atspi/atspi-value.c:111
 msgid "The application no longer exists"
 msgstr "Праграма больш не існуе"
 
-#: ../atspi/atspi-misc.c:1062
-msgid "AT-SPI: expected a variant when fetching %s from interface %s; got %s\n"
-msgstr "AT-SPI: пры сцягванні %s з інтэрфейсу %s чакаўся варыянт; атрыманы %s\n"
-
-#: ../atspi/atspi-misc.c:1068
-msgid "atspi_dbus_get_property: Wrong type: expected %s, got %c\n"
-msgstr "atspi_dbus_get_property: Няправільны тып: чакаўся %s, атрыманы %c\n"
-
-#: ../atspi/atspi-misc.c:1211
-msgid "AT-SPI: Unknown interface %s"
-msgstr "AT-SPI: Невядомы інтэрфейс %s"
-
-#: ../atspi/atspi-misc.c:1231
-msgid "AT-SPI: expected 2 values in states array; got %d\n"
-msgstr "AT-SPI: чакаліся 2 значэнні ў масіве станаў; атрымана %d\n"
-
-#: ../atspi/atspi-accessible.c:1035
-msgid "Streamable content not implemented"
-msgstr "Падтрымка струмененага змесціва не ажыццёўленая"
-
-#: ../atspi/atspi-event-listener.c:510
-msgid ""
-"called atspi_event_listener_register_from_callback with a NULL event_type"
-msgstr ""
-"функцыя atspi_event_listener_register_from_callback выкліканая з event_type "
-"= NULL"
+#: ../atspi/atspi-misc.c:1832
+msgid "Attempted synchronous call where prohibited"
+msgstr "Спроба зрабіць сінхронны выклік, там дзе гэта забаронена"
+
+#~ msgid "AT-SPI: Unknown signature %s for RemoveAccessible"
+#~ msgstr "AT-SPI: Невядомы подпіс %s для RemoveAccessible"
+
+#~ msgid "AT-SPI: Error calling getRoot for %s: %s"
+#~ msgstr "AT-SPI: Памылка выкліку getRoot для %s: %s"
+
+#~ msgid "AT-SPI: Error in GetItems, sender=%s, error=%s"
+#~ msgstr "AT-SPI: Памылка ў GetItems, адпраўнік=%s, памылка=%s"
+
+#~ msgid ""
+#~ "AT-SPI: Called _atspi_dbus_return_accessible_from_message with strange "
+#~ "signature %s"
+#~ msgstr ""
+#~ "AT-SPI: Функцыя _atspi_dbus_return_accessible_from_message выкліканая з "
+#~ "дзіўным подпісам %s"
+
+#~ msgid ""
+#~ "AT-SPI: Called _atspi_dbus_return_hyperlink_from_message with strange "
+#~ "signature %s"
+#~ msgstr ""
+#~ "AT-SPI: Функцыя _atspi_dbus_return_hyperlink_from_message выкліканая з "
+#~ "дзіўным подпісам %s"
+
+#~ msgid "AT-SPI: AddAccessible with unknown signature %s\n"
+#~ msgstr "AT-SPI: AddAccessible з дзіўным подпісам %s\n"
+
+#~ msgid ""
+#~ "AT-SPI: expected a variant when fetching %s from interface %s; got %s\n"
+#~ msgstr ""
+#~ "AT-SPI: пры сцягванні %s з інтэрфейсу %s чакаўся варыянт; атрыманы %s\n"
+
+#~ msgid "atspi_dbus_get_property: Wrong type: expected %s, got %c\n"
+#~ msgstr ""
+#~ "atspi_dbus_get_property: Няправільны тып: чакаўся %s, атрыманы %c\n"
+
+#~ msgid "AT-SPI: Unknown interface %s"
+#~ msgstr "AT-SPI: Невядомы інтэрфейс %s"
+
+#~ msgid "AT-SPI: expected 2 values in states array; got %d\n"
+#~ msgstr "AT-SPI: чакаліся 2 значэнні ў масіве станаў; атрымана %d\n"
+
+#~ msgid "Streamable content not implemented"
+#~ msgstr "Падтрымка струмененага змесціва не ажыццёўленая"
+
+#~ msgid ""
+#~ "called atspi_event_listener_register_from_callback with a NULL event_type"
+#~ msgstr ""
+#~ "функцыя atspi_event_listener_register_from_callback выкліканая з "
+#~ "event_type = NULL"
 
-#: ../atspi/atspi-event-listener.c:777
-msgid "Got invalid signature %s for signal %s from interface %s\n"
-msgstr "Атрыманы хібны подпіс %s для сігналу %s інтэрфейсу %s\n"
+#~ msgid "Got invalid signature %s for signal %s from interface %s\n"
+#~ msgstr "Атрыманы хібны подпіс %s для сігналу %s інтэрфейсу %s\n"
diff -Nru at-spi2-core-2.22.0/registryd/deviceeventcontroller.c at-spi2-core-2.24.1/registryd/deviceeventcontroller.c
--- at-spi2-core-2.22.0/registryd/deviceeventcontroller.c	2016-07-18 23:45:01.000000000 +0000
+++ at-spi2-core-2.24.1/registryd/deviceeventcontroller.c	2017-04-24 22:42:13.000000000 +0000
@@ -23,7 +23,7 @@
 
 /* deviceeventcontroller.c: implement the DeviceEventController interface */
 
-#include 
+#include "config.h"
 
 #undef  SPI_XKB_DEBUG
 #undef  SPI_DEBUG
@@ -39,11 +39,14 @@
 #include 
 
 #include "paths.h"
-#include "keymasks.h"
 #include "de-types.h"
 #include "de-marshaller.h"
+#include "keymasks.h"
+
+#ifdef HAVE_X11
 #include "display.h"
 #include "event-source.h"
+#endif
 
 #include "deviceeventcontroller.h"
 #include "reentrant-list.h"
@@ -64,10 +67,13 @@
     gint y;
 };
 typedef struct _SpiPoint SpiPoint;
+
 static unsigned int mouse_mask_state = 0;
 static unsigned int key_modifier_mask =
-  Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | Mod5Mask | ShiftMask | LockMask | ControlMask | SPI_KEYMASK_NUMLOCK;
-static unsigned int _numlock_physical_mask = Mod2Mask; /* a guess, will be reset */
+  SPI_KEYMASK_MOD1 | SPI_KEYMASK_MOD2 | SPI_KEYMASK_MOD3 | SPI_KEYMASK_MOD4 |
+  SPI_KEYMASK_MOD5 | SPI_KEYMASK_SHIFT | SPI_KEYMASK_SHIFTLOCK |
+  SPI_KEYMASK_CONTROL | SPI_KEYMASK_NUMLOCK;
+static unsigned int _numlock_physical_mask = SPI_KEYMASK_MOD2; /* a guess, will be reset */
 
 static gboolean have_mouse_listener = FALSE;
 static gboolean have_mouse_event_listener = FALSE;
@@ -632,7 +638,7 @@
   grab_mask.mod_mask = key_listener->mask;
   if (g_slist_length (key_listener->keys) == 0) /* special case means AnyKey/AllKeys */
     {
-      grab_mask.key_val = AnyKey;
+      grab_mask.key_val = 0L; /* AnyKey */
 #ifdef SPI_DEBUG
       fprintf (stderr, "AnyKey grab!");
 #endif
@@ -1749,7 +1755,7 @@
 	       * in our arg list; it can contain either
 	       * a keycode or a keysym.
 	       */
-	      spi_dec_synth_keysym (controller, (KeySym) keycode);
+	      spi_dec_synth_keysym (controller, keycode);
 	      break;
       case Accessibility_KEY_STRING:
 	      if (!spi_dec_plat_synth_keystring (controller, synth_type, keycode, keystring))
diff -Nru at-spi2-core-2.22.0/registryd/keymasks.h at-spi2-core-2.24.1/registryd/keymasks.h
--- at-spi2-core-2.22.0/registryd/keymasks.h	2013-11-18 16:19:37.000000000 +0000
+++ at-spi2-core-2.24.1/registryd/keymasks.h	2017-04-24 22:42:13.000000000 +0000
@@ -24,27 +24,27 @@
 #ifndef SPI_KEYMASKS_H_
 #define SPI_KEYMASKS_H_
 
-#include 
 #include 
 
 G_BEGIN_DECLS
 
 typedef unsigned long SpiKeyMaskType;
 
-#define SPI_KEYMASK_ALT       Mod1Mask
-#define SPI_KEYMASK_MOD1      Mod1Mask
-#define SPI_KEYMASK_MOD2      Mod2Mask
-#define SPI_KEYMASK_MOD3      Mod3Mask
-#define SPI_KEYMASK_MOD4      Mod4Mask
-#define SPI_KEYMASK_MOD5      Mod5Mask
-#define SPI_KEYMASK_BUTTON1   Button1Mask
-#define SPI_KEYMASK_BUTTON2   Button2Mask
-#define SPI_KEYMASK_BUTTON3   Button3Mask
-#define SPI_KEYMASK_BUTTON4   Button4Mask
-#define SPI_KEYMASK_BUTTON5   Button5Mask
-#define SPI_KEYMASK_CONTROL   ControlMask
-#define SPI_KEYMASK_SHIFT     ShiftMask
-#define SPI_KEYMASK_SHIFTLOCK LockMask
+/* Values taken from Xlib.h */
+#define SPI_KEYMASK_ALT       (1<<3)  /* Mod1Mask */
+#define SPI_KEYMASK_MOD1      (1<<3)  /* Mod1Mask */
+#define SPI_KEYMASK_MOD2      (1<<4)  /* Mod2Mask */
+#define SPI_KEYMASK_MOD3      (1<<5)  /* Mod3Mask */
+#define SPI_KEYMASK_MOD4      (1<<6)  /* Mod4Mask */
+#define SPI_KEYMASK_MOD5      (1<<7)  /* Mod5Mask */
+#define SPI_KEYMASK_BUTTON1   (1L<<8)  /* Button1Mask */
+#define SPI_KEYMASK_BUTTON2   (1L<<9)  /* Button2Mask */
+#define SPI_KEYMASK_BUTTON3   (1L<<10)  /* Button3Mask */
+#define SPI_KEYMASK_BUTTON4   (1L<<11)  /* Button4Mask */
+#define SPI_KEYMASK_BUTTON5   (1L<<12)  /* Button5Mask */
+#define SPI_KEYMASK_CONTROL   (1<<2)  /* ControlMask */
+#define SPI_KEYMASK_SHIFT     (1<<0)  /* ShiftMask */
+#define SPI_KEYMASK_SHIFTLOCK (1<<1)  /* LockMask */
 #define SPI_KEYMASK_NUMLOCK   (1<<14)
 #define SPI_KEYMASK_UNMODIFIED 0
 
diff -Nru at-spi2-core-2.22.0/registryd/Makefile.am at-spi2-core-2.24.1/registryd/Makefile.am
--- at-spi2-core-2.22.0/registryd/Makefile.am	2015-01-15 21:17:31.000000000 +0000
+++ at-spi2-core-2.24.1/registryd/Makefile.am	2017-04-24 22:42:13.000000000 +0000
@@ -28,7 +28,7 @@
 	de-marshaller.h         \
 	de-marshaller.c         \
 	de-types.h              \
-	keymasks.h              \
+	keymasks.h 		\
 	paths.h                 \
 	registry-main.c		\
 	registry.c		\
@@ -38,15 +38,15 @@
 	deviceeventcontroller.c	\
 	deviceeventcontroller.h	\
 	reentrant-list.c	\
-	reentrant-list.h	\
-	ucs2keysym.c
+	reentrant-list.h
 
 X11_SOURCES = \
 	deviceeventcontroller-x11.c \
-	display.h		\
-	display.c		\
+	display.h \
+	display.c \
 	event-source.c \
-	event-source.h
+	event-source.h \
+	ucs2keysym.c
 
 if USE_X11
 at_spi2_registryd_SOURCES += $(X11_SOURCES)
diff -Nru at-spi2-core-2.22.0/registryd/Makefile.in at-spi2-core-2.24.1/registryd/Makefile.in
--- at-spi2-core-2.22.0/registryd/Makefile.in	2016-09-26 01:11:49.000000000 +0000
+++ at-spi2-core-2.24.1/registryd/Makefile.in	2017-05-08 22:43:13.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -82,8 +92,6 @@
 libexec_PROGRAMS = at-spi2-registryd$(EXEEXT)
 @USE_X11_TRUE@am__append_1 = $(X11_SOURCES)
 subdir = registryd
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
@@ -92,6 +100,7 @@
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -102,12 +111,12 @@
 	de-types.h keymasks.h paths.h registry-main.c registry.c \
 	registry.h introspection.h introspection.c \
 	deviceeventcontroller.c deviceeventcontroller.h \
-	reentrant-list.c reentrant-list.h ucs2keysym.c \
-	deviceeventcontroller-x11.c display.h display.c event-source.c \
-	event-source.h
+	reentrant-list.c reentrant-list.h deviceeventcontroller-x11.c \
+	display.h display.c event-source.c event-source.h ucs2keysym.c
 am__objects_1 = at_spi2_registryd-deviceeventcontroller-x11.$(OBJEXT) \
 	at_spi2_registryd-display.$(OBJEXT) \
-	at_spi2_registryd-event-source.$(OBJEXT)
+	at_spi2_registryd-event-source.$(OBJEXT) \
+	at_spi2_registryd-ucs2keysym.$(OBJEXT)
 @USE_X11_TRUE@am__objects_2 = $(am__objects_1)
 am_at_spi2_registryd_OBJECTS =  \
 	at_spi2_registryd-de-marshaller.$(OBJEXT) \
@@ -115,8 +124,7 @@
 	at_spi2_registryd-registry.$(OBJEXT) \
 	at_spi2_registryd-introspection.$(OBJEXT) \
 	at_spi2_registryd-deviceeventcontroller.$(OBJEXT) \
-	at_spi2_registryd-reentrant-list.$(OBJEXT) \
-	at_spi2_registryd-ucs2keysym.$(OBJEXT) $(am__objects_2)
+	at_spi2_registryd-reentrant-list.$(OBJEXT) $(am__objects_2)
 at_spi2_registryd_OBJECTS = $(am_at_spi2_registryd_OBJECTS)
 am__DEPENDENCIES_1 =
 at_spi2_registryd_DEPENDENCIES = ../atspi/libatspi.la \
@@ -220,6 +228,7 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -426,13 +435,14 @@
 	keymasks.h paths.h registry-main.c registry.c registry.h \
 	introspection.h introspection.c deviceeventcontroller.c \
 	deviceeventcontroller.h reentrant-list.c reentrant-list.h \
-	ucs2keysym.c $(am__append_1)
+	$(am__append_1)
 X11_SOURCES = \
 	deviceeventcontroller-x11.c \
-	display.h		\
-	display.c		\
+	display.h \
+	display.c \
 	event-source.c \
-	event-source.h
+	event-source.h \
+	ucs2keysym.c
 
 @USE_X11_FALSE@EXTRA_DIST = $(X11_SOURCES) \
 @USE_X11_FALSE@	org.a11y.atspi.Registry.service.in
@@ -457,7 +467,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign registryd/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign registryd/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -551,14 +560,14 @@
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -651,20 +660,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -c -o at_spi2_registryd-reentrant-list.obj `if test -f 'reentrant-list.c'; then $(CYGPATH_W) 'reentrant-list.c'; else $(CYGPATH_W) '$(srcdir)/reentrant-list.c'; fi`
 
-at_spi2_registryd-ucs2keysym.o: ucs2keysym.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -MT at_spi2_registryd-ucs2keysym.o -MD -MP -MF $(DEPDIR)/at_spi2_registryd-ucs2keysym.Tpo -c -o at_spi2_registryd-ucs2keysym.o `test -f 'ucs2keysym.c' || echo '$(srcdir)/'`ucs2keysym.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/at_spi2_registryd-ucs2keysym.Tpo $(DEPDIR)/at_spi2_registryd-ucs2keysym.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ucs2keysym.c' object='at_spi2_registryd-ucs2keysym.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -c -o at_spi2_registryd-ucs2keysym.o `test -f 'ucs2keysym.c' || echo '$(srcdir)/'`ucs2keysym.c
-
-at_spi2_registryd-ucs2keysym.obj: ucs2keysym.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -MT at_spi2_registryd-ucs2keysym.obj -MD -MP -MF $(DEPDIR)/at_spi2_registryd-ucs2keysym.Tpo -c -o at_spi2_registryd-ucs2keysym.obj `if test -f 'ucs2keysym.c'; then $(CYGPATH_W) 'ucs2keysym.c'; else $(CYGPATH_W) '$(srcdir)/ucs2keysym.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/at_spi2_registryd-ucs2keysym.Tpo $(DEPDIR)/at_spi2_registryd-ucs2keysym.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ucs2keysym.c' object='at_spi2_registryd-ucs2keysym.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -c -o at_spi2_registryd-ucs2keysym.obj `if test -f 'ucs2keysym.c'; then $(CYGPATH_W) 'ucs2keysym.c'; else $(CYGPATH_W) '$(srcdir)/ucs2keysym.c'; fi`
-
 at_spi2_registryd-deviceeventcontroller-x11.o: deviceeventcontroller-x11.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -MT at_spi2_registryd-deviceeventcontroller-x11.o -MD -MP -MF $(DEPDIR)/at_spi2_registryd-deviceeventcontroller-x11.Tpo -c -o at_spi2_registryd-deviceeventcontroller-x11.o `test -f 'deviceeventcontroller-x11.c' || echo '$(srcdir)/'`deviceeventcontroller-x11.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/at_spi2_registryd-deviceeventcontroller-x11.Tpo $(DEPDIR)/at_spi2_registryd-deviceeventcontroller-x11.Po
@@ -707,6 +702,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -c -o at_spi2_registryd-event-source.obj `if test -f 'event-source.c'; then $(CYGPATH_W) 'event-source.c'; else $(CYGPATH_W) '$(srcdir)/event-source.c'; fi`
 
+at_spi2_registryd-ucs2keysym.o: ucs2keysym.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -MT at_spi2_registryd-ucs2keysym.o -MD -MP -MF $(DEPDIR)/at_spi2_registryd-ucs2keysym.Tpo -c -o at_spi2_registryd-ucs2keysym.o `test -f 'ucs2keysym.c' || echo '$(srcdir)/'`ucs2keysym.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/at_spi2_registryd-ucs2keysym.Tpo $(DEPDIR)/at_spi2_registryd-ucs2keysym.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ucs2keysym.c' object='at_spi2_registryd-ucs2keysym.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -c -o at_spi2_registryd-ucs2keysym.o `test -f 'ucs2keysym.c' || echo '$(srcdir)/'`ucs2keysym.c
+
+at_spi2_registryd-ucs2keysym.obj: ucs2keysym.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -MT at_spi2_registryd-ucs2keysym.obj -MD -MP -MF $(DEPDIR)/at_spi2_registryd-ucs2keysym.Tpo -c -o at_spi2_registryd-ucs2keysym.obj `if test -f 'ucs2keysym.c'; then $(CYGPATH_W) 'ucs2keysym.c'; else $(CYGPATH_W) '$(srcdir)/ucs2keysym.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/at_spi2_registryd-ucs2keysym.Tpo $(DEPDIR)/at_spi2_registryd-ucs2keysym.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ucs2keysym.c' object='at_spi2_registryd-ucs2keysym.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(at_spi2_registryd_CFLAGS) $(CFLAGS) -c -o at_spi2_registryd-ucs2keysym.obj `if test -f 'ucs2keysym.c'; then $(CYGPATH_W) 'ucs2keysym.c'; else $(CYGPATH_W) '$(srcdir)/ucs2keysym.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -942,6 +951,8 @@
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-am uninstall-libexecPROGRAMS uninstall-serviceDATA
 
+.PRECIOUS: Makefile
+
 
 $(service_DATA): $(service_in_files) Makefile
 	sed -e "s|[@]LIBEXECDIR[@]|$(libexecdir)|" $(srcdir)/$@.in > $@
diff -Nru at-spi2-core-2.22.0/test/Makefile.in at-spi2-core-2.24.1/test/Makefile.in
--- at-spi2-core-2.22.0/test/Makefile.in	2016-09-26 01:11:49.000000000 +0000
+++ at-spi2-core-2.24.1/test/Makefile.in	2017-05-08 22:43:13.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,7 +15,17 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -80,8 +90,6 @@
 host_triplet = @host@
 noinst_PROGRAMS = memory$(EXEEXT)
 subdir = test
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/config/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
@@ -90,6 +98,7 @@
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -166,6 +175,7 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/config/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -365,7 +375,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign test/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign test/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -410,14 +419,14 @@
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -649,6 +658,8 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 -include $(top_srcdir)/git.mk
 
diff -Nru at-spi2-core-2.22.0/xml/Event.xml at-spi2-core-2.24.1/xml/Event.xml
--- at-spi2-core-2.22.0/xml/Event.xml	2013-11-18 16:19:37.000000000 +0000
+++ at-spi2-core-2.24.1/xml/Event.xml	2017-04-24 22:42:13.000000000 +0000
@@ -179,6 +179,9 @@
 	
           
         
+	
+          
+        
 
 
 
diff -Nru at-spi2-core-2.22.0/xml/Makefile.in at-spi2-core-2.24.1/xml/Makefile.in
--- at-spi2-core-2.22.0/xml/Makefile.in	2016-09-26 01:11:49.000000000 +0000
+++ at-spi2-core-2.24.1/xml/Makefile.in	2017-05-08 22:43:13.000000000 +0000
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.13.4 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -14,7 +14,17 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -78,7 +88,6 @@
 build_triplet = @build@
 host_triplet = @host@
 subdir = xml
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
 	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \
@@ -87,6 +96,7 @@
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -111,6 +121,7 @@
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
@@ -339,7 +350,6 @@
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign xml/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign xml/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -515,6 +525,8 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags-am uninstall uninstall-am
 
+.PRECIOUS: Makefile
+
 
 spec.xml: $(XML_SPEC)
 	xsltproc --xinclude $(top_srcdir)/tools/identity.xsl Accessibility.xml >spec.xml