Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d8469e6e8e24b4d676ec166cae1b0bf94bb88422
commit d8469e6e8e24b4d676ec166cae1b0bf94bb88422 Author: kikadf <[email protected]> Date: Sat Nov 8 13:16:39 2014 +0100 bluez-5.24-2-x86_64 * Add patch to fix filetransfer (receive works, send not yet) diff --git a/source/apps/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch b/source/apps/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch new file mode 100644 index 0000000..fe3c513 --- /dev/null +++ b/source/apps/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch @@ -0,0 +1,59 @@ +From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <[email protected]> +Date: Sat, 12 Oct 2013 17:45:25 +0200 +Subject: [PATCH] Allow using obexd without systemd in the user session + +Not all sessions run systemd --user (actually, the majority +doesn't), so the dbus daemon must be able to spawn obexd +directly, and to do so it needs the full path of the daemon. +--- + Makefile.obexd | 4 ++-- + obexd/src/org.bluez.obex.service | 4 ---- + obexd/src/org.bluez.obex.service.in | 4 ++++ + 3 files changed, 6 insertions(+), 6 deletions(-) + delete mode 100644 obexd/src/org.bluez.obex.service + create mode 100644 obexd/src/org.bluez.obex.service.in + +diff --git a/Makefile.obexd b/Makefile.obexd +index 3760867..142e7c3 100644 +--- a/Makefile.obexd ++++ b/Makefile.obexd +@@ -2,12 +2,12 @@ + if SYSTEMD + systemduserunitdir = @SYSTEMD_USERUNITDIR@ + systemduserunit_DATA = obexd/src/obex.service ++endif + + dbussessionbusdir = @DBUS_SESSIONBUSDIR@ + dbussessionbus_DATA = obexd/src/org.bluez.obex.service +-endif + +-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service ++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in + + obex_plugindir = $(libdir)/obex/plugins + +diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service +deleted file mode 100644 +index a538088..0000000 +--- a/obexd/src/org.bluez.obex.service ++++ /dev/null +@@ -1,4 +0,0 @@ +-[D-BUS Service] +-Name=org.bluez.obex +-Exec=/bin/false +-SystemdService=dbus-org.bluez.obex.service +diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in +new file mode 100644 +index 0000000..9c815f2 +--- /dev/null ++++ b/obexd/src/org.bluez.obex.service.in +@@ -0,0 +1,4 @@ ++[D-BUS Service] ++Name=org.bluez.obex ++Exec=@libexecdir@/obexd ++SystemdService=dbus-org.bluez.obex.service +-- +1.8.3.1 + + diff --git a/source/apps/bluez/FrugalBuild b/source/apps/bluez/FrugalBuild index a75e770..f274aca 100644 --- a/source/apps/bluez/FrugalBuild +++ b/source/apps/bluez/FrugalBuild @@ -5,15 +5,16 @@ options+=('asneeded') pkgname=bluez pkgver=5.24 -pkgrel=1 +pkgrel=2 pkgdesc="Library to use the BlueZ Linux Bluetooth stack" url="http://bluez.sourceforge.net/"; depends=('alsa-lib' 'zlib' 'libsndfile' 'check' 'libical') groups=('apps') archs=('i686' 'x86_64') up2date="Flasttar http://www.bluez.org/download/"; -source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.xz) -signatures=(${source[0]/.xz/.sign}) +source=(http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.xz \ + 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch) +signatures=(${source[0]/.xz/.sign} '') conflicts=('bluez-utils' 'bluez-libs' 'bluez-hcidump') provides=('bluez-utils' 'bluez-libs' 'bluez-hcidump') replaces=('bluez-utils' 'bluez-libs' 'bluez-hcidump') @@ -36,7 +37,7 @@ Fconfopts="$Fconfopts \ --localstatedir=/var" build() { - Fsed 'group="lp"' 'group="netdev"' "$_F_cd_path/src/main.conf" + Fsed 'group="lp"' 'group="netdev"' src/main.conf Fbuild for i in simple-agent test-device; do _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
