[arch-commits] Commit in blueman/repos (10 files)

Balló György bgyorgy at archlinux.org
Wed Jul 22 13:38:43 UTC 2015


    Date: Wednesday, July 22, 2015 @ 15:38:43
  Author: bgyorgy
Revision: 137282

archrelease: copy trunk to community-i686, community-x86_64

Added:
  blueman/repos/community-i686/PKGBUILD
    (from rev 137281, blueman/trunk/PKGBUILD)
  blueman/repos/community-i686/blueman.install
    (from rev 137281, blueman/trunk/blueman.install)
  blueman/repos/community-i686/fix-infinite-loop.patch
    (from rev 137281, blueman/trunk/fix-infinite-loop.patch)
  blueman/repos/community-x86_64/PKGBUILD
    (from rev 137281, blueman/trunk/PKGBUILD)
  blueman/repos/community-x86_64/blueman.install
    (from rev 137281, blueman/trunk/blueman.install)
  blueman/repos/community-x86_64/fix-infinite-loop.patch
    (from rev 137281, blueman/trunk/fix-infinite-loop.patch)
Deleted:
  blueman/repos/community-i686/PKGBUILD
  blueman/repos/community-i686/blueman.install
  blueman/repos/community-x86_64/PKGBUILD
  blueman/repos/community-x86_64/blueman.install

------------------------------------------+
 /PKGBUILD                                |  108 +++++++++++++++++++++++++++++
 /blueman.install                         |   24 ++++++
 community-i686/PKGBUILD                  |   48 ------------
 community-i686/blueman.install           |   12 ---
 community-i686/fix-infinite-loop.patch   |   24 ++++++
 community-x86_64/PKGBUILD                |   48 ------------
 community-x86_64/blueman.install         |   12 ---
 community-x86_64/fix-infinite-loop.patch |   24 ++++++
 8 files changed, 180 insertions(+), 120 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2015-07-22 13:38:35 UTC (rev 137281)
