diff options
Diffstat (limited to 'community')
| -rw-r--r-- | community/gnome-bluetooth/APKBUILD | 25 | ||||
| -rw-r--r-- | community/gnome-bluetooth/udev-hwdb.patch | 46 |
2 files changed, 11 insertions, 60 deletions
diff --git a/community/gnome-bluetooth/APKBUILD b/community/gnome-bluetooth/APKBUILD index d09bb6bbc2..09f997203f 100644 --- a/community/gnome-bluetooth/APKBUILD +++ b/community/gnome-bluetooth/APKBUILD @@ -1,20 +1,20 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gnome-bluetooth -pkgver=3.16.1 -pkgrel=1 +pkgver=3.18.0 +pkgrel=0 pkgdesc="The GNOME Bluetooth Subsystem" url="http://live.gnome.org/GnomeBluetooth" arch="all" license="GPL LGPL" depends="hicolor-icon-theme bluez>=5" -makedepends="intltool py-gtk gobject-introspection-dev libunique-dev +makedepends="intltool gobject-introspection-dev libunique-dev libnotify-dev libxi-dev libxslt py-libxml2 gnome-doc-utils - dbus-glib-dev gtk+3.0-dev itstool eudev-dev" + dbus-glib-dev gtk+3.0-dev itstool eudev-dev libcanberra-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 - udev-hwdb.patch" + " _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -59,12 +59,9 @@ libs() { mv "$pkgdir"/usr/share/icons "$subpkgdir"/usr/share/ } -md5sums="de7eb807e3ae913bca53917b195d9d9f gnome-bluetooth-3.16.1.tar.xz -9fb6c8dcb5a3de3a953bf2ef42063e6e 61-gnome-bluetooth-rfkill.rules -89830ec8b85689843c16b0751cad2959 udev-hwdb.patch" -sha256sums="3feb202d6780a53bc4a570eab5b0179f9351b32c1d3f28151ac2d222453ae08b gnome-bluetooth-3.16.1.tar.xz -b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474 61-gnome-bluetooth-rfkill.rules -3d8547e186235a030bc3b3c54d1fb403a6515d405d260a4c0d6947321dca6a4d udev-hwdb.patch" -sha512sums="811db04e1ab91585031e86cb55ee7764b0f0dfd88682afaee2e67f99af12619c540a48a3879afd8fb66e39cb35917f637b637e4b6f3ab8b8e908351426b77576 gnome-bluetooth-3.16.1.tar.xz -80b7fd0bc3e0f82c8d2d609ffed634200e63f61d9a134445df8e8511756b7fb423d338a1d12e42b91c57243097beaa3d4662856ec0507fb19a29b6de7ee9e4de 61-gnome-bluetooth-rfkill.rules -4b991b89a4ea3bb3997016d2028cc8239c127b2b57eea8ad9bfda1265b3370f712daf6a42868c0c357fc5cd3cded350e1a56d90f64390cb8960905329b76879c udev-hwdb.patch" +md5sums="040128a3c3cf6809381fb474a6297cec gnome-bluetooth-3.18.0.tar.xz +9fb6c8dcb5a3de3a953bf2ef42063e6e 61-gnome-bluetooth-rfkill.rules" +sha256sums="f5c0d43226c4ec6a545dddb86181adadbc2b5cf720b640026003b9660fba0b8f gnome-bluetooth-3.18.0.tar.xz +b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474 61-gnome-bluetooth-rfkill.rules" +sha512sums="ffc7a954cf1dce1c32054750f77d751b4ca4c80a7f70d2bd614122d591b2e7ab73a6c414f3cf12cd64b694459861d7c11d2d931c207fcf409d4bd0db3a1ea2f0 gnome-bluetooth-3.18.0.tar.xz +80b7fd0bc3e0f82c8d2d609ffed634200e63f61d9a134445df8e8511756b7fb423d338a1d12e42b91c57243097beaa3d4662856ec0507fb19a29b6de7ee9e4de 61-gnome-bluetooth-rfkill.rules" diff --git a/community/gnome-bluetooth/udev-hwdb.patch b/community/gnome-bluetooth/udev-hwdb.patch deleted file mode 100644 index 3fd7cae67c..0000000000 --- a/community/gnome-bluetooth/udev-hwdb.patch +++ /dev/null @@ -1,46 +0,0 @@ -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); - |