From b3d22c1a9e06f4727a9712240dcdefb6a329b32d Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Thu, 25 Jan 2024 20:41:27 -0800 Subject: [PATCH] chore: Update to bluez 5.72 --- ...-helper-function-to-manipulate-paths.patch | 38 ------------------- spec_files/bluez/bluez.spec | 24 +++++++++--- 2 files changed, 19 insertions(+), 43 deletions(-) delete mode 100644 spec_files/bluez/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch diff --git a/spec_files/bluez/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch b/spec_files/bluez/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch deleted file mode 100644 index f79d3ad7..00000000 --- a/spec_files/bluez/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 90b72b787a6ae6b9b0bf8ece238e108e8607a433 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Sat, 9 Nov 2013 18:13:43 +0100 -Subject: [PATCH 1/2] obex: Use GLib helper function to manipulate paths - -Instead of trying to do it by hand. This also makes sure that -relative paths aren't used by the agent. ---- - obexd/src/manager.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/obexd/src/manager.c b/obexd/src/manager.c -index f84384ae4..285c07c37 100644 ---- a/obexd/src/manager.c -+++ b/obexd/src/manager.c -@@ -650,14 +650,14 @@ static void agent_reply(DBusPendingCall *call, void *user_data) - DBUS_TYPE_STRING, &name, - DBUS_TYPE_INVALID)) { - /* Splits folder and name */ -- const char *slash = strrchr(name, '/'); -+ gboolean is_relative = !g_path_is_absolute(name); - DBG("Agent replied with %s", name); -- if (!slash) { -- agent->new_name = g_strdup(name); -+ if (is_relative) { -+ agent->new_name = g_path_get_basename(name); - agent->new_folder = NULL; - } else { -- agent->new_name = g_strdup(slash + 1); -- agent->new_folder = g_strndup(name, slash - name); -+ agent->new_name = g_path_get_basename(name); -+ agent->new_folder = g_path_get_dirname(name); - } - } - --- -2.14.1 - diff --git a/spec_files/bluez/bluez.spec b/spec_files/bluez/bluez.spec index e50b7146..bf751061 100644 --- a/spec_files/bluez/bluez.spec +++ b/spec_files/bluez/bluez.spec @@ -5,8 +5,8 @@ %endif Name: bluez -Version: 5.71 -Release: 1%{?dist}.bazzite.{{{ git_dir_version }}} +Version: 5.72 +Release: 3%{?dist}.bazzite.{{{ git_dir_version }}} Summary: Bluetooth utilities License: GPLv2+ URL: https://www.bluez.org/ @@ -14,9 +14,6 @@ URL: https://www.bluez.org/ Source0: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz Source1: bluez.gitignore -# https://github.com/hadess/bluez/commits/obex-5.46 -# Upstream's logic has changed so needs a rebase -#Patch1: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch # https://lore.kernel.org/linux-bluetooth/20220901110719.176944-1-hadess@hadess.net/T/#m9c08d004cd5422783ee1d93154f42303bba9169f Patch2: power-state-adapter-property.patch @@ -43,6 +40,7 @@ BuildRequires: cups-devel BuildRequires: libtool automake autoconf # For man pages BuildRequires: python3-docutils +BuildRequires: python3-pygments Requires: dbus >= 1.6 Requires(post): systemd @@ -258,6 +256,7 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %{_bindir}/hex2hcd %{_bindir}/l2ping %{_bindir}/mpris-proxy +%{_mandir}/man1/bluetoothctl.1.* %{_mandir}/man1/bluetoothctl-*.1.* %{_mandir}/man1/btmgmt.1.* %{_mandir}/man1/btattach.1.* @@ -339,6 +338,21 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %{_userunitdir}/obex.service %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 5.72-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 5.72-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 14 2024 Peter Robinson - 5.72-1 +- Update to 5.72 + +* Sun Jan 07 2024 Peter Robinson - 5.71-3 +- Upstream fix for crash on A2DP audio suspend + +* Fri Dec 29 2023 Peter Robinson - 5.71-2 +- Fix link key address type for old kernels + * Sat Dec 16 2023 Peter Robinson - 5.71-1 - Update to 5.71