From: Artur Świgoń Date: Fri, 7 Feb 2020 13:10:14 +0000 (+0100) Subject: Merge tag 'upstream/2.34.1' into tizen X-Git-Tag: submit/tizen/20200213.221652^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7e06bdae86922238f5503a6525d2172cf88f5574;p=platform%2Fupstream%2Fat-spi2-atk.git Merge tag 'upstream/2.34.1' into tizen Change-Id: I2ad99d6ae8d5559e932b48a38a84ad21bd86e997 --- 7e06bdae86922238f5503a6525d2172cf88f5574 diff --cc NEWS index 7dde170,874dd6d..522e06a --- a/NEWS +++ b/NEWS @@@ -220,7 -267,7 +267,7 @@@ What's new in at-spi2-atk 2.7.2 * atk-adaptor: don't emit a critical in case the bridge was not initialized (BGO#684334). -- ++ * Remove dbind (it was only used for the droute test). * Fix a crash in socket_embed_hook if spi_global_register is NULL. @@@ -362,7 -409,7 +409,7 @@@ What's new in at-spi2-atk 2.3.2 * Fix for BGO#663876: Make sure the a11y hierarchy under an AtkPlug is generated when embedding. -- ++ What's new in at-spi2-atk 2.3.1: * Fix a small coding error that could generate compiler warnings. diff --cc atk-adaptor/adaptors/accessible-adaptor.c index c7e4aaf,baafda5..889e300 --- a/atk-adaptor/adaptors/accessible-adaptor.c +++ b/atk-adaptor/adaptors/accessible-adaptor.c @@@ -1492,12 -528,17 +1492,22 @@@ impl_GetInterfaces (DBusConnection * bu return reply; } + static dbus_bool_t + impl_get_AccessibleId (DBusMessageIter * iter, void *user_data) + { + AtkObject *object = (AtkObject *) user_data; + + g_return_val_if_fail (ATK_IS_OBJECT (user_data), FALSE); + + return droute_return_v_string (iter, atk_object_get_accessible_id (object)); + } + static DRouteMethod methods[] = { +// TIZEN_ONLY(20170310) - implementation of get object under coordinates for accessibility + {impl_GetNavigableAtPoint, "GetNavigableAtPoint"}, + {impl_GetNeighbor, "GetNeighbor"}, + {impl_GetReadingMaterial, "GetReadingMaterial"}, +// {impl_GetChildAtIndex, "GetChildAtIndex"}, {impl_GetChildren, "GetChildren"}, {impl_GetIndexInParent, "GetIndexInParent"}, diff --cc atk-adaptor/adaptors/action-adaptor.c index b74a033,784d136..0c5bd03 --- a/atk-adaptor/adaptors/action-adaptor.c +++ b/atk-adaptor/adaptors/action-adaptor.c @@@ -14,15 -14,14 +14,15 @@@ * 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. + * Lesser General Public License for more details. * - * You should have received a copy of the GNU Library General Public + * You should have received a copy of the GNU Lesser 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. + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. */ +#include #include #include #include "bridge.h" diff --cc atk-adaptor/adaptors/collection-adaptor.c index 64d9959,a6ec282..296c91a --- a/atk-adaptor/adaptors/collection-adaptor.c +++ b/atk-adaptor/adaptors/collection-adaptor.c @@@ -1181,7 -1181,7 +1181,7 @@@ skip (const char **p } *p = sig; } -- ++ static gboolean types_match (DBusMessageIter *iter, char c) { @@@ -1232,7 -1232,7 +1232,7 @@@ walk (DBusMessageIter *iter, const cha dbus_message_iter_recurse (iter, &iter_struct); walk (&iter_struct, sig + 1, FALSE); skip (&sig); -- } ++ } } dbus_message_iter_next (iter); if (!array) diff --cc packaging/at-spi2-atk.spec index faebb5f,0000000..86744e7 mode 100644,000000..100644 --- a/packaging/at-spi2-atk.spec +++ b/packaging/at-spi2-atk.spec @@@ -1,82 -1,0 +1,82 @@@ +Name: at-spi2-atk - Version: 2.30.0 ++Version: 2.34.1 +Release: 1 +Summary: Assistive Technology Service Provider Interface - GTK+ module +License: LGPL-2.0+ +Group: System/Libraries +Url: http://www.gnome.org/ +Source: http://download.gnome.org/sources/at-spi2-atk/2.30/%{name}-%{version}.tar.xz +Source1001: %{name}.manifest +Requires: at-spi2-core +BuildRequires: dbus-devel +BuildRequires: glib2-devel +BuildRequires: atk-devel +BuildRequires: at-spi2-core-devel +BuildRequires: gettext +BuildRequires: libxml2-devel >= 2.9.1 +BuildRequires: meson + +%description +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +%package -n libatk-bridge-2_0-0 +Summary: ATK/D-Bus bridging library +Group: System/Libraries + +%description -n libatk-bridge-2_0-0 +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +The package contains a ATK/D-Bus bridge library. + +%package devel +Summary: Assistive Technology Service Provider Interface - Developent files +Group: System/Libraries +Requires: libatk-bridge-2_0-0 = %{version} + +%description devel +AT-SPI is a general interface for applications to make use of the +accessibility toolkit. This version is based on dbus. + +%prep +%setup -q +cp %{SOURCE1001} . + +%build +meson --prefix /usr --libdir %{_libdir} build -Ddisable_p2p=true +ninja -C build all + +%install +rm -rf %{buildroot} + +export DESTDIR=%{buildroot} +ninja -C build install + +find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f +find %{buildroot} -name '*.desktop' | xargs rm -f + +%clean +rm -rf %{buildroot} + +%post -n libatk-bridge-2_0-0 -p /sbin/ldconfig + +%postun -n libatk-bridge-2_0-0 -p /sbin/ldconfig + +%files -n libatk-bridge-2_0-0 +%manifest %{name}.manifest +%defattr(-,root,root) +%{_libdir}/libatk-bridge-2.0.so.* +%{_libdir}/gtk-2.0/modules/libatk-bridge.so + +%files devel +%manifest %{name}.manifest +%defattr(-,root,root) +%{_includedir}/at-spi2-atk/2.0/atk-bridge.h +%{_libdir}/libatk-bridge-2.0.so +%{_libdir}/pkgconfig/atk-bridge-2.0.pc + +%changelog +* Mon Mar 25 2013 tomasz.duszynski@comarch.com +- Initial packaging of at-spi2-atk (2.5.92) +