Date: Sunday, May 27, 2012 @ 06:18:03 Author: tomegun Revision: 159949
upgpkg: bluez 4.99-5 use patch submitted upstream, remove (again) bogus udev rules file Added: bluez/trunk/0001-udev-remove-deprecated-function.patch Modified: bluez/trunk/PKGBUILD --------------------------------------------+ 0001-udev-remove-deprecated-function.patch | 27 +++++++++++++++++++++++++++ PKGBUILD | 10 ++++++---- 2 files changed, 33 insertions(+), 4 deletions(-) Added: 0001-udev-remove-deprecated-function.patch =================================================================== --- 0001-udev-remove-deprecated-function.patch (rev 0) +++ 0001-udev-remove-deprecated-function.patch 2012-05-27 10:18:03 UTC (rev 159949) @@ -0,0 +1,27 @@ +From 9e850650bd98e9d05fc937489692b26a64924d16 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen <[email protected]> +Date: Sun, 27 May 2012 00:53:36 +0200 +Subject: [PATCH] udev: remove deprecated function + +This function has in the past returned "/sys" unconditionally. As of udev-183 it +is gone, so just replace it with the string. +--- + tools/hid2hci.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/hid2hci.c b/tools/hid2hci.c +index 45a3a3d..e3a5b2e 100644 +--- a/tools/hid2hci.c ++++ b/tools/hid2hci.c +@@ -291,7 +291,7 @@ int main(int argc, char *argv[]) + if (udev == NULL) + goto exit; + +- snprintf(syspath, sizeof(syspath), "%s/%s", udev_get_sys_path(udev), devpath); ++ snprintf(syspath, sizeof(syspath), "/sys/%s", devpath); + udev_dev = udev_device_new_from_syspath(udev, syspath); + if (udev_dev == NULL) { + fprintf(stderr, "error: could not find '%s'\n", devpath); +-- +1.7.10.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-05-27 10:00:11 UTC (rev 159948) +++ PKGBUILD 2012-05-27 10:18:03 UTC (rev 159949) @@ -5,7 +5,7 @@ pkgname=bluez pkgver=4.99 -pkgrel=4 +pkgrel=5 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/"; arch=('i686' 'x86_64') @@ -25,6 +25,7 @@ backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"; + '0001-udev-remove-deprecated-function.patch' 'bluetooth.conf.d' 'rc.bluetooth') @@ -49,7 +50,7 @@ --enable-wiimote \ --disable-test - sed -ri 's,udev_get_(dev|sys)_path([^)]+\)),"/\1",g' tools/hid2hci.c + patch -p1 -i ../0001-udev-remove-deprecated-function.patch make } @@ -79,9 +80,10 @@ "${pkgdir}"/usr/bin/bluez-test-device \ "${pkgdir}"/usr/bin/bluez-test-input - # http://mailman.archlinux.org/pipermail/arch-general/2011-April/019787.html -# rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules + # fixed upstream in git + rm "${pkgdir}"/usr/lib/udev/rules.d/97-bluetooth.rules } md5sums=('2387053eb5a7b02f37df4871df022a02' + '3175155fbaf73f01377f6c35b5c5e468' '7412982b440f29fa7f76a41a87fef985' '8f9498707f809506928b2e480d3b6789')
