From d4454e2efc8a80f578e9fd496994813dc577509b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 03:40:26 +0000 Subject: import gnome-bluetooth-3.14.1-1.el7 --- diff --git a/.gitignore b/.gitignore index 0d26dc4..bc85d09 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gnome-bluetooth-3.8.2.1.tar.xz +SOURCES/gnome-bluetooth-3.14.1.tar.xz diff --git a/.gnome-bluetooth.metadata b/.gnome-bluetooth.metadata index adc3e99..112529d 100644 --- a/.gnome-bluetooth.metadata +++ b/.gnome-bluetooth.metadata @@ -1 +1 @@ -d33be5e7f03a4e6518fd8116e3bee16285f15f28 SOURCES/gnome-bluetooth-3.8.2.1.tar.xz +501ae1f5f7e8c07a07963408506af236f4d31258 SOURCES/gnome-bluetooth-3.14.1.tar.xz diff --git a/SOURCES/0001-lib-Fix-a-few-memory-leaks.patch b/SOURCES/0001-lib-Fix-a-few-memory-leaks.patch deleted file mode 100644 index 81572f9..0000000 --- a/SOURCES/0001-lib-Fix-a-few-memory-leaks.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 91ac544495d874159893eefff1f68332c4780001 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 20 Nov 2013 17:10:07 +0100 -Subject: [PATCH 1/3] lib: Fix a few memory leaks - ---- - lib/bluetooth-client.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c -index 8bddb58..1fe7e6d 100644 ---- a/lib/bluetooth-client.c -+++ b/lib/bluetooth-client.c -@@ -1878,8 +1878,10 @@ bluetooth_client_connect_service (BluetoothClient *client, - g_object_unref (proxy); - goto bail; - } -+ g_hash_table_unref (table); - - service = get_proxy_for_iface (DEVICE (proxy), iface_name, client); -+ g_object_unref (proxy); - - g_debug ("Calling 'Connect' on interface %s for %s", - iface_name, g_dbus_proxy_get_object_path (service)); -@@ -1922,6 +1924,7 @@ bluetooth_client_connect_service (BluetoothClient *client, - NULL, - (GAsyncReadyCallback) disconnect_callback, - conndata); -+ g_object_unref (proxy); - } - - return; --- -1.8.4.2 - diff --git a/SOURCES/0002-lib-Fix-cancellation-handling.patch b/SOURCES/0002-lib-Fix-cancellation-handling.patch deleted file mode 100644 index 1baa119..0000000 --- a/SOURCES/0002-lib-Fix-cancellation-handling.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 84ec5f5a11908e636ff3b992aecfc5c8f8faddb5 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 20 Nov 2013 17:10:46 +0100 -Subject: [PATCH 2/3] lib: Fix cancellation handling - -We weren't checking for cancellation properly, not passing -cancellables to sub-routines, and not reporting cancelled calls -correctly. ---- - lib/bluetooth-client.c | 30 ++++++++++++++++++------------ - 1 file changed, 18 insertions(+), 12 deletions(-) - -diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c -index 1fe7e6d..e224033 100644 ---- a/lib/bluetooth-client.c -+++ b/lib/bluetooth-client.c -@@ -1661,23 +1661,20 @@ connect_callback (GDBusProxy *proxy, - ConnectData *conndata) - { - GVariant *variant; -- gboolean retval; - GError *error = NULL; - - variant = g_dbus_proxy_call_finish (proxy, res, &error); - if (variant == NULL) { -- retval = FALSE; - g_debug ("Connect failed for %s: %s", - g_dbus_proxy_get_object_path (proxy), error->message); -- g_error_free (error); -+ g_simple_async_result_take_error (conndata->simple, error); - } else { - g_debug ("Connect succeeded for %s", - g_dbus_proxy_get_object_path (proxy)); - g_variant_unref (variant); -- retval = TRUE; -+ g_simple_async_result_set_op_res_gboolean (conndata->simple, TRUE); - } - -- g_simple_async_result_set_op_res_gboolean (conndata->simple, retval); - g_simple_async_result_complete_in_idle (conndata->simple); - - g_object_unref (conndata->simple); -@@ -1699,10 +1696,11 @@ disconnect_callback (GDBusProxy *proxy, - g_debug ("Disconnect failed for %s: %s", - g_dbus_proxy_get_object_path (G_DBUS_PROXY (conndata->device)), - error->message); -- g_error_free (error); -+ g_simple_async_result_take_error (conndata->simple, error); - } else { - g_debug ("Disconnect succeeded for %s", - g_dbus_proxy_get_object_path (G_DBUS_PROXY (conndata->device))); -+ g_simple_async_result_set_op_res_gboolean (conndata->simple, retval); - } - } else { - GDBusProxy *service; -@@ -1716,6 +1714,10 @@ disconnect_callback (GDBusProxy *proxy, - g_dbus_proxy_get_object_path (proxy), - g_dbus_proxy_get_interface_name (proxy), - error->message); -+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) { -+ g_simple_async_result_take_error (conndata->simple, error); -+ goto bail; -+ } - g_error_free (error); - } else { - g_debug ("Disconnect succeeded for %s on %s", -@@ -1737,14 +1739,14 @@ disconnect_callback (GDBusProxy *proxy, - g_variant_new ("()"), - G_DBUS_CALL_FLAGS_NONE, - -1, -- NULL, -+ g_object_get_data (G_OBJECT (conndata->simple), "cancellable"), - (GAsyncReadyCallback) disconnect_callback, - conndata); - - return; - } - -- g_simple_async_result_set_op_res_gboolean (conndata->simple, retval); -+bail: - g_simple_async_result_complete_in_idle (conndata->simple); - - g_object_unref (proxy); -@@ -1836,6 +1838,7 @@ bluetooth_client_connect_service (BluetoothClient *client, - g_object_set_data_full (G_OBJECT (simple), "device", - g_strdup (device), g_free); - } -+ g_simple_async_result_set_check_cancellable (simple, cancellable); - - gtk_tree_model_get (GTK_TREE_MODEL (priv->store), &iter, - BLUETOOTH_COLUMN_PROXY, &proxy, -@@ -1891,7 +1894,7 @@ bluetooth_client_connect_service (BluetoothClient *client, - NULL, - G_DBUS_CALL_FLAGS_NONE, - -1, -- NULL, -+ cancellable, - (GAsyncReadyCallback) connect_callback, - conndata); - } else if (table != NULL) { -@@ -1914,14 +1917,14 @@ bluetooth_client_connect_service (BluetoothClient *client, - NULL, - G_DBUS_CALL_FLAGS_NONE, - -1, -- NULL, -+ cancellable, - (GAsyncReadyCallback) disconnect_callback, - conndata); - } else if (table == NULL) { - g_debug ("Calling device_call_disconnect() for %s", - g_dbus_proxy_get_object_path (proxy)); - device_call_disconnect (DEVICE (proxy), -- NULL, -+ cancellable, - (GAsyncReadyCallback) disconnect_callback, - conndata); - g_object_unref (proxy); -@@ -1956,7 +1959,10 @@ bluetooth_client_connect_service_finish (BluetoothClient *client, - - g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == bluetooth_client_connect_service); - -- return g_simple_async_result_get_op_res_gboolean (simple); -+ if (g_simple_async_result_get_op_res_gboolean (simple)) -+ return TRUE; -+ g_simple_async_result_propagate_error (simple, error); -+ return FALSE; - } - - #define BOOL_STR(x) (x ? "True" : "False") --- -1.8.4.2 - diff --git a/SOURCES/0003-lib-Fix-extraneous-reference-that-could-lead-to-cras.patch b/SOURCES/0003-lib-Fix-extraneous-reference-that-could-lead-to-cras.patch deleted file mode 100644 index 472a506..0000000 --- a/SOURCES/0003-lib-Fix-extraneous-reference-that-could-lead-to-cras.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fbc1ce2836ccf17368fb6fe2aa0c69396c610aa5 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 20 Nov 2013 17:11:32 +0100 -Subject: [PATCH 3/3] lib: Fix extraneous reference that could lead to crash - -The proxy we got from the tree model was already the extra -reference we needed. This makes sure that all additional -instances of the device (the ones not in the tree model) -are destroyed when cancelling a disconnect call. ---- - lib/bluetooth-client.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/bluetooth-client.c b/lib/bluetooth-client.c -index e224033..c5e86de 100644 ---- a/lib/bluetooth-client.c -+++ b/lib/bluetooth-client.c -@@ -1900,7 +1900,7 @@ bluetooth_client_connect_service (BluetoothClient *client, - } else if (table != NULL) { - GDBusProxy *service; - -- conndata->device = g_object_ref (DEVICE (proxy)); -+ conndata->device = DEVICE (proxy); - conndata->services = g_hash_table_get_keys (table); - g_hash_table_unref (table); - conndata->services = g_list_sort (conndata->services, (GCompareFunc) rev_sort_services); --- -1.8.4.2 - diff --git a/SPECS/gnome-bluetooth.spec b/SPECS/gnome-bluetooth.spec index 88cd481..b0eb18f 100644 --- a/SPECS/gnome-bluetooth.spec +++ b/SPECS/gnome-bluetooth.spec @@ -1,19 +1,15 @@ Name: gnome-bluetooth Epoch: 1 -Version: 3.8.2.1 -Release: 3%{?dist} +Version: 3.14.1 +Release: 1%{?dist} Summary: Bluetooth graphical utilities Group: Applications/Communications License: GPLv2+ URL: http://live.gnome.org/GnomeBluetooth -Source0: http://download.gnome.org/sources/gnome-bluetooth/3.8/gnome-bluetooth-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-bluetooth/3.14/gnome-bluetooth-%{version}.tar.xz Source1: 61-gnome-bluetooth-rfkill.rules -Patch0: 0001-lib-Fix-a-few-memory-leaks.patch -Patch1: 0002-lib-Fix-cancellation-handling.patch -Patch2: 0003-lib-Fix-extraneous-reference-that-could-lead-to-cras.patch - %if 0%{?rhel} ExcludeArch: s390 s390x %endif @@ -23,6 +19,7 @@ BuildRequires: dbus-glib-devel BuildRequires: intltool desktop-file-utils gettext gtk-doc BuildRequires: itstool +BuildRequires: systemd-devel BuildRequires: gobject-introspection-devel @@ -33,9 +30,8 @@ Obsoletes: bluez-gnome <= 1.8 # Otherwise we might end up with mismatching version Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: bluez >= 4.42 +Requires: bluez >= 5.0 %ifnarch s390 s390x -Requires: obexd Requires: pulseaudio-module-bluetooth %endif @@ -72,9 +68,6 @@ for writing applications that require a Bluetooth device selection widget. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %configure --disable-desktop-update --disable-icon-update --disable-schemas-compile --disable-compile-warnings @@ -122,11 +115,6 @@ fi %files %doc README NEWS COPYING %{_bindir}/bluetooth-sendto -%{_bindir}/bluetooth-wizard -%dir %{_libdir}/gnome-bluetooth/ -%{_libdir}/gnome-bluetooth/GnomeBluetoothApplet-1.0.typelib -%{_libdir}/gnome-bluetooth/libgnome-bluetooth-applet.so.* -%{_libdir}/gnome-bluetooth/plugins/ %{_datadir}/applications/*.desktop %{_datadir}/gnome-bluetooth/ %{_mandir}/man1/* @@ -141,7 +129,6 @@ fi %files libs-devel %{_includedir}/gnome-bluetooth/ -%{_libdir}/gnome-bluetooth/libgnome-bluetooth-applet.so %{_libdir}/libgnome-bluetooth.so %{_libdir}/libgnome-bluetooth.la %{_libdir}/pkgconfig/gnome-bluetooth-1.0.pc @@ -149,6 +136,10 @@ fi %{_datadir}/gtk-doc %changelog +* Thu Apr 30 2015 Bastien Nocera 3.14.1-1 +- Update to 3.14.1 +Resolves: #1174547 + * Fri Dec 27 2013 Daniel Mach - 1:3.8.2.1-3 - Mass rebuild 2013-12-27