From 9c161c75f1f558816573b2e504310976f5d4a4ba3609304cb344abbf3f499002 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 28 Dec 2023 08:25:15 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/bluez?expand=0&rev=359 --- ...RT-speed-must-be-reset-after-the-firmw.patch | 10 +++++----- bluez-cups-libexec.patch | 16 ++++++++-------- bluez-disable-broken-tests.diff | 17 +++++++++++++---- bluez.spec | 8 ++++++++ disable_some_obex_tests.patch | 8 ++++---- 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/0001-rpi3-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch b/0001-rpi3-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch index e88c920..abc3f7f 100644 --- a/0001-rpi3-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch +++ b/0001-rpi3-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch @@ -8,11 +8,11 @@ Subject: [PATCH] bcm43xx: The UART speed must be reset after the firmware tools/hciattach_bcm43xx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -Index: bluez-5.60/tools/hciattach_bcm43xx.c +Index: bluez-5.71/tools/hciattach_bcm43xx.c =================================================================== ---- bluez-5.60.orig/tools/hciattach_bcm43xx.c -+++ bluez-5.60/tools/hciattach_bcm43xx.c -@@ -354,11 +354,8 @@ int bcm43xx_init(int fd, int def_speed, +--- bluez-5.71.orig/tools/hciattach_bcm43xx.c ++++ bluez-5.71/tools/hciattach_bcm43xx.c +@@ -350,11 +350,8 @@ int bcm43xx_init(int fd, int def_speed, return -1; if (bcm43xx_locate_patch(FIRMWARE_DIR, chip_name, fw_path)) { @@ -25,7 +25,7 @@ Index: bluez-5.60/tools/hciattach_bcm43xx.c if (bcm43xx_load_firmware(fd, fw_path)) return -1; -@@ -368,6 +365,7 @@ int bcm43xx_init(int fd, int def_speed, +@@ -364,6 +361,7 @@ int bcm43xx_init(int fd, int def_speed, return -1; } diff --git a/bluez-cups-libexec.patch b/bluez-cups-libexec.patch index d7b0554..fdf75c8 100644 --- a/bluez-cups-libexec.patch +++ b/bluez-cups-libexec.patch @@ -1,8 +1,8 @@ -Index: bluez-5.65/Makefile.in +Index: bluez-5.71/Makefile.in =================================================================== ---- bluez-5.65.orig/Makefile.in -+++ bluez-5.65/Makefile.in -@@ -3871,7 +3871,7 @@ unit_tests = $(am__append_55) unit/test- +--- bluez-5.71.orig/Makefile.in ++++ bluez-5.71/Makefile.in +@@ -4179,7 +4179,7 @@ unit_tests = $(am__append_68) unit/test- @DEPRECATED_TRUE@@READLINE_TRUE@attrib_gatttool_LDADD = lib/libbluetooth-internal.la \ @DEPRECATED_TRUE@@READLINE_TRUE@ src/libshared-glib.la $(GLIB_LIBS) -lreadline @@ -11,11 +11,11 @@ Index: bluez-5.65/Makefile.in @CUPS_TRUE@profiles_cups_bluetooth_SOURCES = profiles/cups/main.c \ @CUPS_TRUE@ profiles/cups/cups.h \ @CUPS_TRUE@ profiles/cups/sdp.c \ -Index: bluez-5.65/Makefile.tools +Index: bluez-5.71/Makefile.tools =================================================================== ---- bluez-5.65.orig/Makefile.tools -+++ bluez-5.65/Makefile.tools -@@ -499,7 +499,7 @@ endif +--- bluez-5.71.orig/Makefile.tools ++++ bluez-5.71/Makefile.tools +@@ -541,7 +541,7 @@ endif endif if CUPS diff --git a/bluez-disable-broken-tests.diff b/bluez-disable-broken-tests.diff index 69bd8ed..d40239a 100644 --- a/bluez-disable-broken-tests.diff +++ b/bluez-disable-broken-tests.diff @@ -1,8 +1,17 @@ -Index: bluez-5.65/Makefile.am +Index: bluez-5.71/Makefile.am =================================================================== ---- bluez-5.65.orig/Makefile.am -+++ bluez-5.65/Makefile.am -@@ -572,7 +574,7 @@ unit_test_midi_LDADD = src/libshared-gli +--- bluez-5.71.orig/Makefile.am ++++ bluez-5.71/Makefile.am +@@ -679,7 +679,7 @@ unit_test_bass_SOURCES = unit/test-bass. + unit_test_bass_LDADD = src/libshared-glib.la \ + lib/libbluetooth-internal.la $(GLIB_LIBS) + +-unit_tests += unit/test-vcp ++# unit_tests += unit/test-vcp + + unit_test_vcp_SOURCES = unit/test-vcp.c $(btio_sources) + unit_test_vcp_LDADD = src/libshared-glib.la \ +@@ -696,7 +696,7 @@ unit_test_midi_LDADD = src/libshared-gli endif if MESH diff --git a/bluez.spec b/bluez.spec index 94421d4..1591582 100644 --- a/bluez.spec +++ b/bluez.spec @@ -414,6 +414,14 @@ done %{_mandir}/man1/rctest.1%{?ext_man} %{_mandir}/man1/bluetoothctl-mgmt.1%{?ext_man} %{_mandir}/man1/bluetoothctl-monitor.1%{?ext_man} +%{_mandir}/man1/bluetoothctl-admin.1%{?ext_man} +%{_mandir}/man1/bluetoothctl-advertise.1%{?ext_man} +%{_mandir}/man1/bluetoothctl-endpoint.1%{?ext_man} +%{_mandir}/man1/bluetoothctl-gatt.1%{?ext_man} +%{_mandir}/man1/bluetoothctl-player.1%{?ext_man} +%{_mandir}/man1/bluetoothctl-scan.1%{?ext_man} +%{_mandir}/man1/bluetoothctl-transport.1%{?ext_man} +%{_mandir}/man5/org.bluez.*.5%{?ext_man} %{_mandir}/man1/btmgmt.1%{?ext_man} %{_datadir}/dbus-1/system.d/bluetooth.conf # not packaged, boo#1151518 diff --git a/disable_some_obex_tests.patch b/disable_some_obex_tests.patch index b432a6c..a56223d 100644 --- a/disable_some_obex_tests.patch +++ b/disable_some_obex_tests.patch @@ -11,11 +11,11 @@ Signed-off-by: Michel Normand Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: bluez-5.65/Makefile.am +Index: bluez-5.71/Makefile.am =================================================================== ---- bluez-5.65.orig/Makefile.am -+++ bluez-5.65/Makefile.am -@@ -502,8 +502,8 @@ unit_test_gdbus_client_LDADD = gdbus/lib +--- bluez-5.71.orig/Makefile.am ++++ bluez-5.71/Makefile.am +@@ -602,8 +602,8 @@ unit_test_gdbus_client_LDADD = gdbus/lib src/libshared-glib.la $(GLIB_LIBS) $(DBUS_LIBS) if OBEX