diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2019-09-16 10:10:48 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2019-09-16 10:10:48 +0200 |
| commit | e8ae8b1d54da25a6a7a68197ed49265cdee03089 (patch) | |
| tree | b4faa980ef7088812b8bcce3283ee0131fc671d9 /extra | |
| parent | c28f4710cfb51527d748efd723919cd0539dbe46 (diff) | |
| download | packages-e8ae8b1d54da25a6a7a68197ed49265cdee03089.tar.xz | |
extra/bluez: removed bluez-5.50-signal-signature-btpclient patch, is applied upstream
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/bluez/PKGBUILD | 2 | ||||
| -rw-r--r-- | extra/bluez/bluez-5.50-signal-signature-btpclient.patch | 55 |
2 files changed, 0 insertions, 57 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD deleted file mode 100644 index c5a937c4..00000000 --- a/extra/bluez/PKGBUILD +++ /dev/null @@ -1,2 +0,0 @@ -# for now, tons os segfaults, don't assume, Bluetooth will work! -unset check diff --git a/extra/bluez/bluez-5.50-signal-signature-btpclient.patch b/extra/bluez/bluez-5.50-signal-signature-btpclient.patch deleted file mode 100644 index 3c2dc935..00000000 --- a/extra/bluez/bluez-5.50-signal-signature-btpclient.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -rauN bluez-5.50/tools/btpclient.c bluez-5.50-signal-signature-btpclient-patch/tools/btpclient.c ---- bluez-5.50/tools/btpclient.c 2018-03-10 16:37:07.000000000 +0100 -+++ bluez-5.50-signal-signature-btpclient-patch/tools/btpclient.c 2019-07-31 19:36:58.022464813 +0200 -@@ -29,6 +29,7 @@ - #include <stdlib.h> - #include <assert.h> - #include <getopt.h> -+#include <signal.h> - - #include <ell/ell.h> - -@@ -2827,8 +2828,7 @@ - btp_core_unregister, NULL, NULL); - } - --static void signal_handler(struct l_signal *signal, uint32_t signo, -- void *user_data) -+static void signal_handler(uint32_t signo, void *user_data) - { - switch (signo) { - case SIGINT: -@@ -3156,8 +3156,6 @@ - int main(int argc, char *argv[]) - { - struct l_dbus_client *client; -- struct l_signal *signal; -- sigset_t mask; - int opt; - - l_log_set_stderr(); -@@ -3194,11 +3192,6 @@ - - adapters = l_queue_new(); - -- sigemptyset(&mask); -- sigaddset(&mask, SIGINT); -- sigaddset(&mask, SIGTERM); -- signal = l_signal_create(&mask, signal_handler, NULL, NULL); -- - dbus = l_dbus_new_default(L_DBUS_SYSTEM_BUS); - l_dbus_set_ready_handler(dbus, ready_callback, NULL, NULL); - client = l_dbus_client_new(dbus, "org.bluez", "/org/bluez"); -@@ -3212,11 +3205,10 @@ - - l_dbus_client_set_ready_handler(client, client_ready, NULL, NULL); - -- l_main_run(); -+ l_main_run_with_signal(signal_handler, NULL); - - l_dbus_client_destroy(client); - l_dbus_destroy(dbus); -- l_signal_remove(signal); - btp_cleanup(btp); - - l_queue_destroy(adapters, (l_queue_destroy_func_t)btp_adapter_free); |