diff --git a/Fix_PyGIDeprecationWarning_1.patch b/Fix_PyGIDeprecationWarning_1.patch deleted file mode 100644 index 323f1da..0000000 --- a/Fix_PyGIDeprecationWarning_1.patch +++ /dev/null @@ -1,84 +0,0 @@ -From e1b0efa62a097a130a8d5a72c789fb8c1fefa19a Mon Sep 17 00:00:00 2001 -From: FriedrichFroebel -Date: Tue, 30 Jan 2018 11:28:29 +0100 -Subject: [PATCH] Fix PyGIDeprecationWarnings (#51) - -* Fix PyGIDeprecationWarning - -* fix some more warnings ---- - usr/lib/blueberry/blueberry.py | 10 +++++----- - usr/lib/blueberry/rfkillMagic.py | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/usr/lib/blueberry/blueberry.py b/usr/lib/blueberry/blueberry.py -index 99d7a71..05fd1e8 100755 ---- a/usr/lib/blueberry/blueberry.py -+++ b/usr/lib/blueberry/blueberry.py -@@ -23,7 +23,7 @@ class Blueberry(Gtk.Application): - def __init__(self): - - Gtk.Application.__init__(self, application_id='com.linuxmint.blueberry', flags=Gio.ApplicationFlags.FLAGS_NONE) -- self.window = Gtk.Window(Gtk.WindowType.TOPLEVEL) -+ self.window = Gtk.Window(type=Gtk.WindowType.TOPLEVEL) - self.detect_desktop_environment() - self.connect("activate", self.on_activate) - -@@ -103,7 +103,7 @@ def create_window(self): - stack_switcher.set_halign(Gtk.Align.CENTER) - toolbar.show_all() - -- self.settings = Gio.Settings("org.blueberry") -+ self.settings = Gio.Settings(schema="org.blueberry") - - debug = False - if len(sys.argv) > 1 and sys.argv[1] == "debug": -@@ -162,7 +162,7 @@ def create_window(self): - self.obex_switch.set_active(self.settings.get_boolean("obex-enabled")) - self.obex_switch.connect("notify::active", self.on_obex_switch_toggled) - self.settings.connect("changed", self.on_settings_changed) -- row = SettingsRow(Gtk.Label(_("Receive files from remote devices")), self.obex_switch) -+ row = SettingsRow(Gtk.Label(label=_("Receive files from remote devices")), self.obex_switch) - row.set_tooltip_text(_("This option allows your computer to receive files transferred over Bluetooth (OBEX)")) - section.add_row(row) - -@@ -170,7 +170,7 @@ def create_window(self): - self.tray_switch.set_active(self.settings.get_boolean("tray-enabled")) - self.tray_switch.connect("notify::active", self.on_tray_switch_toggled) - self.settings.connect("changed", self.on_settings_changed) -- section.add_row(SettingsRow(Gtk.Label(_("Show a tray icon")), self.tray_switch)) -+ section.add_row(SettingsRow(Gtk.Label(label=_("Show a tray icon")), self.tray_switch)) - - self.window.add(self.main_box) - -@@ -221,7 +221,7 @@ def on_settings_changed(self, settings, key): - self.obex_switch.set_active(self.settings.get_boolean("obex-enabled")) - - def add_stack_page(self, message, name): -- label = Gtk.Label(message) -+ label = Gtk.Label(label=message) - self.stack.add_named(label, name) - label.show() - -diff --git a/usr/lib/blueberry/rfkillMagic.py b/usr/lib/blueberry/rfkillMagic.py -index 9ef3be3..03aaed5 100644 ---- a/usr/lib/blueberry/rfkillMagic.py -+++ b/usr/lib/blueberry/rfkillMagic.py -@@ -3,7 +3,7 @@ - import subprocess - import os - import re --from gi.repository import GObject -+from gi.repository import GLib - - RFKILL_CHK = ["/usr/sbin/rfkill", "list", "bluetooth"] - RFKILL_BLOCK = ["/usr/sbin/rfkill", "block", "bluetooth"] -@@ -108,7 +108,7 @@ def update_state(self, line): - self.update_ui() - - def update_ui(self): -- GObject.idle_add(self.output_callback) -+ GLib.idle_add(self.output_callback) - - def try_set_blocked(self, blocked): - thread.start_new_thread(self.set_block_thread, (blocked,)) diff --git a/Fix_PyGIDeprecationWarning_2.patch b/Fix_PyGIDeprecationWarning_2.patch deleted file mode 100644 index 4f21eb0..0000000 --- a/Fix_PyGIDeprecationWarning_2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ee6acb86a42f81025704a3e5e53a68decf03640a Mon Sep 17 00:00:00 2001 -From: Leigh Scott -Date: Tue, 30 Jan 2018 10:28:43 +0000 -Subject: [PATCH] fix some depreciation warnings (#49) - ---- - usr/lib/blueberry/blueberry-obex-agent.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/usr/lib/blueberry/blueberry-obex-agent.py b/usr/lib/blueberry/blueberry-obex-agent.py -index b63d46d..899475c 100755 ---- a/usr/lib/blueberry/blueberry-obex-agent.py -+++ b/usr/lib/blueberry/blueberry-obex-agent.py -@@ -723,11 +723,11 @@ def on_unregister_failed(error): - self._interface.UnregisterAgent(agent_path, reply_handler=on_unregistered, error_handler=on_unregister_failed) - - if __name__ == '__main__': -- settings = Gio.Settings("org.blueberry") -+ settings = Gio.Settings(schema="org.blueberry") - if settings.get_boolean("obex-enabled"): - try: - dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) -- mainloop = GObject.MainLoop() -+ mainloop = GLib.MainLoop() - service = TransferService() - service.load() - cont = True diff --git a/Remove_unused_applet_label.patch b/Remove_unused_applet_label.patch deleted file mode 100644 index 7a978b1..0000000 --- a/Remove_unused_applet_label.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 87b1f2c2b24439c236c2ded873dedb4bdf33be8c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Germ=C3=A1n=20Franco?= -Date: Thu, 1 Feb 2018 12:13:38 +0100 -Subject: [PATCH] Remove unused applet label (#53) - -Inherit from IconApplet instead of TextIconApplet because the label -wasn't being used. It caused an issue where the label was taking up -space even when it was empty when using padding or margins on it. ---- - usr/share/cinnamon/applets/blueberry@cinnamon.org/applet.js | 13 ++----------- - .../cinnamon/applets/blueberry@cinnamon.org/metadata.json | 4 ++-- - 2 files changed, 4 insertions(+), 13 deletions(-) - -diff --git a/usr/share/cinnamon/applets/blueberry@cinnamon.org/applet.js b/usr/share/cinnamon/applets/blueberry@cinnamon.org/applet.js -index f4297be..62dc749 100644 ---- a/usr/share/cinnamon/applets/blueberry@cinnamon.org/applet.js -+++ b/usr/share/cinnamon/applets/blueberry@cinnamon.org/applet.js -@@ -22,10 +22,10 @@ function MyApplet(metadata, orientation, panel_height, instance_id) { - } - - MyApplet.prototype = { -- __proto__: Applet.TextIconApplet.prototype, -+ __proto__: Applet.IconApplet.prototype, - - _init: function(metadata, orientation, panel_height, instance_id) { -- Applet.TextIconApplet.prototype._init.call(this, orientation, panel_height, instance_id); -+ Applet.IconApplet.prototype._init.call(this, orientation, panel_height, instance_id); - - this.setAllowedLayout(Applet.AllowedLayout.BOTH); - -@@ -51,8 +51,6 @@ MyApplet.prototype = { - })); - this.menu.addMenuItem(item); - -- this.on_orientation_changed(orientation); -- - this._client = new GnomeBluetooth.Client(); - this._model = this._client.get_model(); - this._model.connect('row-changed', Lang.bind(this, this._sync)); -@@ -73,13 +71,6 @@ MyApplet.prototype = { - Main.systrayManager.unregisterId(this.metadata.uuid); - }, - -- on_orientation_changed: function(orientation) { -- if (orientation == St.Side.LEFT || orientation == St.Side.RIGHT) -- this.hide_applet_label(true); -- else -- this.hide_applet_label(false); -- }, -- - _getDefaultAdapter: function() { - let [ret, iter] = this._model.get_iter_first(); - while (ret) { -diff --git a/usr/share/cinnamon/applets/blueberry@cinnamon.org/metadata.json b/usr/share/cinnamon/applets/blueberry@cinnamon.org/metadata.json -index fd88334..8131d54 100644 ---- a/usr/share/cinnamon/applets/blueberry@cinnamon.org/metadata.json -+++ b/usr/share/cinnamon/applets/blueberry@cinnamon.org/metadata.json -@@ -3,5 +3,5 @@ - "description": "Blueberry applet", - "uuid": "blueberry@cinnamon.org", - "name": "Bluetooth", -- "last-edited": "1355436562" --} -\ No newline at end of file -+ "last-edited": "1517395944" -+} diff --git a/blueberry.spec b/blueberry.spec index d33cea2..ea6ba8e 100644 --- a/blueberry.spec +++ b/blueberry.spec @@ -1,14 +1,11 @@ Name: blueberry -Version: 1.1.20 -Release: 6%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: Bluetooth configuration tool License: GPLv3+ URL: https://github.com/linuxmint/%{name} -Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: %{url}/commit/e1b0efa62a097a130a8d5a72c789fb8c1fefa19a.patch#/Fix_PyGIDeprecationWarning_1.patch -Patch1: %{url}/commit/ee6acb86a42f81025704a3e5e53a68decf03640a.patch#/Fix_PyGIDeprecationWarning_2.patch -Patch2: %{url}/commit/87b1f2c2b24439c236c2ded873dedb4bdf33be8c.patch#/Remove_unused_applet_label.patch +Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildArch: noarch @@ -128,6 +125,9 @@ fi %changelog +* Tue May 22 2018 Leigh Scott - 1.2.1-1 +- New upstream release + * Thu Feb 15 2018 Leigh Scott - 1.1.20-6 - Do it better diff --git a/sources b/sources index c5ba805..fc1d230 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (blueberry-1.1.20.tar.gz) = 22ed658badd000dd74f937b6910e4e30d13af219f3704e37a395dc5dd5fdc8082887aa4825bcc158fa7b6820fbceb97032fe7e48532578ad799e5a435083d261 +SHA512 (blueberry-1.2.1.tar.gz) = 1ba9ceb5c59d47c077ed71455fa537785a7186dde992993b29cb4483d979e0ced4e47062652ab83f1b621ff93d289663470f8f0b6c77e688c7ce529b27f6bc19