summaryrefslogtreecommitdiff
path: root/source/xap/blueman
diff options
context:
space:
mode:
Diffstat (limited to 'source/xap/blueman')
-rwxr-xr-xsource/xap/blueman/blueman.SlackBuild16
-rw-r--r--source/xap/blueman/fix_on_off_loop.diff58
-rw-r--r--source/xap/blueman/no_hide_applet.diff30
3 files changed, 3 insertions, 101 deletions
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild
index bdb134e0..737dae98 100755
--- a/source/xap/blueman/blueman.SlackBuild
+++ b/source/xap/blueman/blueman.SlackBuild
@@ -26,7 +26,6 @@
PKGNAM=blueman
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
BUILD=${BUILD:-1}
-POLKIT_OPTION=" --disable-polkit "
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -71,17 +70,13 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Address a couple of bugs that have been fixed in the bzr repo
-zcat $CWD/no_hide_applet.diff.gz | patch -p0 --verbose || exit 1
-zcat $CWD/fix_on_off_loop.diff.gz | patch -p0 --verbose || exit 1
-
# Use blueman-open, a modified version of this, to browse obexfs shares:
# http://www.kde-apps.org/content/show.php/kde4+bluetooth+files+open?content=108869
zcat $CWD/blueman-use_blueman-open_for_obexfs.diff.gz | patch -p1 || exit 1
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
-./configure \
+./autogen.sh \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
@@ -90,18 +85,13 @@ CXXFLAGS="$SLKCFLAGS" \
--docdir=/usr/doc/$PKGNAM-$VERSION \
--disable-static \
--with-dhcp-config=/etc/dhcpd.conf \
- --enable-hal \
- $POLKIT_OPTION \
+ --disable-hal \
+ --enable-polkit \
--build=$ARCH-slackware-linux
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
-if echo $POLKIT_OPTION | grep -q '\--disable-polkit' ; then
- # Remove unneeded junk
- rm -rf $PKG/usr/share/polkit-1
-fi
-
# Add the blueman-open script to /usr/libexec for browsing obexfs shares
# I don't want to put this in PATH and have someone accidentally run it
mkdir -p $PKG/usr/libexec
diff --git a/source/xap/blueman/fix_on_off_loop.diff b/source/xap/blueman/fix_on_off_loop.diff
deleted file mode 100644
index ac11c135..00000000
--- a/source/xap/blueman/fix_on_off_loop.diff
+++ /dev/null
@@ -1,58 +0,0 @@
-revno: 602
-committer: walmis
-timestamp: Sun 2009-10-25 15:49:33 +0000
-message:
- fix bluetooth on/off loop
-
-=== modified file 'blueman/plugins/applet/PowerManager.py'
---- blueman/plugins/applet/PowerManager.py 2009-10-25 15:16:14 +0000
-+++ blueman/plugins/applet/PowerManager.py 2009-10-25 15:49:33 +0000
-@@ -66,22 +66,6 @@
- dprint("adapter powered on while in off state, turning bluetooth on")
- self.bluetooth_off = False
-
--
-- def on_manager_state_changed(self, state):
-- if state:
-- adapters = self.Applet.Manager.ListAdapters()
-- for adapter in adapters:
-- props = adapter.GetProperties()
-- if not props["Powered"]:
-- self.bluetooth_off = True
-- if self.state_change_deferred != -1:
-- break
-- else:
-- return
--
-- if self.state_change_deferred != -1:
-- self.bluetooth_off = self.state_change_deferred
-- self.state_change_deferred = -1
-
- def on_bluetooth_toggled(self):
- self.bluetooth_off = not self.bluetooth_off
-@@ -97,9 +81,17 @@
-
- return pixbuf
-
-+ def process_deferred(self):
-+ if self.state_change_deferred != -1:
-+ dprint("Setting deferred status")
-+ self.bluetooth_off = self.state_change_deferred
-+ self.state_change_deferred = -1
-+
- def on_adapter_added(self, path):
- adapter = Bluez.Adapter(path)
- def on_ready():
-+ self.process_deferred()
-+
- if self.bluetooth_off:
- adapter.SetProperty("Powered", False)
- else:
-@@ -134,6 +126,7 @@
- self.__dict__[key] = value
-
- if not self.Applet.Manager:
-+ dprint("deferring status change")
- self.state_change_deferred = value
- return
-
diff --git a/source/xap/blueman/no_hide_applet.diff b/source/xap/blueman/no_hide_applet.diff
deleted file mode 100644
index a57a2b8f..00000000
--- a/source/xap/blueman/no_hide_applet.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-revno: 647
-committer: Valmantas Palikša <walmis@balticum-tv.lt>
-branch nick: trunk
-timestamp: Wed 2009-12-02 21:31:16 +0200
-message:
- don't force hide the applet if bluez manager is not initialized
-
-=== modified file 'blueman/plugins/applet/StatusIcon.py'
---- blueman/plugins/applet/StatusIcon.py 2009-10-27 16:10:53 +0000
-+++ blueman/plugins/applet/StatusIcon.py 2009-12-02 19:31:16 +0000
-@@ -55,15 +55,16 @@
- self.Query()
-
- def Query(self):
-- if not self.Applet.Manager:
-- self.props.visible = False
-- return
-
- rets = self.Applet.Plugins.Run("on_query_status_icon_visibility")
- if not StatusIcon.FORCE_HIDE in rets:
- if StatusIcon.FORCE_SHOW in rets:
- self.props.visible = True
- else:
-+ if not self.Applet.Manager:
-+ self.props.visible = False
-+ return
-+
- try:
- if self.Applet.Manager.ListAdapters() == []:
- self.props.visible = False