diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-22 07:10:45 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-22 08:58:44 +0000 |
| commit | 0f2f5081476705912c27f879b543ddd79078bf6e (patch) | |
| tree | deb479f509e49bfaf2527a280a2632d2eb916f56 /main/gnome-bluetooth | |
| parent | 5de995de6df5c819bde967a21737eb59805b6110 (diff) | |
| download | aports-0f2f5081476705912c27f879b543ddd79078bf6e.tar.bz2 aports-0f2f5081476705912c27f879b543ddd79078bf6e.tar.xz | |
main/gnome-bluetooth: upgrade to 3.12.0
Diffstat (limited to 'main/gnome-bluetooth')
| -rw-r--r-- | main/gnome-bluetooth/APKBUILD | 26 | ||||
| -rw-r--r-- | main/gnome-bluetooth/udev-hwdb.patch | 46 |
2 files changed, 60 insertions, 12 deletions
diff --git a/main/gnome-bluetooth/APKBUILD b/main/gnome-bluetooth/APKBUILD index 8477eda774..51a3308c59 100644 --- a/main/gnome-bluetooth/APKBUILD +++ b/main/gnome-bluetooth/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnome-bluetooth -pkgver=3.10.0 -pkgrel=1 +pkgver=3.12.0 +pkgrel=0 pkgdesc="The GNOME Bluetooth Subsystem" url="http://live.gnome.org/GnomeBluetooth" arch="all" @@ -9,16 +9,16 @@ license="GPL LGPL" depends="hicolor-icon-theme bluez>=5" makedepends="intltool py-gtk gobject-introspection-dev libunique-dev libnotify-dev libxi-dev libxslt py-libxml2 gnome-doc-utils - dbus-glib-dev gtk+3.0-dev itstool" + dbus-glib-dev gtk+3.0-dev itstool udev-dev" install= subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" source="http://ftp.gnome.org/pub/GNOME/sources/gnome-bluetooth/${pkgver%.*}/gnome-bluetooth-$pkgver.tar.xz - 61-gnome-bluetooth-rfkill.rules" + 61-gnome-bluetooth-rfkill.rules + udev-hwdb.patch" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - update_config_sub || return 1 for i in $source; do case $i in *.patch) @@ -49,7 +49,6 @@ package() { cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la \ - "$pkgdir"/usr/lib/gnome-bluetooth/plugins/*.la \ || return 1 install -m644 -D "$srcdir/61-gnome-bluetooth-rfkill.rules" \ "$pkgdir/lib/udev/rules.d/61-gnome-bluetooth-rfkill.rules" @@ -62,9 +61,12 @@ libs() { mv "$pkgdir"/usr/share/icons "$subpkgdir"/usr/share/ } -md5sums="c112cdca037f90168b04c0f12855006a gnome-bluetooth-3.10.0.tar.xz -9fb6c8dcb5a3de3a953bf2ef42063e6e 61-gnome-bluetooth-rfkill.rules" -sha256sums="7ee4ad464abfed59f04d1a471eb25cfb95fc34eeefbe4c47580dbb50df2ab712 gnome-bluetooth-3.10.0.tar.xz -b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474 61-gnome-bluetooth-rfkill.rules" -sha512sums="49602dedaad43652e542c8ca3682158a80a1e4b1cc7c568946af71357dc209600be654977fb444e8561f87bc7d9df8179bd0a808ab1aebd0fb904fec83865c65 gnome-bluetooth-3.10.0.tar.xz -80b7fd0bc3e0f82c8d2d609ffed634200e63f61d9a134445df8e8511756b7fb423d338a1d12e42b91c57243097beaa3d4662856ec0507fb19a29b6de7ee9e4de 61-gnome-bluetooth-rfkill.rules" +md5sums="c23666aa1d0bfc37be38f45493679de2 gnome-bluetooth-3.12.0.tar.xz +9fb6c8dcb5a3de3a953bf2ef42063e6e 61-gnome-bluetooth-rfkill.rules +89830ec8b85689843c16b0751cad2959 udev-hwdb.patch" +sha256sums="086917c13ada4e3233eafad0a91b072cd60bb2be7c0b7d6657072123fd115c67 gnome-bluetooth-3.12.0.tar.xz +b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474 61-gnome-bluetooth-rfkill.rules +3d8547e186235a030bc3b3c54d1fb403a6515d405d260a4c0d6947321dca6a4d udev-hwdb.patch" +sha512sums="f31e0795b605e87b8aa29a5990985fa788eac41722ebfd200c5119528823c0fd5be180ae1b92d77585d18259da4cf10f258fd2d62573d8956ff1131abf0720fd gnome-bluetooth-3.12.0.tar.xz +80b7fd0bc3e0f82c8d2d609ffed634200e63f61d9a134445df8e8511756b7fb423d338a1d12e42b91c57243097beaa3d4662856ec0507fb19a29b6de7ee9e4de 61-gnome-bluetooth-rfkill.rules +4b991b89a4ea3bb3997016d2028cc8239c127b2b57eea8ad9bfda1265b3370f712daf6a42868c0c357fc5cd3cded350e1a56d90f64390cb8960905329b76879c udev-hwdb.patch" diff --git a/main/gnome-bluetooth/udev-hwdb.patch b/main/gnome-bluetooth/udev-hwdb.patch new file mode 100644 index 0000000000..3fd7cae67c --- /dev/null +++ b/main/gnome-bluetooth/udev-hwdb.patch @@ -0,0 +1,46 @@ +diff --git a/lib/pin.c b/lib/pin.c +index 61e87ab..fa05599 100644 +--- a/lib/pin.c ++++ b/lib/pin.c +@@ -40,11 +40,12 @@ + char * + oui_to_vendor (const char *oui) + { ++ char *vendor = NULL; ++#if HAVE_UDEV_HWDB_NEW + struct udev *udev; + struct udev_hwdb *hwdb; + struct udev_list_entry *list, *l; + char *modalias; +- char *vendor = NULL; + + if (oui == NULL || + strlen (oui) < 8) +@@ -81,7 +82,7 @@ bail: + g_clear_pointer (&modalias, g_free); + g_clear_pointer (&hwdb, udev_hwdb_unref); + g_clear_pointer (&udev, udev_unref); +- ++#endif + return vendor; + } + +@@ -207,7 +208,7 @@ get_pincode_for_device (guint type, + data.confirm = TRUE; + + tmp_vendor = oui_to_vendor (address); +- data.vendor = g_ascii_strdown (tmp_vendor, -1); ++ data.vendor = g_ascii_strdown (tmp_vendor ? tmp_vendor : "unknown", -1); + g_free (tmp_vendor); + + ctx = g_markup_parse_context_new (&parser, 0, &data, NULL); +@@ -227,7 +228,8 @@ get_pincode_for_device (guint type, + + g_debug ("Got pin '%s' (max digits: %d, confirm: %d) for device '%s' (type: %s address: %s, vendor: %s)", + data.ret_pin, data.max_digits, data.confirm, +- name ? name : "", bluetooth_type_to_string (type), address, data.vendor); ++ name ? name : "", bluetooth_type_to_string (type), address, ++ data.vendor ? data.vendor : "unknown"); + + g_free (data.vendor); + |