[arch-commits] Commit in bluez/repos (4 files)

Andrea Scarpino andrea at archlinux.org
Wed Sep 30 18:23:14 UTC 2009


    Date: Wednesday, September 30, 2009 @ 14:23:14
  Author: andrea
Revision: 53373

Merged revisions 53314 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/bluez/trunk

........
  r53314 | geoffroy | 2009-09-28 17:37:45 +0200 (Mon, 28 Sep 2009) | 2 lines
  
  upgpkg: bluez 4.54-1
      bluez update
........

Modified:
  bluez/repos/extra-i686/	(properties)
  bluez/repos/extra-i686/PKGBUILD
Deleted:
  bluez/repos/extra-i686/bluez-activate-wacom-mode2.patch
  bluez/repos/extra-i686/bluez-try-utf8-harder.patch

----------------------------------+
 PKGBUILD                         |   14 ++++----------
 bluez-activate-wacom-mode2.patch |   24 ------------------------
 bluez-try-utf8-harder.patch      |   23 -----------------------
 3 files changed, 4 insertions(+), 57 deletions(-)


Property changes on: bluez/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /bluez/trunk:1-38920
   + /bluez/trunk:1-53372

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-09-30 18:09:12 UTC (rev 53372)
+++ extra-i686/PKGBUILD	2009-09-30 18:23:14 UTC (rev 53373)
@@ -1,6 +1,6 @@
 # Maintainer: Geoffroy Carrier <geoffroy at archlinux.org>
 pkgname=bluez
-pkgver=4.39
+pkgver=4.54
 pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -16,20 +16,11 @@
 backup=(etc/bluetooth/{main,rfcomm,audio,network,input}.conf
         etc/conf.d/bluetooth)
 source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2
-	bluez-activate-wacom-mode2.patch
-	bluez-try-utf8-harder.patch
         bluetooth.conf.d
         rc.bluetooth)
-md5sums=('3f7671a3939eabbc261d3a92da83445f'
-         '240e81c89840f181da658f4b6bd2cc0f'
-         '726e6811cfe2d9b1bde34814bb29ec9f'
-         'd12be5b494525bb1ba6eac5c3983dd3e'
-         'b67bd953082befea6ae57c6fe25993e8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/bluez-activate-wacom-mode2.patch" || return 1
-  patch -Np1 -i "${srcdir}/bluez-try-utf8-harder.patch" || return 1
   ./configure --prefix=/usr \
         --sysconfdir=/etc \
         --localstatedir=/var \
@@ -66,3 +57,6 @@
 
   install -m755 test/simple-agent "${pkgdir}/usr/bin/bluez-simple-agent" || return 1
 }
+md5sums=('367e29fb7520aa01b12689635993b868'
+         'd12be5b494525bb1ba6eac5c3983dd3e'
+         'b67bd953082befea6ae57c6fe25993e8')

Deleted: extra-i686/bluez-activate-wacom-mode2.patch
===================================================================
--- extra-i686/bluez-activate-wacom-mode2.patch	2009-09-30 18:09:12 UTC (rev 53372)
+++ extra-i686/bluez-activate-wacom-mode2.patch	2009-09-30 18:23:14 UTC (rev 53373)
@@ -1,24 +0,0 @@
-diff --git a/input/device.c b/input/device.c
-index 0090bd4..8d65148 100644
---- a/input/device.c
-+++ b/input/device.c
-@@ -658,6 +658,19 @@ static int hidp_add_connection(const struct input_device *idev,
- 		err = write(sk, buf, sizeof(buf));
- 	}
- 
-+	if (req->vendor == 0x056a && req->product == 0x81) {
-+		unsigned char buf[3];
-+		int sk = g_io_channel_unix_get_fd(iconn->ctrl_io);
-+
-+		buf[0] = 0x53; /* HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE */
-+		buf[1] = 0x03; buf[2] = 0x00;
-+		write(sk, buf, sizeof(buf));
-+
-+		buf[0] = 0x71; /* HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE */
-+		/* 0x06 - high reporting speed, 0x05 - low speed */
-+		buf[1] = 0x06; buf[2] = 0x00;
-+		write(sk, buf, sizeof(buf));
-+	}
- 	err = ioctl_connadd(req);
- 
- cleanup:

Deleted: extra-i686/bluez-try-utf8-harder.patch
===================================================================
--- extra-i686/bluez-try-utf8-harder.patch	2009-09-30 18:09:12 UTC (rev 53372)
+++ extra-i686/bluez-try-utf8-harder.patch	2009-09-30 18:23:14 UTC (rev 53373)
@@ -1,23 +0,0 @@
-diff --git a/src/security.c b/src/security.c
-index a61d75f..75908ba 100644
---- a/src/security.c
-+++ b/src/security.c
-@@ -600,8 +600,16 @@ static inline void remote_name_information(int dev, bdaddr_t *sba, void *ptr)
- 		memcpy(name, evt->name, 248);
- 		/* It's ok to cast end between const and non-const since
- 		 * we know it points to inside of name which is non-const */
--		if (!g_utf8_validate(name, -1, (const char **) &end))
--			*end = '\0';
-+		if (!g_utf8_validate(name, -1, (const char **) &end)) {
-+			char *utf8_name;
-+
-+			utf8_name = g_convert(name, -1, "UTF-8", "ISO-8859-1", NULL, NULL, NULL);
-+			if (utf8_name) {
-+				memcpy(name, utf8_name, 248);
-+				g_free(utf8_name);
-+			} else
-+				*end = '\0';
-+		}
- 		write_device_name(sba, &dba, name);
- 	}
- 




More information about the arch-commits mailing list