[arch-commits] Commit in blueberry (6 files)

Balló György bgyorgy at archlinux.org
Sat Jul 4 22:51:08 UTC 2015


    Date: Sunday, July 5, 2015 @ 00:51:08
  Author: bgyorgy
Revision: 136424

archrelease: copy trunk to community-any

Added:
  blueberry/repos/
  blueberry/repos/community-any/
  blueberry/repos/community-any/PKGBUILD
    (from rev 136423, blueberry/trunk/PKGBUILD)
  blueberry/repos/community-any/blueberry.install
    (from rev 136423, blueberry/trunk/blueberry.install)
  blueberry/repos/community-any/detect-more-de.patch
    (from rev 136423, blueberry/trunk/detect-more-de.patch)
  blueberry/repos/community-any/fix-monitoring-settings.patch
    (from rev 136423, blueberry/trunk/fix-monitoring-settings.patch)

-------------------------------+
 PKGBUILD                      |   49 ++++++++++++++++++++++++++++++++++++++++
 blueberry.install             |   12 +++++++++
 detect-more-de.patch          |   31 +++++++++++++++++++++++++
 fix-monitoring-settings.patch |   30 ++++++++++++++++++++++++
 4 files changed, 122 insertions(+)

Copied: blueberry/repos/community-any/PKGBUILD (from rev 136423, blueberry/trunk/PKGBUILD)
===================================================================
--- repos/community-any/PKGBUILD	                        (rev 0)
+++ repos/community-any/PKGBUILD	2015-07-04 22:51:08 UTC (rev 136424)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributer: Sam Burgos <jsbm1089 at gmail dot com>
+
+pkgname=blueberry
+pkgver=1.0.9
+pkgrel=1
+pkgdesc="Bluetooth configuration tool"
+arch=('any')
+url="https://github.com/linuxmint/blueberry"
+license=('GPL')
+depends=('gnome-bluetooth' 'python2-gobject' 'rfkill')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/blueberry/archive/$pkgver.tar.gz
+        fix-monitoring-settings.patch
+        detect-more-de.patch)
+md5sums=('c5c84b09df2a8a4ffeff85d4eeb28fb7'
+         '3824201f2b939bea0e522140c292d56e'
+         '71977387ffb8bfa1415fa10353c821b6')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix monitoring settings
+  patch -Np1 -i ../fix-monitoring-settings.patch
+
+  # Detect more DEs via XDG_CURRENT_DESKTOP
+  patch -Np1 -i ../detect-more-de.patch
+
+  # Hide in GNOME, KDE and Unity
+  for i in etc/xdg/autostart/blueberry-tray.desktop usr/share/applications/blueberry.desktop
+    do echo "NotShowIn=GNOME;KDE;Unity;" >> $i; done
+
+  # Make blueberry-tray executable
+  chmod +x usr/bin/blueberry-tray
+
+  # Python2 fix
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' usr/bin/blueberry{,-tray}
+}
+
+build() {
+  cd $pkgname-$pkgver
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  cp -r etc usr "$pkgdir"
+}

Copied: blueberry/repos/community-any/blueberry.install (from rev 136423, blueberry/trunk/blueberry.install)
===================================================================
--- repos/community-any/blueberry.install	                        (rev 0)
+++ repos/community-any/blueberry.install	2015-07-04 22:51:08 UTC (rev 136424)
@@ -0,0 +1,12 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Copied: blueberry/repos/community-any/detect-more-de.patch (from rev 136423, blueberry/trunk/detect-more-de.patch)
===================================================================
--- repos/community-any/detect-more-de.patch	                        (rev 0)
+++ repos/community-any/detect-more-de.patch	2015-07-04 22:51:08 UTC (rev 136424)
@@ -0,0 +1,31 @@
+From 96923856d28fab95151956fb6966ba3487e302ac Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballogyor at gmail.com>
+Date: Sat, 4 Jul 2015 11:39:12 +0200
+Subject: [PATCH] Detect more DEs via XDG_CURRENT_DESKTOP
+
+And add support for LXDE.
+---
+ usr/lib/blueberry/blueberry.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/usr/lib/blueberry/blueberry.py b/usr/lib/blueberry/blueberry.py
+index f469f3b..722581f 100755
+--- a/usr/lib/blueberry/blueberry.py
++++ b/usr/lib/blueberry/blueberry.py
+@@ -30,12 +30,14 @@
+         CONF_TOOLS["sound"] = "pavucontrol"
+     else:
+         CONF_TOOLS["sound"] = "xfce4-mixer"
+-elif "Muffin" in wm_info:
++elif "Muffin" in wm_info or xdg_current_desktop == "X-Cinnamon":
+     CONF_TOOLS = {"sound": "cinnamon-settings sound", "keyboard": "cinnamon-settings keyboard", "mouse": "cinnamon-settings mouse"}
+-elif "Mutter" in wm_info:
++elif "Mutter" in wm_info or "GNOME" in xdg_current_desktop:
+     CONF_TOOLS = {"sound": "gnome-control-center sound", "keyboard": "gnome-control-center keyboard", "mouse": "gnome-control-center mouse"}
+ elif "Unity" in wm_info or xdg_current_desktop == "Unity":
+     CONF_TOOLS = {"sound": "unity-control-center sound", "keyboard": "unity-control-center keyboard", "mouse": "unity-control-center mouse"}
++elif xdg_current_desktop == "LXDE":
++    CONF_TOOLS = {"sound": "pavucontrol", "keyboard": "lxinput", "mouse": "lxinput"}
+ else:
+     print "Warning: DE could not be detected!"
+     CONF_TOOLS = {}

Copied: blueberry/repos/community-any/fix-monitoring-settings.patch (from rev 136423, blueberry/trunk/fix-monitoring-settings.patch)
===================================================================
--- repos/community-any/fix-monitoring-settings.patch	                        (rev 0)
+++ repos/community-any/fix-monitoring-settings.patch	2015-07-04 22:51:08 UTC (rev 136424)
@@ -0,0 +1,30 @@
+From 47437a088d4e7bc9406e0815384c519c9b92b4eb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= <ballogyor at gmail.com>
+Date: Sat, 4 Jul 2015 13:36:25 +0200
+Subject: [PATCH] Fix monitoring settings
+
+We have to read settings once, otherwise changes are not detected. Simple reordering fix the problem.
+---
+ usr/lib/blueberry/blueberry-tray.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/usr/lib/blueberry/blueberry-tray.py b/usr/lib/blueberry/blueberry-tray.py
+index 29247ff..e7659e1 100755
+--- a/usr/lib/blueberry/blueberry-tray.py
++++ b/usr/lib/blueberry/blueberry-tray.py
+@@ -18,14 +18,13 @@ def __init__(self):
+ 
+         self.rfkill = rfkillMagic.Interface(self.update_icon_callback, debug)
+         self.settings = blueberrySettings.Settings()
++        self.settings.gsettings.connect("changed::tray-enabled", self.on_settings_changed_cb)
+ 
+         # If we have no adapter, or disabled tray, end early
+         if (not self.rfkill.have_adapter) or (not self.settings.get_tray_enabled()):
+             self.rfkill.terminate()
+             sys.exit(0)
+ 
+-        self.settings.gsettings.connect("changed::tray-enabled", self.on_settings_changed_cb)
+-
+         self.client = GnomeBluetooth.Client()
+         self.model = self.client.get_model()
+         self.model.connect('row-changed', self.update_icon_callback)



More information about the arch-commits mailing list