[arch-commits] Commit in bluez/trunk (2 files)

[Andreas Radke]

    Date: Sunday, September 22, 2019 @ 20:46:19
  Author: andyrtr
Revision: 363259

upgpkg: bluez 5.51-1

upstream update 5.51

Modified:
  bluez/trunk/PKGBUILD
Deleted:
  bluez/trunk/bluez-5.50-signal-signature-btpclient.patch

---------------------------------------------+
 PKGBUILD                                    |   18 +++-----
 bluez-5.50-signal-signature-btpclient.patch |   56 --------------------------
 2 files changed, 7 insertions(+), 67 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-22 20:12:52 UTC (rev 363258)
+++ PKGBUILD	2019-09-22 20:46:19 UTC (rev 363259)
@@ -4,8 +4,8 @@
 
 pkgbase=bluez
 pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
-pkgver=5.50
-pkgrel=7
+pkgver=5.51
+pkgrel=1
 url="http://www.bluez.org/"
 arch=('x86_64')
 license=('GPL2')
@@ -12,21 +12,17 @@
 makedepends=('dbus' 'libical' 'systemd' 'alsa-lib' 'ell')
 source=(https://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.{xz,sign}
         bluetooth.modprobe
-        refresh_adv_manager_for_non-LE_devices.diff
-        bluez-5.50-signal-signature-btpclient.patch)
+        refresh_adv_manager_for_non-LE_devices.diff)
 # see https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc
-sha512sums=('64a680e4b3c270bc2439610c91ad2aef36131d84401e4bbdf6c2b7ec8708a19dfc942b31b9189c38a97ca072c761c669ae1aace5f4ff5d06de3ccbf33184be45'
+sha512sums=('8b14eea98f541b981162abce728e0f917654ad3c990721ec398fe41bdd68069fe55ff64b61bc3c3b9f813facf42c995b07619f6d5d153965de27154b1a7b578f'
             'SKIP'
             '5370ea87fc3f76ab46f2d549c5396b6204a21b629d4765de658fe8e90331b936a36aa8624de8bb2304cc1b78ac2fa6e84f2411f247dff1aab2daf7aa21b2c650'
-            'c6ef673956963725edc52d667648e51df5b99f820e87705096b4b9338e8a4540722e734f1e8e67998c2fbbefec30645ff1fa064789c8a858f770d1214399561d'
-            'db4c9f54acbb5f334ab60494ba22d61fa0c3d18b958eea30e227c5b2aee43f542e90897de5a54c2a97d87842945e2f1abaa8daff7d55ee4508f838b62ed9719f')
+            'c6ef673956963725edc52d667648e51df5b99f820e87705096b4b9338e8a4540722e734f1e8e67998c2fbbefec30645ff1fa064789c8a858f770d1214399561d')
 validpgpkeys=('E932D120BC2AEC444E558F0106CA9F5D1DCF2659') # Marcel Holtmann <marcel at holtmann.org>
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -Np1 -i ../refresh_adv_manager_for_non-LE_devices.diff
-  # fix build error with recent gcc/glibc
-  patch -Np1 -i ../bluez-5.50-signal-signature-btpclient.patch
 }
 
 build() {
@@ -62,7 +58,7 @@
 
   cd ${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir} \
-       install-libexecPROGRAMS \
+       install-pkglibexecPROGRAMS \
        install-dbussessionbusDATA \
        install-systemdsystemunitDATA \
        install-systemduserunitDATA \
@@ -124,7 +120,7 @@
 
   cd ${pkgbase}-${pkgver}
   make DESTDIR=${pkgdir} \
-       install-includeHEADERS \
+       install-pkgincludeHEADERS \
        install-libLTLIBRARIES \
        install-pkgconfigDATA
 }

Deleted: bluez-5.50-signal-signature-btpclient.patch
===================================================================
--- bluez-5.50-signal-signature-btpclient.patch	2019-09-22 20:12:52 UTC (rev 363258)
+++ bluez-5.50-signal-signature-btpclient.patch	2019-09-22 20:46:19 UTC (rev 363259)
@@ -1,56 +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);
-