Skip to content

Commit ddcb135

Browse files
committed
blueman: add patch
Fix infinite loop if RecentConns has only invalid items
1 parent acb9d10 commit ddcb135

File tree

2 files changed

+33
-3
lines changed

2 files changed

+33
-3
lines changed

blueman/PKGBUILD

+9-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
pkgname=blueman
77
pkgver=2.0.1
88
_pkgver=2.0
9-
pkgrel=3
9+
pkgrel=4
1010
pkgdesc="GTK+ Bluetooth Manager"
1111
arch=('i686' 'x86_64')
1212
url="https://github.com/blueman-project/blueman"
@@ -17,12 +17,18 @@ optdepends=('dnsmasq: Network Access Point (NAP) support'
1717
'networkmanager: Dial Up Networking (DUN) and Personal Area Networking (PAN) support'
1818
'pulseaudio-bluetooth: audio devices support')
1919
install=$pkgname.install
20-
source=($pkgname-$_pkgver.tar.gz::https://github.com/blueman-project/$pkgname/archive/$_pkgver.tar.gz)
21-
sha256sums=('3f6dc827c4410f128f75a15672af8dc76c5c041f6d639d5ab19b15abeb42ff74')
20+
source=($pkgname-$_pkgver.tar.gz::https://github.com/blueman-project/$pkgname/archive/$_pkgver.tar.gz
21+
fix-infinite-loop.patch)
22+
sha256sums=('3f6dc827c4410f128f75a15672af8dc76c5c041f6d639d5ab19b15abeb42ff74'
23+
'25eb611bd7817e82240565caf2ac14a5841cd56e09be702a77ca3d7737cd5ac5')
2224

2325
prepare() {
2426
cd $pkgname-$_pkgver
2527

28+
# Fix infinite loop if RecentConns has only invalid items
29+
# https://github.com/blueman-project/blueman/commit/9619d3b5
30+
patch -Np1 -i ../fix-infinite-loop.patch
31+
2632
# Fix path for bluetoothd
2733
sed -i 's|/usr/sbin/bluetoothd|/usr/lib/bluetooth/bluetoothd|' apps/blueman-report
2834

blueman/fix-infinite-loop.patch

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From 9619d3b5c95b1ec0c971b67d047abeb260e04cc4 Mon Sep 17 00:00:00 2001
2+
From: Christopher Schramm <[email protected]>
3+
Date: Wed, 22 Jul 2015 10:27:37 +0200
4+
Subject: [PATCH] Fix infinite loop if RecentConns has only invalid items
5+
6+
Closes #325
7+
---
8+
CHANGELOG.md | 1 +
9+
blueman/plugins/applet/RecentConns.py | 2 +-
10+
2 files changed, 2 insertions(+), 1 deletion(-)
11+
12+
diff --git a/blueman/plugins/applet/RecentConns.py b/blueman/plugins/applet/RecentConns.py
13+
index 3498ace..467807f 100644
14+
--- a/blueman/plugins/applet/RecentConns.py
15+
+++ b/blueman/plugins/applet/RecentConns.py
16+
@@ -135,7 +135,7 @@ def on_unload(self):
17+
18+
def initialize(self):
19+
dprint("rebuilding menu")
20+
- if not RecentConns.items:
21+
+ if RecentConns.items is None:
22+
self.recover_state()
23+
24+
def each(child, _):

0 commit comments

Comments
 (0)