[arch-commits] Commit in blueman/trunk (PKGBUILD fix-infinite-loop.patch)

[Balló György]

    Date: Sunday, November 1, 2015 @ 09:55:51
  Author: bgyorgy
Revision: 145395

upgpkg: blueman 2.0.1-1

Update to version 2.0.1

Modified:
  blueman/trunk/PKGBUILD
Deleted:
  blueman/trunk/fix-infinite-loop.patch

-------------------------+
 PKGBUILD                |   14 ++++----------
 fix-infinite-loop.patch |   24 ------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-11-01 08:49:02 UTC (rev 145394)
+++ PKGBUILD	2015-11-01 08:55:51 UTC (rev 145395)
@@ -4,8 +4,8 @@
 # Contributer: Martin Wimpress <code at flexion.org>
 
 pkgname=blueman
-pkgver=2.0
-pkgrel=5
+pkgver=2.0.1
+pkgrel=1
 pkgdesc="GTK+ Bluetooth Manager"
 arch=('i686' 'x86_64')
 url="https://github.com/blueman-project/blueman"
@@ -16,18 +16,12 @@
             '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')
+source=($pkgname-$pkgver.tar.gz::https://github.com/blueman-project/$pkgname/archive/$pkgver.tar.gz)
+sha256sums=('6474d5035b38dc88d05b30b21d2edda649fd90fa803edd630065807e23b3b17a')
 
 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
 

Deleted: fix-infinite-loop.patch
===================================================================
--- fix-infinite-loop.patch	2015-11-01 08:49:02 UTC (rev 145394)
+++ fix-infinite-loop.patch	2015-11-01 08:55:51 UTC (rev 145395)
@@ -1,24 +0,0 @@
-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, _):