From 5a4ceebdfc8ea905fe882cc1f050e2009c2294d2 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 14 Nov 2022 09:59:02 +0100 Subject: [PATCH] Re-add wrongly removed non-upstreamed patch --- bluez.spec | 7 ++++++- power-state-adapter-property.patch | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 power-state-adapter-property.patch diff --git a/bluez.spec b/bluez.spec index d2132fa..5cf9e53 100644 --- a/bluez.spec +++ b/bluez.spec @@ -6,7 +6,7 @@ Name: bluez Version: 5.66 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Bluetooth utilities License: GPLv2+ URL: http://www.bluez.org/ @@ -16,6 +16,8 @@ Source1: bluez.gitignore # https://github.com/hadess/bluez/commits/obex-5.46 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 BuildRequires: dbus-devel >= 1.6 BuildRequires: glib2-devel @@ -317,6 +319,9 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/ %{_userunitdir}/obex.service %changelog +* Mon Nov 14 2022 Bastien Nocera - 5.66-2 +- Re-add wrongly removed non-upstreamed patch + * Fri Nov 11 2022 Peter Robinson - 5.66-1 - Update to 5.66 diff --git a/power-state-adapter-property.patch b/power-state-adapter-property.patch new file mode 100644 index 0000000..566d7c0 --- /dev/null +++ b/power-state-adapter-property.patch @@ -0,0 +1,28 @@ +From 70309219acd4c81e3a9e2b3652d2d93eb08b0aee Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 31 Aug 2022 11:16:34 +0200 +Subject: [PATCH 6/6] adapter: Remove experimental flag for PowerState + +Now that the feature has been tested, that the API is deemed adequate +and the reliability sufficient. +--- + src/adapter.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/adapter.c b/src/adapter.c +index 8fb2acdc8..841096d7f 100644 +--- a/src/adapter.c ++++ b/src/adapter.c +@@ -3864,8 +3864,7 @@ static const GDBusPropertyTable adapter_properties[] = { + { "Alias", "s", property_get_alias, property_set_alias }, + { "Class", "u", property_get_class }, + { "Powered", "b", property_get_powered, property_set_powered }, +- { "PowerState", "s", property_get_power_state, NULL, NULL, +- G_DBUS_PROPERTY_FLAG_EXPERIMENTAL }, ++ { "PowerState", "s", property_get_power_state }, + { "Discoverable", "b", property_get_discoverable, + property_set_discoverable }, + { "DiscoverableTimeout", "u", property_get_discoverable_timeout, +-- +2.37.2 +