Hello community, here is the log from the commit of package at-spi2-atk for openSUSE:Factory checked in at 2015-10-06 16:32:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/at-spi2-atk (Old) and /work/SRC/openSUSE:Factory/.at-spi2-atk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "at-spi2-atk" Changes: -------- --- /work/SRC/openSUSE:Factory/at-spi2-atk/at-spi2-atk.changes 2015-03-30 19:29:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.at-spi2-atk.new/at-spi2-atk.changes 2015-10-06 16:32:34.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Sep 22 07:15:24 UTC 2015 - [email protected] + +- Update to version 2.18.0: + + Stable release, no changes to version 2.17.90. + +------------------------------------------------------------------- +Mon Aug 17 20:45:31 UTC 2015 - [email protected] + +- Update to version 2.17.90: + + Update for new caching API (bgo#650090). + +------------------------------------------------------------------- +Thu Jul 23 08:10:44 UTC 2015 - [email protected] + +- Update to version 2.17.1: + + Eliminate some console warnings due to NULL gobjects. + + Tests: fix out-of-source and parallel build (bgo#751137). + + Add some missing files to the distribution (bgo#751138). + +------------------------------------------------------------------- Old: ---- at-spi2-atk-2.16.0.tar.xz New: ---- at-spi2-atk-2.18.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at-spi2-atk.spec ++++++ --- /var/tmp/diff_new_pack.6cmTdj/_old 2015-10-06 16:32:35.000000000 +0200 +++ /var/tmp/diff_new_pack.6cmTdj/_new 2015-10-06 16:32:35.000000000 +0200 @@ -17,19 +17,19 @@ Name: at-spi2-atk -Version: 2.16.0 +Version: 2.18.0 Release: 0 Summary: Assistive Technology Service Provider Interface - GTK+ module License: LGPL-2.0+ Group: System/Libraries Url: http://www.gnome.org/ -Source0: http://download.gnome.org/sources/at-spi2-atk/2.16/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/at-spi2-atk/2.18/%{name}-%{version}.tar.xz Source1: at-spi2.sh Source98: baselibs.conf Source99: %{name}-rpmlintrc BuildRequires: fdupes -BuildRequires: pkgconfig(atk) >= 2.15.3 -BuildRequires: pkgconfig(atspi-2) >= 2.11.2 +BuildRequires: pkgconfig(atk) >= 2.15.4 +BuildRequires: pkgconfig(atspi-2) >= 2.17.90 BuildRequires: pkgconfig(dbus-1) >= 1.5 BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 BuildRequires: pkgconfig(gmodule-2.0) >= 2.0.0 ++++++ at-spi2-atk-2.16.0.tar.xz -> at-spi2-atk-2.18.0.tar.xz ++++++ ++++ 4161 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/AUTHORS new/at-spi2-atk-2.18.0/AUTHORS --- old/at-spi2-atk-2.16.0/AUTHORS 2013-09-27 21:33:56.000000000 +0200 +++ new/at-spi2-atk-2.18.0/AUTHORS 2015-07-15 18:15:42.000000000 +0200 @@ -12,6 +12,7 @@ Bill Haneman <[email protected]> Marc Mulcahy <[email protected]> Michael Meeks <[email protected]> +Li Yuan <[email protected]> with contributions from: Mark McLoughlin <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/NEWS new/at-spi2-atk-2.18.0/NEWS --- old/at-spi2-atk-2.16.0/NEWS 2015-02-16 21:05:35.000000000 +0100 +++ new/at-spi2-atk-2.18.0/NEWS 2015-08-17 21:30:35.000000000 +0200 @@ -1,3 +1,15 @@ +What's new in at-spi2-atk 2.17.90: + +* Update for new caching API (bgo#650090). + +What's new in at-spi2-atk 2.17.1: + +* Eliminate some console warnings due to NULL gobjects. + +* Tests: fix out-of-source and parallel build (bgo#751137). + +* Add some missing files to the distribution (bgo#751138). + What's new in at-spi2-atk 2.15.90: * Add roles for fractions, roots, subscripts, and superscripts. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/atk-adaptor/accessible-stateset.c new/at-spi2-atk-2.18.0/atk-adaptor/accessible-stateset.c --- old/at-spi2-atk-2.16.0/atk-adaptor/accessible-stateset.c 2015-01-19 23:54:35.000000000 +0100 +++ new/at-spi2-atk-2.18.0/atk-adaptor/accessible-stateset.c 2015-06-15 02:32:56.000000000 +0200 @@ -185,7 +185,7 @@ { AtkStateSet *set = atk_object_ref_state_set (object); spi_atk_state_set_to_dbus_array (set, array); - g_object_unref (set); + g_clear_object (&set); } void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/atk-adaptor/adaptors/application-adaptor.c new/at-spi2-atk-2.18.0/atk-adaptor/adaptors/application-adaptor.c --- old/at-spi2-atk-2.16.0/atk-adaptor/adaptors/application-adaptor.c 2013-09-27 21:33:56.000000000 +0200 +++ new/at-spi2-atk-2.18.0/atk-adaptor/adaptors/application-adaptor.c 2015-08-15 01:51:41.000000000 +0200 @@ -46,7 +46,7 @@ static dbus_bool_t impl_get_AtspiVersion (DBusMessageIter * iter, void *user_data) { - return droute_return_v_string (iter, "2.0"); + return droute_return_v_string (iter, "2.1"); } static dbus_int32_t id; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/atk-adaptor/adaptors/cache-adaptor.c new/at-spi2-atk-2.18.0/atk-adaptor/adaptors/cache-adaptor.c --- old/at-spi2-atk-2.16.0/atk-adaptor/adaptors/cache-adaptor.c 2014-04-22 00:50:14.000000000 +0200 +++ new/at-spi2-atk-2.18.0/atk-adaptor/adaptors/cache-adaptor.c 2015-08-15 01:53:38.000000000 +0200 @@ -49,8 +49,8 @@ SPI_OBJECT_REFERENCE_SIGNATURE \ SPI_OBJECT_REFERENCE_SIGNATURE \ SPI_OBJECT_REFERENCE_SIGNATURE \ - DBUS_TYPE_ARRAY_AS_STRING \ - SPI_OBJECT_REFERENCE_SIGNATURE \ + DBUS_TYPE_INT32_AS_STRING \ + DBUS_TYPE_INT32_AS_STRING \ DBUS_TYPE_ARRAY_AS_STRING \ DBUS_TYPE_STRING_AS_STRING \ DBUS_TYPE_STRING_AS_STRING \ @@ -66,154 +66,123 @@ * Marshals the given AtkObject into the provided D-Bus iterator. * * The object is marshalled including all its client side cache data. - * The format of the structure is (o(so)a(so)assusau). + * The format of the structure is (o(so)iiassusau). */ static void append_cache_item (AtkObject * obj, gpointer data) { DBusMessageIter iter_struct, iter_sub_array; dbus_uint32_t states[2]; - int count; + dbus_int32_t count, index; AtkStateSet *set; DBusMessageIter *iter_array = (DBusMessageIter *) data; - const char *name, *desc; dbus_uint32_t role; set = atk_object_ref_state_set (obj); - { AtkObject *application, *parent; - dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, - &iter_struct); + dbus_message_iter_open_container (iter_array, DBUS_TYPE_STRUCT, NULL, + &iter_struct); + + /* Marshal object path */ + spi_object_append_reference (&iter_struct, obj); - /* Marshall object path */ - spi_object_append_reference (&iter_struct, obj); + role = spi_accessible_role_from_atk_role (atk_object_get_role (obj)); - role = spi_accessible_role_from_atk_role (atk_object_get_role (obj)); + /* Marshal application */ + application = spi_global_app_data->root; + spi_object_append_reference (&iter_struct, application); + + /* Marshal parent */ + parent = atk_object_get_parent (obj); + if (parent == NULL) + { + /* TODO, move in to a 'Plug' wrapper. */ + if (ATK_IS_PLUG (obj)) + { + char *id = g_object_get_data (G_OBJECT (obj), "dbus-plug-parent"); + char *bus_parent; + char *path_parent; + + if (id) + { + bus_parent = g_strdup (id); + if (bus_parent && (path_parent = g_utf8_strchr (bus_parent + 1, -1, ':'))) + { + DBusMessageIter iter_parent; + *(path_parent++) = '\0'; + dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_STRUCT, NULL, + &iter_parent); + dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_STRING, &bus_parent); + dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_OBJECT_PATH, &path_parent); + dbus_message_iter_close_container (&iter_struct, &iter_parent); + } + else + { + spi_object_append_null_reference (&iter_struct); + } + } + else + { + spi_object_append_null_reference (&iter_struct); + } + } + else if (role != ATSPI_ROLE_APPLICATION) + spi_object_append_null_reference (&iter_struct); + else + spi_object_append_desktop_reference (&iter_struct); + } + else + { + spi_object_append_reference (&iter_struct, parent); + } + + /* Marshal index in parent */ + index = (atk_state_set_contains_state (set, ATK_STATE_TRANSIENT) + ? -1 : atk_object_get_index_in_parent (obj)); + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &index); + + /* marshal child count */ + count = (atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) || + atk_state_set_contains_state (set, ATK_STATE_DEFUNCT)) + ? -1 : atk_object_get_n_accessible_children (obj); + if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj))) + count = 1; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_INT32, &count); + + /* Marshal interfaces */ + dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "s", + &iter_sub_array); + spi_object_append_interfaces (&iter_sub_array, obj); + dbus_message_iter_close_container (&iter_struct, &iter_sub_array); + + /* Marshal name */ + name = atk_object_get_name (obj); + if (!name) + name = ""; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); + + /* Marshal role */ + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &role); + + /* Marshal description */ + desc = atk_object_get_description (obj); + if (!desc) + desc = ""; + dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc); + + /* Marshal state set */ + spi_atk_state_set_to_dbus_array (set, states); + dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "u", + &iter_sub_array); + for (count = 0; count < 2; count++) + { + dbus_message_iter_append_basic (&iter_sub_array, DBUS_TYPE_UINT32, + &states[count]); + } + dbus_message_iter_close_container (&iter_struct, &iter_sub_array); - /* Marshall application */ - application = spi_global_app_data->root; - spi_object_append_reference (&iter_struct, application); - - /* Marshall parent */ - parent = atk_object_get_parent (obj); - if (parent == NULL) - { - /* TODO, move in to a 'Plug' wrapper. */ - if (ATK_IS_PLUG (obj)) - { - char *id = g_object_get_data (G_OBJECT (obj), "dbus-plug-parent"); - char *bus_parent; - char *path_parent; - - if (id) - { - bus_parent = g_strdup (id); - if (bus_parent && (path_parent = g_utf8_strchr (bus_parent + 1, -1, ':'))) - { - DBusMessageIter iter_parent; - *(path_parent++) = '\0'; - dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_STRUCT, NULL, - &iter_parent); - dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_STRING, &bus_parent); - dbus_message_iter_append_basic (&iter_parent, DBUS_TYPE_OBJECT_PATH, &path_parent); - dbus_message_iter_close_container (&iter_struct, &iter_parent); - } - else - { - spi_object_append_null_reference (&iter_struct); - } - } - else - { - spi_object_append_null_reference (&iter_struct); - } - } - else if (role != ATSPI_ROLE_APPLICATION) - spi_object_append_null_reference (&iter_struct); - else - spi_object_append_desktop_reference (&iter_struct); - } - else - { - spi_object_append_reference (&iter_struct, parent); - } - - /* Marshall children */ - dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "(so)", - &iter_sub_array); - if (!atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS) && - !atk_state_set_contains_state (set, ATK_STATE_DEFUNCT)) - { - gint childcount, i; - - childcount = atk_object_get_n_accessible_children (obj); - for (i = 0; i < childcount; i++) - { - AtkObject *child; - - child = atk_object_ref_accessible_child (obj, i); - if (child) - { - spi_object_append_reference (&iter_sub_array, child); - g_object_unref (G_OBJECT (child)); - } - } - } - if (ATK_IS_SOCKET (obj) && atk_socket_is_occupied (ATK_SOCKET (obj))) - { - AtkSocket *socket = ATK_SOCKET (obj); - gchar *child_name, *child_path; - child_name = g_strdup (socket->embedded_plug_id); - child_path = g_utf8_strchr (child_name + 1, -1, ':'); - if (child_path) - { - DBusMessageIter iter_socket; - *(child_path++) = '\0'; - dbus_message_iter_open_container (&iter_sub_array, DBUS_TYPE_STRUCT, NULL, - &iter_socket); - dbus_message_iter_append_basic (&iter_socket, DBUS_TYPE_STRING, &child_name); - dbus_message_iter_append_basic (&iter_socket, DBUS_TYPE_OBJECT_PATH, &child_path); - dbus_message_iter_close_container (&iter_sub_array, &iter_socket); - } - g_free (child_name); - } - - dbus_message_iter_close_container (&iter_struct, &iter_sub_array); - - /* Marshall interfaces */ - dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "s", - &iter_sub_array); - spi_object_append_interfaces (&iter_sub_array, obj); - dbus_message_iter_close_container (&iter_struct, &iter_sub_array); - - /* Marshall name */ - name = atk_object_get_name (obj); - if (!name) - name = ""; - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); - - /* Marshall role */ - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_UINT32, &role); - - /* Marshall description */ - desc = atk_object_get_description (obj); - if (!desc) - desc = ""; - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc); - - /* Marshall state set */ - spi_atk_state_set_to_dbus_array (set, states); - dbus_message_iter_open_container (&iter_struct, DBUS_TYPE_ARRAY, "u", - &iter_sub_array); - for (count = 0; count < 2; count++) - { - dbus_message_iter_append_basic (&iter_sub_array, DBUS_TYPE_UINT32, - &states[count]); - } - dbus_message_iter_close_container (&iter_struct, &iter_sub_array); - } dbus_message_iter_close_container (iter_array, &iter_struct); g_object_unref (set); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/atk-adaptor/event.c new/at-spi2-atk-2.18.0/atk-adaptor/event.c --- old/at-spi2-atk-2.16.0/atk-adaptor/event.c 2015-01-14 11:12:02.000000000 +0100 +++ new/at-spi2-atk-2.18.0/atk-adaptor/event.c 2015-07-21 01:45:10.000000000 +0200 @@ -678,6 +678,26 @@ #define STATE_CHANGED "state-changed" +static void +do_debug_thing (AtkObject *accessible) +{ + AtkObject *parent; + gint x, y, width, height; + + do + { + parent = atk_object_get_parent (accessible); + if (!ATK_IS_COMPONENT (accessible)) + { + g_print ("%s isn't a component\n", g_type_name_from_instance(accessible)); + return; + } + atk_component_get_extents (ATK_COMPONENT (accessible), &x, &y, &width, &height, ATK_XY_SCREEN); + g_print ("extents for %s (%s): %d %d %d %d\n", atk_object_get_name(accessible), g_type_name_from_instance(accessible), x, y, width, height); + accessible = parent; + } while (accessible); +} + /* * The state event listener handles 'Gtk:AtkObject:state-change' ATK signals * and forwards them as object:state-changed:(param-name) AT-SPI events. Where @@ -699,6 +719,7 @@ emit_event (accessible, ITF_EVENT_OBJECT, STATE_CHANGED, pname, detail1, 0, DBUS_TYPE_INT32_AS_STRING, 0, append_basic); +if (!g_strcmp0 (pname, "focused") && detail1 && g_getenv("DODEBUG")) do_debug_thing(accessible); if (!g_strcmp0 (pname, "defunct") && detail1) spi_register_deregister_object (spi_global_register, G_OBJECT (accessible), TRUE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/atk-adaptor/introspection.c new/at-spi2-atk-2.18.0/atk-adaptor/introspection.c --- old/at-spi2-atk-2.16.0/atk-adaptor/introspection.c 2014-02-25 21:54:56.000000000 +0100 +++ new/at-spi2-atk-2.18.0/atk-adaptor/introspection.c 2015-08-15 01:51:41.000000000 +0200 @@ -764,12 +764,12 @@ "<interface name=\"org.a11y.atspi.Cache\" version=\"0.1.7\">" "" " <method name=\"GetItems\">" -" <arg direction=\"out\" name=\"nodes\" type=\"a((so)(so)a(so)assusau)\" />" +" <arg direction=\"out\" name=\"nodes\" type=\"a((so)(so)iiassusau)\" />" " " " </method>" "" " <signal name=\"AddAccessible\">" -" <arg name=\"nodeAdded\" type=\"((so)(so)a(so)assusau)\" />" +" <arg name=\"nodeAdded\" type=\"((so)(so)iiassusau)\" />" " " " </signal>" "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/config/compile new/at-spi2-atk-2.18.0/config/compile --- old/at-spi2-atk-2.16.0/config/compile 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.18.0/config/compile 2015-08-17 05:30:35.000000000 +0200 @@ -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 <[email protected]>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, 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 <http://www.gnu.org/licenses/>. + +# 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 <[email protected]> or send patches to +# <[email protected]>. + +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 <[email protected]>. +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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/config/missing new/at-spi2-atk-2.18.0/config/missing --- old/at-spi2-atk-2.16.0/config/missing 2015-03-16 23:32:07.000000000 +0100 +++ new/at-spi2-atk-2.18.0/config/missing 2015-08-17 05:30:35.000000000 +0200 @@ -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 <[email protected]>, 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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/config/test-driver new/at-spi2-atk-2.18.0/config/test-driver --- old/at-spi2-atk-2.16.0/config/test-driver 2015-03-16 23:32:08.000000000 +0100 +++ new/at-spi2-atk-2.18.0/config/test-driver 2015-08-17 05:30:36.000000000 +0200 @@ -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,13 +44,12 @@ 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. @@ -69,10 +68,23 @@ --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; -*) usage_error "invalid option: '$1'";; + *) break;; esac 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='[0;31m' # Red. @@ -94,11 +106,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 +122,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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/configure.ac new/at-spi2-atk-2.18.0/configure.ac --- old/at-spi2-atk-2.16.0/configure.ac 2015-03-24 00:21:57.000000000 +0100 +++ new/at-spi2-atk-2.18.0/configure.ac 2015-09-22 00:15:05.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([at-spi2-atk], [2.16.0], [[email protected]]) +AC_INIT([at-spi2-atk], [2.18.0], [[email protected]]) AC_CONFIG_AUX_DIR(config) AT_SPI_ATK_MAJOR_VERSION=0 @@ -55,7 +55,7 @@ AC_SUBST(ATK_LIBS) AC_SUBST(ATK_CFLAGS) -PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.15.5]) +PKG_CHECK_MODULES(ATSPI, [atspi-2 >= 2.17.90]) AC_SUBST(ATSPI_LIBS) AC_SUBST(ATSPI_CFLAGS) @@ -127,6 +127,7 @@ atk-adaptor/adaptors/Makefile atk-adaptor/gtk-2.0/Makefile tests/Makefile + tests/data/Makefile tests/dummyatk/Makefile ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/tests/Makefile.am new/at-spi2-atk-2.18.0/tests/Makefile.am --- old/at-spi2-atk-2.16.0/tests/Makefile.am 2015-03-07 02:47:17.000000000 +0100 +++ new/at-spi2-atk-2.18.0/tests/Makefile.am 2015-06-19 03:28:43.000000000 +0200 @@ -1,4 +1,4 @@ -SUBDIRS = dummyatk +SUBDIRS = data dummyatk noinst_PROGRAMS = atk-test app-test TESTS = atk-test @@ -9,21 +9,22 @@ $(ATSPI_CFLAGS) \ -I$(top_builddir)\ -I$(top_srcdir)/tests/dummyatk/ \ - -I$(top_srcdir)/tests/dummyatk/.libs \ - -I$(top_srcdir)/tests/dummyatk/.deps \ + -I$(top_builddir)/tests/dummyatk/.libs \ + -I$(top_builddir)/tests/dummyatk/.deps \ -I$(top_srcdir) -atk_test_LDFLAGS = libxmlloader.la \ - libtestutils.la \ - $(GLIB_LIBS) \ - $(ATSPI_LIBS) \ - $(top_srcdir)/tests/dummyatk/libdummyatk.la +atk_test_LDADD = libxmlloader.la \ + libtestutils.la \ + $(GLIB_LIBS) \ + $(ATSPI_LIBS) \ + $(top_builddir)/tests/dummyatk/libdummyatk.la atk_test_CPPFLAGS = -DTESTS_BUILD_DIR=\"$(top_builddir)/tests\" \ -DTESTS_SRC_DIR=\"$(top_srcdir)/tests\" \ -DTESTS_DATA_DIR=\"$(top_srcdir)/tests/data\" atk_test_SOURCES = atk_suite.c \ + atk_suite.h \ atk_test_accessible.c \ atk_test_action.c \ atk_test_component.c @@ -34,12 +35,12 @@ -I$(top_srcdir)/tests/dummyatk \ -I$(top_srcdir)/atk-adaptor -app_test_LDFLAGS = libxmlloader.la \ - libtestutils.la \ - $(GLIB_LIBS) \ - $(ATK_LIBS) \ - $(top_srcdir)/tests/dummyatk/libdummyatk.la \ - $(top_srcdir)/atk-adaptor/libatk-bridge-2.0.la +app_test_LDADD = libxmlloader.la \ + libtestutils.la \ + $(GLIB_LIBS) \ + $(ATK_LIBS) \ + $(top_builddir)/tests/dummyatk/libdummyatk.la \ + $(top_builddir)/atk-adaptor/libatk-bridge-2.0.la app_test_SOURCES = test-application.c @@ -52,7 +53,7 @@ libxmlloader_la_LIBADD = $(GLIB_LIBS) \ $(XML_LIBS) \ $(GOBJ_LIBS) \ - $(top_srcdir)/tests/dummyatk/libdummyatk.la \ + $(top_builddir)/tests/dummyatk/libdummyatk.la \ $(ATK_LIBS) libxmlloader_la_SOURCES = atk-object-xml-loader.c\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/tests/atk_suite.h new/at-spi2-atk-2.18.0/tests/atk_suite.h --- old/at-spi2-atk-2.16.0/tests/atk_suite.h 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.18.0/tests/atk_suite.h 2015-06-14 21:52:59.000000000 +0200 @@ -0,0 +1,36 @@ +/* + * AT-SPI - Assistive Technology Service Provider Interface + * (Gnome Accessibility Project; https://wiki.gnome.org/Accessibility) + * + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * This library 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; either + * version 2 of the License, or (at your option) any later version. + * + * This library 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef _ATK_SUITE_H +#define _ATK_SUITE_H + +#include <atspi/atspi.h> + +#define ATK_TEST_PATH_ACCESSIBLE (const char *)"/Accessible" +#define ATK_TEST_PATH_ACTION (const char *)"/Action" +#define ATK_TEST_PATH_COMP (const char *)"/Component" + +void atk_test_accessible (void); +void atk_test_action (void); +void atk_test_component (void); + +#endif /* _ATK_SUITE_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/tests/data/Makefile.am new/at-spi2-atk-2.18.0/tests/data/Makefile.am --- old/at-spi2-atk-2.16.0/tests/data/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.18.0/tests/data/Makefile.am 2015-06-19 17:42:22.000000000 +0200 @@ -0,0 +1,4 @@ +EXTRA_DIST = test-accessible.xml \ + test-action.xml \ + test-component.xml \ + test.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/tests/data/test-accessible.xml new/at-spi2-atk-2.18.0/tests/data/test-accessible.xml --- old/at-spi2-atk-2.16.0/tests/data/test-accessible.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.18.0/tests/data/test-accessible.xml 2015-06-14 21:52:59.000000000 +0200 @@ -0,0 +1,16 @@ +<?xml version="1.0" ?> +<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> + <accessible description="first child" name="obj1" role="alert"> + <state state_enum="modal"/> + <state state_enum="multi-line"/> + </accessible> + <accessible description="second child" name="obj2" role="animation"> + <accessible description="first prechild" name="obj2/1" role="arrow"> + <relation relation_type="2" target_name="obj2"/> + </accessible> + <accessible description="second prechild" name="obj2/2" role="canvas"/> + </accessible> + <accessible description="third child" name="obj3" role="check box"> + <accessible description="first prechild" name="obj3/1" role="check menu item"/> + </accessible> +</accessible> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/tests/data/test-action.xml new/at-spi2-atk-2.18.0/tests/data/test-action.xml --- old/at-spi2-atk-2.16.0/tests/data/test-action.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.18.0/tests/data/test-action.xml 2015-06-14 21:52:59.000000000 +0200 @@ -0,0 +1,11 @@ +<?xml version="1.0" ?> +<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> + <accessible description="first child" name="obj1" role="alert"/> + <accessible_action description="second child" name="obj2" role="application"> + <action action_name="action1" action_description="action1 description" key_binding="action1 key binding"/> + <action action_name="action2" action_description="action2 description" key_binding="action2 key binding"/> + </accessible_action> + <accessible_action description="third child" name="obj3" role="push button"> + <action action_name="action1" action_description="action1 description" key_binding="action1 key binding"/> + </accessible_action> +</accessible> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/tests/data/test-component.xml new/at-spi2-atk-2.18.0/tests/data/test-component.xml --- old/at-spi2-atk-2.16.0/tests/data/test-component.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.18.0/tests/data/test-component.xml 2015-06-14 21:52:59.000000000 +0200 @@ -0,0 +1,13 @@ +<?xml version="1.0" ?> +<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> + <accessible_component description="second child" name="obj2" role="application"> + <component x="350" y="200" width="0" height="0" layer="2" zorder="1" alpha="1.5"/> + </accessible_component> + <accessible_component description="third child" name="obj3" role="push button"> + <component x="250" y="250" width="350" height="200" layer="3" zorder="2" alpha="2.5"/> + <accessible_component description="third child a" name="aobj3" role="push button"> + <component x="250" y="250" width="350" height="200" layer="4" zorder="3" alpha="3.5"/> + </accessible_component> + </accessible_component> + <accessible description="second child" name="obj2" role="application" /> +</accessible> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/at-spi2-atk-2.16.0/tests/data/test.xml new/at-spi2-atk-2.18.0/tests/data/test.xml --- old/at-spi2-atk-2.16.0/tests/data/test.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/at-spi2-atk-2.18.0/tests/data/test.xml 2015-06-14 21:52:59.000000000 +0200 @@ -0,0 +1,16 @@ +<?xml version="1.0" ?> +<accessible description="Root of the accessible tree" name="root_object" role="accelerator label"> + <accessible description="first child" name="obj1" role="alert"> + <state state_enum="modal"/> + <state state_enum="multi-line"/> + </accessible> + <accessible description="second child" name="obj2" role="animation"> + <accessible description="first prechild" name="obj2/1" role="arrow"> + <relation relation_type="2" target_name="obj2"/> + </accessible> + <accessible description="second prechild" name="obj2/2" role="canvas"/> + </accessible> + <accessible description="third child" name="obj3" role="check box"> + <accessible description="first prechild" name="obj3/1" role="check menu item"/> + </accessible> +</accessible>
