Merge tag 'upstream/2.42.0' into tizen

Change-Id: I87038728bc8e0c601919628524be8f7e0bba6c08

diff --cc atspi/atspi-event-listener.c
Simple merge

diff --cc bus/accessibility.conf.in
index 4091893,33d6e1c..67c1578
--- 1/bus/accessibility.conf.in
--- 2/bus/accessibility.conf.in
+++ b/bus/accessibility.conf.in
@@@ -6,9 -6,11 +6,9 @@@
  <servicedir>@DATADIR@/dbus-1/accessibility-services</servicedir>
    <auth>EXTERNAL</auth>
  
-   <listen>unix:dir=/tmp</listen>
+   <listen>@SOCKET_ADDRESS@</listen>
  
 -  <policy context="default">
 -    <!-- Allow root to connect -->
 -    <allow user="root"/>
 +  <policy user="owner">
      <!-- Allow everything to be sent -->
      <allow send_destination="*" eavesdrop="true"/>
      <!-- Allow everything to be received -->

diff --cc bus/meson.build
Simple merge

diff --cc meson.build
Simple merge

diff --cc packaging/at-spi2-core.spec
index 939eb56,0000000..09c3abb
mode 100644,000000..100644
--- 1/packaging/at-spi2-core.spec
--- /dev/null
+++ b/packaging/at-spi2-core.spec
@@@ -1,129 -1,0 +1,129 @@@
- Version: 2.39.90
 +%bcond_with x
 +
 +Name: at-spi2-core
++Version: 2.42.0
 +Release: 1
 +Summary: Assistive Technology Service Provider Interface - D-Bus based implementation
 +License: LGPL-2.1+
 +Group: System/Libraries
 +Url: http://www.gnome.org/
 +Source: http://ftp.gnome.org/pub/GNOME/sources/at-spi2-core/2.31/%{name}-%{version}.tar.xz
 +Source1001:    %{name}.manifest
 +Requires:      dbus
 +BuildRequires: python-devel
 +BuildRequires: python-xml
 +BuildRequires: intltool
 +BuildRequires: dbus-devel
 +BuildRequires: glib2-devel
 +BuildRequires: gettext
 +BuildRequires: gtk-doc
 +%if %{with x}
 +BuildRequires: libX11-devel
 +BuildRequires: libXtst-devel
 +BuildRequires: libXi-devel
 +%endif
 +BuildRequires: pkgconfig(vconf)
 +BuildRequires: pkgconfig(appsvc)
 +BuildRequires: pkgconfig(dlog)
 +BuildRequires: pkgconfig(aul)
 +BuildRequires: gobject-introspection
 +BuildRequires: meson
 +BuildRequires: app-svc-devel
 +
 +%description
 +AT-SPI is a general interface for applications to make use of the
 +accessibility toolkit. This version is based on dbus.
 +
 +This package contains the AT-SPI registry daemon. It provides a
 +mechanism for all assistive technologies to discover and interact
 +with applications running on the desktop.
 +
 +%package -n libatspi0
 +Summary: An Accessibility ToolKit -- Library
 +Group: System/Libraries
 +
 +%description -n libatspi0
 +AT-SPI is a general interface for applications to make use of the
 +accessibility toolkit. This version is based on dbus.
 +
 +%package -n typelib-1_0-Atspi-2_0
 +Summary: An Accessibility ToolKit -- Introspection bindings
 +Group: System/Libraries
 +
 +%description -n typelib-1_0-Atspi-2_0
 +AT-SPI is a general interface for applications to make use of the
 +accessibility toolkit. This version is based on dbus.
 +
 +This package provides the GObject Introspection bindings for the
 +libatspi library.
 +
 +%package devel
 +Summary: Include Files and Libraries mandatory for Development
 +Group: Development/Libraries
 +Requires: %{name} = %{version}
 +Requires: libatspi0 = %{version}
 +Requires: typelib-1_0-Atspi-2_0 = %{version}
 +
 +%description devel
 +This package contains all necessary include files and libraries needed
 +to develop applications that require these.
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +%build
 +meson --prefix /usr --libdir %{_libdir} build -Dwith-dbus-daemondir=%{_bindir} -Ddbus_daemon=/usr/bin/dbus-daemon \
 +%if !%{with x}
 +        -Denable-x11=no \
 +%else
 +        -Denable-x11=yes \
 +%endif
 +        -Denable-static=no
 +
 +ninja -C build all
 +
 +%install
 +find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
 +
 +export DESTDIR=%{buildroot}
 +ninja -C build install
 +
 +%find_lang %{name}
 +
 +%clean
 +rm -fr %{buildroot}
 +
 +%post -n libatspi0 -p /sbin/ldconfig
 +
 +%postun -n libatspi0 -p /sbin/ldconfig
 +
 +%files -f %{name}.lang
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
 +%{_bindir}/at_spi2_tool
 +
 +%doc AUTHORS README
 +%license COPYING
 +%{_libexecdir}/at-spi-bus-launcher
 +%{_libexecdir}/at-spi2-registryd
 +%{_datadir}/defaults/at-spi2/accessibility.conf
 +%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop
 +%{_datadir}/dbus-1/accessibility-services/org.a11y.atspi.Registry.service
 +%{_datadir}/dbus-1/services/org.a11y.Bus.service
 +%{_prefix}/lib/systemd/user/at-spi-dbus-bus.service
 +%files -n libatspi0
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%{_libdir}/libatspi.so.0*
 +
 +%files -n typelib-1_0-Atspi-2_0
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-, root, root)
 +%{_includedir}/at-spi-2.0
 +%{_libdir}/libatspi.so
 +%{_libdir}/pkgconfig/atspi-2.pc

diff --cc registryd/deviceeventcontroller.c
Simple merge