+++ community-i686/PKGBUILD	2015-07-22 13:38:43 UTC (rev 137282)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributer: Arthur Zamarin <arthurzam at gmail.com>
-# Contributer: Martin Wimpress <code at flexion.org>
-
-pkgname=blueman
-pkgver=2.0
-pkgrel=3
-pkgdesc="GTK+ Bluetooth Manager"
-arch=('i686' 'x86_64')
-url="https://github.com/blueman-project/blueman"
-license=('GPL')
-depends=('bluez' 'bluez-libs' 'gtk3' 'libnotify' 'python-cairo' 'python-dbus' 'python-gobject')
-makedepends=('cython' 'intltool')
-optdepends=('dnsmasq: Network Access Point (NAP) support'
-            'networkmanager: Dial Up Networking (DUN) and Personal Area Networking (PAN) support'
-            'pulseaudio-bluetooth: audio devices support')
-install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::https://github.com/blueman-project/$pkgname/archive/$pkgver.tar.gz)
-sha256sums=('3f6dc827c4410f128f75a15672af8dc76c5c041f6d639d5ab19b15abeb42ff74')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Fix path for bluetoothd
-  sed -i 's|/usr/sbin/bluetoothd|/usr/lib/bluetooth/bluetoothd|' apps/blueman-report
-
-  # Fix non-standard icon names
-  sed -i 's/gtk-find/edit-find/' data/ui/device-list-widget.ui
-  sed -i 's/mouse/input-mouse/' blueman/services/Input.py
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/$pkgname \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: blueman/repos/community-i686/PKGBUILD (from rev 137281, blueman/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2015-07-22 13:38:43 UTC (rev 137282)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributer: Arthur Zamarin <arthurzam at gmail.com>
+# Contributer: Martin Wimpress <code at flexion.org>
+
+pkgname=blueman
+pkgver=2.0
+pkgrel=4
+pkgdesc="GTK+ Bluetooth Manager"
+arch=('i686' 'x86_64')
+url="https://github.com/blueman-project/blueman"
+license=('GPL')
+depends=('bluez' 'bluez-libs' 'gtk3' 'libnotify' 'python-cairo' 'python-dbus' 'python-gobject')
+makedepends=('cython' 'intltool')
+optdepends=('dnsmasq: Network Access Point (NAP) support'
+            'networkmanager: Dial Up Networking (DUN) and Personal Area Networking (PAN) support'
+            'pulseaudio-bluetooth: audio devices support')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::https://github.com/blueman-project/$pkgname/archive/$pkgver.tar.gz
+        fix-infinite-loop.patch)
+sha256sums=('3f6dc827c4410f128f75a15672af8dc76c5c041f6d639d5ab19b15abeb42ff74'
+            '25eb611bd7817e82240565caf2ac14a5841cd56e09be702a77ca3d7737cd5ac5')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix infinite loop if RecentConns has only invalid items
+  # https://github.com/blueman-project/blueman/commit/9619d3b5
+  patch -Np1 -i ../fix-infinite-loop.patch
+
+  # Fix path for bluetoothd
+  sed -i 's|/usr/sbin/bluetoothd|/usr/lib/bluetooth/bluetoothd|' apps/blueman-report
+
+  # Fix non-standard icon names
+  sed -i 's/gtk-find/edit-find/' data/ui/device-list-widget.ui
+  sed -i 's/mouse/input-mouse/' blueman/services/Input.py
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/$pkgname \
+    --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-i686/blueman.install
===================================================================
--- community-i686/blueman.install	2015-07-22 13:38:35 UTC (rev 137281)
+++ community-i686/blueman.install	2015-07-22 13:38:43 UTC (rev 137282)
@@ -1,12 +0,0 @@
-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: blueman/repos/community-i686/blueman.install (from rev 137281, blueman/trunk/blueman.install)
===================================================================
--- community-i686/blueman.install	                        (rev 0)
+++ community-i686/blueman.install	2015-07-22 13:38:43 UTC (rev 137282)
@@ -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: blueman/repos/community-i686/fix-infinite-loop.patch (from rev 137281, blueman/trunk/fix-infinite-loop.patch)
===================================================================
--- community-i686/fix-infinite-loop.patch	                        (rev 0)
+++ community-i686/fix-infinite-loop.patch	2015-07-22 13:38:43 UTC (rev 137282)
@@ -0,0 +1,24 @@
+From 9619d3b5c95b1ec0c971b67d047abeb260e04cc4 Mon Sep 17 00:00:00 2001
+From: Christopher Schramm <git at cschramm.eu>
+Date: Wed, 22 Jul 2015 10:27:37 +0200
+Subject: [PATCH] Fix infinite loop if RecentConns has only invalid items
+
+Closes #325
+---
+ CHANGELOG.md                          | 1 +
+ blueman/plugins/applet/RecentConns.py | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/blueman/plugins/applet/RecentConns.py b/blueman/plugins/applet/RecentConns.py
+index 3498ace..467807f 100644
+--- a/blueman/plugins/applet/RecentConns.py
++++ b/blueman/plugins/applet/RecentConns.py
+@@ -135,7 +135,7 @@ def on_unload(self):
+ 
+     def initialize(self):
+         dprint("rebuilding menu")
+-        if not RecentConns.items:
++        if RecentConns.items is None:
+             self.recover_state()
+ 
+         def each(child, _):

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2015-07-22 13:38:35 UTC (rev 137281)
+++ community-x86_64/PKGBUILD	2015-07-22 13:38:43 UTC (rev 137282)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributer: Arthur Zamarin <arthurzam at gmail.com>
-# Contributer: Martin Wimpress <code at flexion.org>
-
-pkgname=blueman
-pkgver=2.0
-pkgrel=3
-pkgdesc="GTK+ Bluetooth Manager"
-arch=('i686' 'x86_64')
-url="https://github.com/blueman-project/blueman"
-license=('GPL')
-depends=('bluez' 'bluez-libs' 'gtk3' 'libnotify' 'python-cairo' 'python-dbus' 'python-gobject')
-makedepends=('cython' 'intltool')
-optdepends=('dnsmasq: Network Access Point (NAP) support'
-            'networkmanager: Dial Up Networking (DUN) and Personal Area Networking (PAN) support'
-            'pulseaudio-bluetooth: audio devices support')
-install=$pkgname.install
-source=($pkgname-$pkgver.tar.gz::https://github.com/blueman-project/$pkgname/archive/$pkgver.tar.gz)
-sha256sums=('3f6dc827c4410f128f75a15672af8dc76c5c041f6d639d5ab19b15abeb42ff74')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Fix path for bluetoothd
-  sed -i 's|/usr/sbin/bluetoothd|/usr/lib/bluetooth/bluetoothd|' apps/blueman-report
-
-  # Fix non-standard icon names
-  sed -i 's/gtk-find/edit-find/' data/ui/device-list-widget.ui
-  sed -i 's/mouse/input-mouse/' blueman/services/Input.py
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/$pkgname \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: blueman/repos/community-x86_64/PKGBUILD (from rev 137281, blueman/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2015-07-22 13:38:43 UTC (rev 137282)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributer: Arthur Zamarin <arthurzam at gmail.com>
+# Contributer: Martin Wimpress <code at flexion.org>
+
+pkgname=blueman
+pkgver=2.0
+pkgrel=4
+pkgdesc="GTK+ Bluetooth Manager"
+arch=('i686' 'x86_64')
+url="https://github.com/blueman-project/blueman"
+license=('GPL')
+depends=('bluez' 'bluez-libs' 'gtk3' 'libnotify' 'python-cairo' 'python-dbus' 'python-gobject')
+makedepends=('cython' 'intltool')
+optdepends=('dnsmasq: Network Access Point (NAP) support'
+            'networkmanager: Dial Up Networking (DUN) and Personal Area Networking (PAN) support'
+            'pulseaudio-bluetooth: audio devices support')
+install=$pkgname.install
+source=($pkgname-$pkgver.tar.gz::https://github.com/blueman-project/$pkgname/archive/$pkgver.tar.gz
+        fix-infinite-loop.patch)
+sha256sums=('3f6dc827c4410f128f75a15672af8dc76c5c041f6d639d5ab19b15abeb42ff74'
+            '25eb611bd7817e82240565caf2ac14a5841cd56e09be702a77ca3d7737cd5ac5')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # Fix infinite loop if RecentConns has only invalid items
+  # https://github.com/blueman-project/blueman/commit/9619d3b5
+  patch -Np1 -i ../fix-infinite-loop.patch
+
+  # Fix path for bluetoothd
+  sed -i 's|/usr/sbin/bluetoothd|/usr/lib/bluetooth/bluetoothd|' apps/blueman-report
+
+  # Fix non-standard icon names
+  sed -i 's/gtk-find/edit-find/' data/ui/device-list-widget.ui
+  sed -i 's/mouse/input-mouse/' blueman/services/Input.py
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib/$pkgname \
+    --disable-schemas-compile
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: community-x86_64/blueman.install
===================================================================
--- community-x86_64/blueman.install	2015-07-22 13:38:35 UTC (rev 137281)
+++ community-x86_64/blueman.install	2015-07-22 13:38:43 UTC (rev 137282)
@@ -1,12 +0,0 @@
-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: blueman/repos/community-x86_64/blueman.install (from rev 137281, blueman/trunk/blueman.install)
===================================================================
--- community-x86_64/blueman.install	                        (rev 0)
+++ community-x86_64/blueman.install	2015-07-22 13:38:43 UTC (rev 137282)
@@ -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: blueman/repos/community-x86_64/fix-infinite-loop.patch (from rev 137281, blueman/trunk/fix-infinite-loop.patch)
===================================================================
--- community-x86_64/fix-infinite-loop.patch	                        (rev 0)
+++ community-x86_64/fix-infinite-loop.patch	2015-07-22 13:38:43 UTC (rev 137282)
@@ -0,0 +1,24 @@
+From 9619d3b5c95b1ec0c971b67d047abeb260e04cc4 Mon Sep 17 00:00:00 2001
+From: Christopher Schramm <git at cschramm.eu>
+Date: Wed, 22 Jul 2015 10:27:37 +0200
+Subject: [PATCH] Fix infinite loop if RecentConns has only invalid items
+
+Closes #325
+---
+ CHANGELOG.md                          | 1 +
+ blueman/plugins/applet/RecentConns.py | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/blueman/plugins/applet/RecentConns.py b/blueman/plugins/applet/RecentConns.py
+index 3498ace..467807f 100644
+--- a/blueman/plugins/applet/RecentConns.py
++++ b/blueman/plugins/applet/RecentConns.py
+@@ -135,7 +135,7 @@ def on_unload(self):
+ 
+     def initialize(self):
+         dprint("rebuilding menu")
+-        if not RecentConns.items:
++        if RecentConns.items is None:
+             self.recover_state()
+ 
+         def each(child, _):



More information about the arch-commits mailing list