Merge upstream branch 2.30.0 into origin/tizen

Change-Id: I83bea7f9df9f970877cd67b99be696aa89c2d59b

diff --cc .gbs.conf
index 3cdac5d,0000000..ce0d373
mode 100644,000000..100644
--- 1/.gbs.conf
--- /dev/null
+++ b/.gbs.conf
@@@ -1,4 -1,0 +1,4 @@@
- upstream_branch = upstream
 +[general]
++upstream_branch = upstream-git
 +upstream_tag = upstream/${upstreamversion}
 +

diff --cc atk-adaptor/accessible-stateset.c
Simple merge

diff --cc atk-adaptor/adaptors/collection-adaptor.c
index 65c9dbc,3c9ae66..64d9959
--- 1/atk-adaptor/adaptors/collection-adaptor.c
--- 2/atk-adaptor/adaptors/collection-adaptor.c
+++ b/atk-adaptor/adaptors/collection-adaptor.c
@@@ -1293,8 -1295,9 +1295,10 @@@ impl_GetTree (DBusConnection * bus
        append_accessible_properties (&iter_array, object, properties);
        dbus_message_iter_close_container (&iter, &iter_array);
      }
- //walkm (reply);
+ #if 0
+   walkm (reply);
+ #endif
 +  g_array_free (properties, TRUE);
    return reply;
  }
  

diff --cc atk-adaptor/adaptors/component-adaptor.c
Simple merge

diff --cc atk-adaptor/event.c
index 72fe89d,739dc2c..e443bca
--- 1/atk-adaptor/event.c
--- 2/atk-adaptor/event.c
+++ b/atk-adaptor/event.c
@@@ -952,10 -944,11 +944,12 @@@ text_insert_event_listener (GSignalInvo
  
    if (G_VALUE_TYPE (&param_values[3]) == G_TYPE_STRING)
      text = g_value_get_string (&param_values[3]);
+   else
+     text = "";
  
 -  emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
 -              DBUS_TYPE_STRING_AS_STRING, text, append_basic);
 +  if (text != NULL)
 +    emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
 +                DBUS_TYPE_STRING_AS_STRING, text, append_basic);
    g_free (minor);
    return TRUE;
  }
@@@ -1002,10 -995,11 +996,12 @@@ text_remove_event_listener (GSignalInvo
  
    if (G_VALUE_TYPE (&param_values[3]) == G_TYPE_STRING)
      text = g_value_get_string (&param_values[3]);
+   else
+     text = "";
  
 -  emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
 -              DBUS_TYPE_STRING_AS_STRING, text, append_basic);
 +  if (text != NULL)
 +    emit_event (accessible, ITF_EVENT_OBJECT, name, minor, detail1, detail2,
 +                DBUS_TYPE_STRING_AS_STRING, text, append_basic);
    g_free (minor);
    return TRUE;
  }

diff --cc atk-adaptor/introspection.c
Simple merge

diff --cc droute/droute.c
Simple merge

diff --cc packaging/at-spi2-atk.spec
index 1debbb7,0000000..b2925bd
mode 100644,000000..100644
--- 1/packaging/at-spi2-atk.spec
--- /dev/null
+++ b/packaging/at-spi2-atk.spec
@@@ -1,77 -1,0 +1,80 @@@
- Version: 2.26.1
 +Name: at-spi2-atk
- Source: http://download.gnome.org/sources/at-spi2-atk/2.26/%{name}-%{version}.tar.xz
++Version: 2.30.0
 +Release: 1
 +Summary: Assistive Technology Service Provider Interface - GTK+ module
 +License: LGPL-2.0+
 +Group: System/Libraries
 +Url: http://www.gnome.org/
- %autogen --enable-p2p=no
- %__make %{?_smp_flags}
++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
- %make_install
++meson build
++(cd build && ninja)
 +
 +%install
 +rm -rf %{buildroot}
- %{_libdir}/libatk-bridge-2.0.so.*
- %{_libdir}/gtk-2.0/modules/libatk-bridge.so
++(cd build && DESTDIR=%{buildroot} ninja 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)
- %{_includedir}/at-spi2-atk/2.0/atk-bridge.h
- %{_libdir}/libatk-bridge-2.0.so
- %{_libdir}/pkgconfig/atk-bridge-2.0.pc
++/usr/local/lib/libatk-bridge-2.0.so.*
++/usr/local/lib/gtk-2.0/modules/libatk-bridge.so
 +
 +%files devel
 +%manifest %{name}.manifest
 +%defattr(-,root,root)
++/usr/local/include/at-spi2-atk/2.0/atk-bridge.h
++/usr/local/lib/libatk-bridge-2.0.so
++/usr/local/lib/pkgconfig/atk-bridge-2.0.pc
 +
 +%changelog
 +* Mon Mar 25 2013 tomasz.duszynski@comarch.com
 +- Initial packaging of at-spi2-atk (2.5.92)
 +