Hello community, here is the log from the commit of package obex-data-server for openSUSE:Factory checked in at 2013-11-28 07:38:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obex-data-server (Old) and /work/SRC/openSUSE:Factory/.obex-data-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obex-data-server" Changes: -------- --- /work/SRC/openSUSE:Factory/obex-data-server/obex-data-server.changes 2013-04-16 06:49:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.obex-data-server.new/obex-data-server.changes 2013-11-28 07:38:16.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 19 18:36:07 CET 2013 - [email protected] + +- obex-data-server-openobex_EnumerateInterfaces.patch: + openobex removed OBEX_FindInterfaces(), adapt code + +------------------------------------------------------------------- New: ---- obex-data-server-openobex_EnumerateInterfaces.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obex-data-server.spec ++++++ --- /var/tmp/diff_new_pack.PMF36S/_old 2013-11-28 07:38:16.000000000 +0100 +++ /var/tmp/diff_new_pack.PMF36S/_new 2013-11-28 07:38:16.000000000 +0100 @@ -24,6 +24,7 @@ Group: Hardware/Mobile Url: http://wiki.muiline.com/obex-data-server Source: http://tadas.dailyda.com/software/%{name}-%{version}.tar.gz +Patch0: obex-data-server-openobex_EnumerateInterfaces.patch BuildRequires: bluez-devel BuildRequires: dbus-1-glib-devel BuildRequires: gtk2-devel @@ -37,6 +38,7 @@ %prep %setup -q +%patch0 %build CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --with-dbus-dir=/usr/share/dbus-1 ++++++ obex-data-server-openobex_EnumerateInterfaces.patch ++++++ --- src/ods-obex.c +++ src/ods-obex.c @@ -400,7 +400,7 @@ gpointer user_data, GError **error) { gint ret; - obex_interface_t *obex_intf; + obex_interface_t *obex_intf = NULL; int interfaces_num; /* call OBEX_Init, setup USB Transport here */ @@ -412,14 +412,15 @@ goto err; } - interfaces_num = OBEX_FindInterfaces(obex_context->obex_handle, &obex_intf); + interfaces_num = OBEX_EnumerateInterfaces(obex_context->obex_handle); if (intf_num >= interfaces_num) { g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "Invalid interface number"); goto err; } + obex_intf = OBEX_GetInterfaceByIndex(obex_context->obex_handle, intf_num); OBEX_SetUserData (obex_context->obex_handle, user_data); - ret = OBEX_InterfaceConnect(obex_context->obex_handle, &obex_intf[intf_num]); + ret = OBEX_InterfaceConnect(obex_context->obex_handle, obex_intf); if (ret < 0) { g_set_error (error, ODS_ERROR, ODS_ERROR_FAILED, "USB setup failed"); goto err; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
