Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package blueberry for openSUSE:Factory checked in at 2021-11-27 23:42:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blueberry (Old) and /work/SRC/openSUSE:Factory/.blueberry.new.1895 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blueberry" Sat Nov 27 23:42:38 2021 rev:41 rq:934297 version:1.4.5 Changes: -------- --- /work/SRC/openSUSE:Factory/blueberry/blueberry.changes 2021-07-01 07:05:44.311428301 +0200 +++ /work/SRC/openSUSE:Factory/.blueberry.new.1895/blueberry.changes 2021-11-27 23:43:09.556328667 +0100 @@ -1,0 +2,14 @@ +Sat Nov 27 14:57:11 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Update to version 1.4.5: + * Add Turn bluetooth on/off option in tray menu. + * blueberry-tray.py: Remove menu positioning code. + * blueberry-tray.py: Silence a runtime warning. + * rfkillMagic: Rewrite safechild in shell script to reduce + memory usage. + * Added build & install steps to readme file. + * l10n: Update POT. +- Restore Group. + + +------------------------------------------------------------------- Old: ---- blueberry-1.4.4.tar.gz New: ---- blueberry-1.4.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blueberry.spec ++++++ --- /var/tmp/diff_new_pack.edGRbP/_old 2021-11-27 23:43:09.968327316 +0100 +++ /var/tmp/diff_new_pack.edGRbP/_new 2021-11-27 23:43:09.972327304 +0100 @@ -18,10 +18,11 @@ %define __requires_exclude typelib\\((St)\\) Name: blueberry -Version: 1.4.4 +Version: 1.4.5 Release: 0 Summary: A configuration tool for Bluetooth License: GPL-3.0-or-later +Group: System/GUI/Other URL: https://github.com/linuxmint/blueberry Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: blueberry-rfkill.rules @@ -34,15 +35,15 @@ BuildRequires: python3 Requires: bluez-tools Requires: gnome-bluetooth >= 3.14 -Requires: wmctrl -Recommends: %{name}-lang -BuildArch: noarch -%glib2_gsettings_schema_requires Requires: python3-dbus-python Requires: python3-gobject Requires: python3-gobject-Gdk Requires: python3-setproctitle Requires: util-linux +Requires: wmctrl +Recommends: %{name}-lang +BuildArch: noarch +%glib2_gsettings_schema_requires %description Utility for Bluetooth devices graphical configuration. ++++++ blueberry-1.4.4.tar.gz -> blueberry-1.4.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/README.md new/blueberry-1.4.5/README.md --- old/blueberry-1.4.4/README.md 2021-06-25 15:38:17.000000000 +0200 +++ new/blueberry-1.4.5/README.md 2021-11-26 11:15:14.000000000 +0100 @@ -1,3 +1,40 @@ +## Introduction A Bluetooth configuration tool. -Depends on gnome-bluetooth 3.14. \ No newline at end of file +Depends on gnome-bluetooth 3.14. + +--- + +## How to build and install + +#### Download the source code and enter the source directory + +``` +# Clone this repo: +git clone https://github.com/linuxmint/blueberry.git + +# Enter the folder: +cd blueberry +``` + +#### Building the package + +``` +# Use mint-build to build the project for the first time. +# This also fetches and installs the build dependencies: +mint-build + +# In subsequent builds, you can use dpkg-buildpackage for faster builds: +dpkg-buildPackage +``` + +#### Install the package: + +``` +# Once that succeeds, install: +cd .. +sudo dpkg -i blueberry\*.deb +``` + +For more information, refer the developer guide: +https://linuxmint-developer-guide.readthedocs.io/en/latest/index.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/blueberry.pot new/blueberry-1.4.5/blueberry.pot --- old/blueberry-1.4.4/blueberry.pot 2021-06-25 15:38:17.000000000 +0200 +++ new/blueberry-1.4.5/blueberry.pot 2021-11-26 11:15:14.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-02-04 15:14+0000\n" +"POT-Creation-Date: 2021-11-26 10:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -91,8 +91,8 @@ msgstr[0] "" msgstr[1] "" -#: usr/lib/blueberry/blueberry.py:100 usr/lib/blueberry/blueberry-tray.py:50 -#: usr/lib/blueberry/blueberry-tray.py:80 generate_desktop_files:23 +#: usr/lib/blueberry/blueberry.py:100 usr/lib/blueberry/blueberry-tray.py:58 +#: usr/lib/blueberry/blueberry-tray.py:88 generate_desktop_files:23 msgid "Bluetooth" msgstr "" @@ -144,7 +144,7 @@ msgid "Bluetooth is disabled by hardware switch" msgstr "" -#: usr/lib/blueberry/blueberry.py:304 usr/lib/blueberry/blueberry-tray.py:67 +#: usr/lib/blueberry/blueberry.py:304 usr/lib/blueberry/blueberry-tray.py:75 msgid "Bluetooth is disabled" msgstr "" @@ -158,28 +158,36 @@ "the 'rfkill' group." msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:77 +#: usr/lib/blueberry/blueberry-tray.py:85 #, python-format msgid "Bluetooth: Connected to %s" msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:120 +#: usr/lib/blueberry/blueberry-tray.py:130 +msgid "Turn on Bluetooth" +msgstr "" + +#: usr/lib/blueberry/blueberry-tray.py:134 +msgid "Turn off Bluetooth" +msgstr "" + +#: usr/lib/blueberry/blueberry-tray.py:139 msgid "Send files to a device" msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:124 +#: usr/lib/blueberry/blueberry-tray.py:143 msgid "Open Bluetooth device manager" msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:130 +#: usr/lib/blueberry/blueberry-tray.py:149 msgid "Paired devices" msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:139 +#: usr/lib/blueberry/blueberry-tray.py:158 msgid "Connected" msgstr "" -#: usr/lib/blueberry/blueberry-tray.py:147 +#: usr/lib/blueberry/blueberry-tray.py:166 msgid "Quit" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/debian/changelog new/blueberry-1.4.5/debian/changelog --- old/blueberry-1.4.4/debian/changelog 2021-06-25 15:38:17.000000000 +0200 +++ new/blueberry-1.4.5/debian/changelog 2021-11-26 11:15:14.000000000 +0100 @@ -1,3 +1,23 @@ +blueberry (1.4.5) una; urgency=medium + + [ P. Radha Krishna ] + * Added Turn bluetooth on/off option in tray menu #112 (#117) + + [ Michael Webster ] + * blueberry-tray.py: Remove menu positioning code. + * blueberry-tray.py: Silence a runtime warning. + + [ Mickey Rose ] + * rfkillMagic: rewrite safechild in shell script to reduce memory usage (#115) + + [ P. Radha Krishna ] + * Added build & install steps to readme file (#118) + + [ Clement Lefebvre ] + * l10n: Update POT + + -- Clement Lefebvre <r...@linuxmint.com> Fri, 26 Nov 2021 10:14:48 +0000 + blueberry (1.4.4) uma; urgency=medium * l10n: Update translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/usr/lib/blueberry/blueberry-tray.py new/blueberry-1.4.5/usr/lib/blueberry/blueberry-tray.py --- old/blueberry-1.4.4/usr/lib/blueberry/blueberry-tray.py 2021-06-25 15:38:17.000000000 +0200 +++ new/blueberry-1.4.5/usr/lib/blueberry/blueberry-tray.py 2021-11-26 11:15:14.000000000 +0100 @@ -124,6 +124,17 @@ def on_statusicon_released(self, icon, x, y, button, time, position): if button == 3: menu = Gtk.Menu() + + if not self.rfkill.hard_block: + if self.rfkill.soft_block: + item = Gtk.MenuItem(label=_("Turn on Bluetooth")) + item.connect("activate", self.turn_on_bluetooth) + menu.append(item) + else: + item = Gtk.MenuItem(label=_("Turn off Bluetooth")) + item.connect("activate", self.turn_off_bluetooth) + menu.append(item) + if not(self.rfkill.hard_block or self.rfkill.soft_block): item = Gtk.MenuItem(label=_("Send files to a device")) item.connect("activate", self.send_files_cb) @@ -135,7 +146,7 @@ if len(self.paired_devices) > 0: menu.append(Gtk.SeparatorMenuItem()) - m_item = Gtk.MenuItem(_("Paired devices")) + m_item = Gtk.MenuItem(label=_("Paired devices")) menu.append(m_item) paired_menu = Gtk.Menu() m_item.set_submenu(paired_menu) @@ -157,21 +168,7 @@ menu.append(item) menu.show_all() - - if position == -1: - # The position and coordinates are unknown. This is the - # case when the XAppStatusIcon fallbacks as a Gtk.StatusIcon - menu.popup(None, None, None, None, button, time) - else: - def position_menu_cb(menu, pointer_x, pointer_y, user_data): - [x, y, position] = user_data; - if (position == Gtk.PositionType.BOTTOM): - y = y - menu.get_allocation().height; - if (position == Gtk.PositionType.RIGHT): - x = x - menu.get_allocation().width; - return (x, y, False) - device = Gdk.Display.get_default().get_device_manager().get_client_pointer() - menu.popup_for_device(device, None, None, position_menu_cb, [x, y, position], button, time) + icon.popup_menu(menu, x, y, button, time, position) def toggle_connect_cb(self, item, data = None): proxy = self.paired_devices[data] @@ -184,6 +181,14 @@ def open_manager_cb(self, item, data = None): subprocess.Popen(["blueberry"]) + def turn_on_bluetooth(self, item): + self.rfkill.try_set_blocked(False) + return True + + def turn_off_bluetooth(self,item): + self.rfkill.try_set_blocked(True) + return True + def terminate(self, window = None, data = None): self.quit() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blueberry-1.4.4/usr/lib/blueberry/safechild new/blueberry-1.4.5/usr/lib/blueberry/safechild --- old/blueberry-1.4.4/usr/lib/blueberry/safechild 2021-06-25 15:38:17.000000000 +0200 +++ new/blueberry-1.4.5/usr/lib/blueberry/safechild 2021-11-26 11:15:14.000000000 +0100 @@ -1,8 +1,6 @@ -#!/usr/bin/python3 - -import subprocess -import sys +#!/bin/sh +: \ """ Wrapper for rfkill binary. @@ -20,16 +18,12 @@ """ -proc = None +trap exit CHLD + +"$@" & +childPID=$! -try: - proc = subprocess.Popen(sys.argv[1:]) +while read -r anything; do : nothing; done - while True: - line = sys.stdin.readline() - if line == "": - proc.kill() - proc.wait() - break -except Exception as e: - print("safechild exception: ", e) +kill $childPID +wait
