From 2c02a8675646969310dc3316a35fc87b1b45756001fcacced2ee243b26bca8eb Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sun, 21 Feb 2010 16:39:21 +0000 Subject: [PATCH 1/3] Accepting request 33022 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/at-spi2-core via accept of submit request 33022 revision 3. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/33022 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=18 --- at-spi2-core-0.1.6.tar.bz2 | 3 --- at-spi2-core-0.1.7.tar.bz2 | 3 +++ at-spi2-core.changes | 11 +++++++++++ at-spi2-core.spec | 7 +++---- 4 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 at-spi2-core-0.1.6.tar.bz2 create mode 100644 at-spi2-core-0.1.7.tar.bz2 diff --git a/at-spi2-core-0.1.6.tar.bz2 b/at-spi2-core-0.1.6.tar.bz2 deleted file mode 100644 index 25c1548..0000000 --- a/at-spi2-core-0.1.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a52c0d23d8cf656f0cd6986394baebc1f0f60fc41b0a2c9ea80967b21c3c7277 -size 325920 diff --git a/at-spi2-core-0.1.7.tar.bz2 b/at-spi2-core-0.1.7.tar.bz2 new file mode 100644 index 0000000..e49f7ed --- /dev/null +++ b/at-spi2-core-0.1.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9d6263357ddb7583789105d3ec6b764b51643777fa55409024eab1807592b74 +size 282192 diff --git a/at-spi2-core.changes b/at-spi2-core.changes index 1fdc678..bc472fa 100644 --- a/at-spi2-core.changes +++ b/at-spi2-core.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sun Feb 21 17:24:28 CET 2010 - vuntz@opensuse.org + +- Update to version 0.1.7: + + Completely re-work the protocol definitions. + + Make the desktop object and deviceeventcontroller + introspectable. + + Add the XML files to the distribution. + + Modify the interface name from org.freedesktop.atspi to + org.a11y.atspi. + ------------------------------------------------------------------- Fri Feb 12 15:05:12 CET 2010 - vuntz@opensuse.org diff --git a/at-spi2-core.spec b/at-spi2-core.spec index 968b196..f7b6d6c 100644 --- a/at-spi2-core.spec +++ b/at-spi2-core.spec @@ -1,5 +1,5 @@ # -# spec file for package at-spi2-core (Version 0.1.6) +# spec file for package at-spi2-core (Version 0.1.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: at-spi2-core -Version: 0.1.6 +Version: 0.1.7 Release: 1 # FIXME: check that tarballs > 0.1.6 ship bus/ directory, and if they do, reapply patch0 and call to suse_update_desktop_file Summary: Assistive Technology Service Provider Interface - D-Bus based implementation @@ -79,7 +79,6 @@ rm -rf %{buildroot} %{_libexecdir}/at-spi2/ #%{_sysconfdir}/at-spi2/ #%{_sysconfdir}/xdg/autostart/at-spi-dbus-bus.desktop -%{_datadir}/at-spi2/ -%{_datadir}/dbus-1/services/org.freedesktop.atspi.Registry.service +%{_datadir}/dbus-1/services/org.a11y.atspi.Registry.service %changelog From b9174905d336bdb9a1465b46a1f585798d6d1e5787b49c91b5bd9f17c112ecee Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 3 Mar 2010 11:18:06 +0000 Subject: [PATCH 2/3] Accepting request 33729 from home:oertel:branches:GNOME:Factory Copy from home:oertel:branches:GNOME:Factory/at-spi2-core via accept of submit request 33729 revision 2. Request was accepted with message: Thanks for the fix. I'll tag the patch and forward the fix to oS:F OBS-URL: https://build.opensuse.org/request/show/33729 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=19 --- at-spi2-core-non_void.patch | 34 ++++++++++++++++++++++++++++++++++ at-spi2-core.changes | 6 ++++++ at-spi2-core.spec | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 at-spi2-core-non_void.patch diff --git a/at-spi2-core-non_void.patch b/at-spi2-core-non_void.patch new file mode 100644 index 0000000..543b03e --- /dev/null +++ b/at-spi2-core-non_void.patch @@ -0,0 +1,34 @@ +--- registryd/registry.c ++++ registryd/registry.c +@@ -99,6 +99,7 @@ + &variant); + dbus_message_iter_append_basic (&variant, DBUS_TYPE_STRING, &str); + dbus_message_iter_close_container (iter, &variant); ++ return TRUE; + } + + static void +@@ -440,6 +441,7 @@ + dbus_int32_t rv = reg->apps->len; + + dbus_message_iter_append_basic (iter, DBUS_TYPE_INT32, &rv); ++ return TRUE; + } + + static DBusMessage * +@@ -755,6 +757,7 @@ + { + emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "add", index, 0, + name, path); ++ return TRUE; + } + + static gboolean +@@ -765,6 +768,7 @@ + { + emit_event (bus, SPI_DBUS_INTERFACE_EVENT_OBJECT, "ChildrenChanged", "remove", index, 0, + name, SPI_DBUS_PATH_NULL); ++ return TRUE; + } + + /*---------------------------------------------------------------------------*/ diff --git a/at-spi2-core.changes b/at-spi2-core.changes index bc472fa..549c15a 100644 --- a/at-spi2-core.changes +++ b/at-spi2-core.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 2 00:38:02 CET 2010 - ro@suse.de + +- fix warning: no return statement in function returning non-void + in registry.c to fix build + ------------------------------------------------------------------- Sun Feb 21 17:24:28 CET 2010 - vuntz@opensuse.org diff --git a/at-spi2-core.spec b/at-spi2-core.spec index f7b6d6c..75d712f 100644 --- a/at-spi2-core.spec +++ b/at-spi2-core.spec @@ -29,6 +29,7 @@ Source0: %{name}-%{version}.tar.bz2 Source99: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM at-spi2-core-dbus-path.patch vuntz@opensuse.org -- Use the right path for a dbus helper. This will be fixed upstream in a more generic way Patch0: at-spi2-core-dbus-path.patch +Patch1: at-spi2-core-non_void.patch BuildRequires: dbus-1-glib-devel BuildRequires: glib2-devel BuildRequires: xorg-x11-devel @@ -50,6 +51,7 @@ with applications running on the desktop. %prep %setup -q +%patch1 # Reapply when bus/ is shipped again in the tarball #%patch0 -p1 From 4f561a0f8b2f2ae6eef5e0b62ae7efe5eaf87d105e1c0d85124f978563024322 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 3 Mar 2010 11:25:02 +0000 Subject: [PATCH 3/3] Accepting request 33847 from home:dimstar:branches:GNOME:Factory Copy from home:dimstar:branches:GNOME:Factory/at-spi2-core via accept of submit request 33847 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/33847 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/at-spi2-core?expand=0&rev=20 --- at-spi2-core.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/at-spi2-core.spec b/at-spi2-core.spec index 75d712f..8067c16 100644 --- a/at-spi2-core.spec +++ b/at-spi2-core.spec @@ -29,6 +29,7 @@ Source0: %{name}-%{version}.tar.bz2 Source99: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM at-spi2-core-dbus-path.patch vuntz@opensuse.org -- Use the right path for a dbus helper. This will be fixed upstream in a more generic way Patch0: at-spi2-core-dbus-path.patch +# PATCH-FIX-UPSTREAM at-spi2-core-non_void.patch fdo#26855 ro@novell.com -- Fix compiler warnings no-return-in-non-void-function. Patch1: at-spi2-core-non_void.patch BuildRequires: dbus-1-glib-devel BuildRequires: glib2-devel