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
This commit is contained in:
parent
2c02a86756
commit
b9174905d3
34
at-spi2-core-non_void.patch
Normal file
34
at-spi2-core-non_void.patch
Normal file
@ -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;
|
||||
}
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user