[arch-commits] Commit in obex-data-server/trunk (2 files)

[Jan de Groot]

    Date: Sunday, September 14, 2008 @ 15:07:14
  Author: jgc
Revision: 12495

upgpkg: obex-data-server 0.3.4-1
    Rebuild for bluez 4.1

Added:
  obex-data-server/trunk/obex-data-server-0.3.4-bluez4.patch
Modified:
  obex-data-server/trunk/PKGBUILD

-------------------------------------+
 PKGBUILD                            |   20 +++++++++++---------
 obex-data-server-0.3.4-bluez4.patch |   25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-14 18:49:51 UTC (rev 12494)
+++ PKGBUILD	2008-09-14 19:07:14 UTC (rev 12495)
@@ -3,20 +3,22 @@
 # Contributor: Keerthi <keerthi.linux at gmail.com>
 
 pkgname=obex-data-server
-pkgver=0.3
-pkgrel=3
+pkgver=0.3.4
+pkgrel=1
 pkgdesc="obex-data-server is D-Bus service providing high-level OBEX client and server side functionality."
 arch=('i686' 'x86_64')
 url="http://wiki.muiline.com/obex-data-server"
 license=('GPL')
-depends=('glib2' 'dbus' 'dbus-glib' 'libusb' 'bluez-libs' 'openobex')
-makedepends=()
-source=(http://tadas.dailyda.com/software/$pkgname-$pkgver.tar.gz)
-md5sums=('d665127eb9d43d87b98cfff07b8fac60')
+depends=('dbus-glib>=0.76' 'bluez>=4.1' 'openobex>=1.3-3')
+source=(http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz
+	obex-data-server-0.3.4-bluez4.patch)
+md5sums=('5c71d24e8d471cc294d9d47a8f8de971'
+         '0ffcebc3a1dde3e6b5670f4003b847c7')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --enable-system-config --sysconfdir=/etc
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/obex-data-server-0.3.4-bluez4.patch" || return 1
+  ./configure --prefix=/usr --enable-system-config --sysconfdir=/etc || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }

Added: obex-data-server-0.3.4-bluez4.patch
===================================================================
--- obex-data-server-0.3.4-bluez4.patch	                        (rev 0)
+++ obex-data-server-0.3.4-bluez4.patch	2008-09-14 19:07:14 UTC (rev 12495)
@@ -0,0 +1,25 @@
+--- obex-data-server-0.3.4.old/src/ods-bluez.c	2008-06-27 16:21:14.000000000 +0100
++++ obex-data-server-0.3.4/src/ods-bluez.c	2008-09-12 18:17:27.000000000 +0100
+@@ -121,11 +121,11 @@ ods_bluez_init (OdsBluez *bluez)
+ 	
+ 	bluez->priv->manager_proxy = dbus_g_proxy_new_for_name (klass->connection,
+ 															"org.bluez", 
+-															"/org/bluez", 
++															"/", 
+ 															"org.bluez.Manager");
+ 	if (!dbus_g_proxy_call (bluez->priv->manager_proxy, "DefaultAdapter", &error, 
+ 								G_TYPE_INVALID,
+-								G_TYPE_STRING, &adapter_object, 
++								DBUS_TYPE_G_OBJECT_PATH, &adapter_object,
+ 								G_TYPE_INVALID)) {
+ 		g_warning("Unable to connect to dbus: %s", error->message);
+ 		g_clear_error (&error);
+@@ -314,7 +314,7 @@ get_remote_service_record_cb (DBusGProxy
+ 		goto err;
+ 	}
+ 	
+-	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, &scanned);
++	sdp_record = sdp_extract_pdu ((uint8_t *)record_array->data, record_array->len, &scanned);
+ 	
+ 	/* get channel for this service */
+ 	if (sdp_get_access_protos (sdp_record, &protos) != 0) {