Hi Pierre! > Sorry to disappoint :p Sadly this patch does not work yet ;) > Stay put, almost there! :)
No worries! I have attached updated patch. No all it needs is "dbus-launch" and "Blueman.Mechanism.service". The former should be provided by (dbus-service). For the latter, the service should be run at system-level. So we may need to create a service for that by extending dbus-root-service. Also, I think it would be good to add this service as an option to bluetooth-service-type. Like an option "blueman? #t|#f". When its true, the bluetooth service adds and enables the blueman-dbus-service. I do not know how to work with services. Help? Thank you! Regards, RG.
From fd54245dbe1c6d387bd71f53f3cc7b3a853916b7 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgurura...@disroot.org>
Date: Mon, 11 May 2020 05:54:40 -0400
Subject: [PATCH] gnu: blueman: Update package definition.
* gnu/packages/networking.scm (blueman): Fixes.
[version]: Upgrade to 2.1.3.
[source]<origin>[method]: Change from url-fetch to git-fetch.
[arguments]<#:phases>['setenv]: New phase.
['patch-python-references]: New phase.
['patch-external-programs]: New phase.
['patch-pulseaudio-libraries]: New phase.
['wrap-blueman-progs]: New phase.
[native-inputs]: Add autoconf, autogen, automake and gobject-introspection.
[inputs]: Add iptables and ppp. Remove adwaita-icon-theme.
---
gnu/packages/networking.scm | 110 +++++++++++++++++++++++++++++++-----
1 file changed, 95 insertions(+), 15 deletions(-)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 76b0fc1559..5ca1e97ce3 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -72,6 +72,7 @@
#:use-module (gnu packages adns)
#:use-module (gnu packages algebra)
#:use-module (gnu packages audio)
+ #:use-module (gnu packages autogen)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
#:use-module (gnu packages bison)
@@ -113,6 +114,7 @@
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages samba)
#:use-module (gnu packages serialization)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages ssh)
@@ -127,50 +129,128 @@
(define-public blueman
(package
(name "blueman")
- (version "2.1.2")
+ (version "2.1.3")
(source
(origin
- (method url-fetch)
+ (method git-fetch)
(uri
- (string-append "https://github.com/blueman-project/blueman/releases/";
- "download/2.1.2/blueman-2.1.2.tar.gz"))
+ (git-reference
+ (url "https://github.com/blueman-project/blueman.git";)
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
- (base32 "0wamxdw36c8i3aqwmja5q70fajqwd7inpkvlpkldd54wdxbcd38d"))))
+ (base32 "1vb0zfns4q5d65hnja4c0k11lr38xxhdnkpkzfs6xca3mm6jyi1d"))))
(build-system glib-or-gtk-build-system)
(arguments
`(#:configure-flags
(list
"--enable-polkit"
- "--disable-appindicator" ; Deprecated
- "--with-systemdsystemunitdir=no" ; Not required
- "--with-systemduserunitdir=no"))) ; Not required
+ "--disable-appindicator" ; Not available
+ "--without-systemdsystemunitdir" ; Not required
+ "--without-systemduserunitdir") ; Not required
+ #:phases
+ (modify-phases %standard-phases
+ ;; Prevent the autogen.sh script to carry out the configure
+ ;; script, which has not yet been patched to replace /bin/sh.
+ (add-before 'bootstrap 'setenv
+ (lambda _
+ (setenv "NOCONFIGURE" "TRUE")
+ #t))
+ ;; Python references are not being patched in patch-phase of build,
+ ;; despite using python-wrapper as input. So we patch them manually.
+ (add-after 'unpack 'patch-python-references
+ (lambda* (#:key inputs #:allow-other-keys)
+ (with-directory-excursion "apps"
+ (substitute*
+ '("blueman-adapters.in" "blueman-applet.in"
+ "blueman-assistant.in" "blueman-manager.in"
+ "blueman-mechanism.in" "blueman-report.in"
+ "blueman-rfcomm-watcher.in" "blueman-sendto.in"
+ "blueman-services.in" "blueman-tray.in")
+ (("@PYTHON@") (string-append (assoc-ref inputs "python")
+ "/bin/python"
+ ,(version-major+minor
+ (package-version python))))))
+ #t))
+ ;; Fix loading of external programs.
+ (add-after 'unpack 'patch-external-programs
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute*
+ '("apps/blueman-report.in" "blueman/main/NetConf.py"
+ "blueman/main/PPPConnection.py")
+ (("/usr/sbin/bluetoothd")
+ (string-append (assoc-ref inputs "bluez")
+ "/libexec/bluetooth/bluetoothd"))
+ (("/sbin/iptables")
+ (string-append (assoc-ref inputs "iptables")
+ "/sbin/iptables"))
+ (("/usr/sbin/pppd")
+ (string-append (assoc-ref inputs "ppp")
+ "/sbin/pppd")))
+ #t))
+ ;; Fix loading of pulseaudio libraries.
+ (add-after 'unpack 'patch-pulseaudio-libraries
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let*
+ ((pulseaudio (assoc-ref inputs "pulseaudio"))
+ (pulse (string-append pulseaudio "/lib/libpulse.so.0"))
+ (pulse-glib (string-append pulseaudio
+ "/lib/libpulse-mainloop-glib.so.0")))
+ (with-directory-excursion "blueman/main"
+ (substitute* "PulseAudioUtils.py"
+ (("libpulse.so.0") pulse)
+ (("libpulse-mainloop-glib.so.0") pulse-glib)))
+ #t)))
+ ;; Fix running of blueman programs.
+ (add-after 'glib-or-gtk-wrap 'wrap-blueman-progs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let*
+ ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin/blueman-"))
+ (lib (string-append out "/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages")))
+ (for-each
+ (lambda (program)
+ (wrap-program (string-append bin program)
+ `("PYTHONPATH" = (,(getenv "PYTHONPATH"),lib))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))
+ '("adapters" "applet" "assistant" "manager" "report"
+ "sendto" "services" "tray"))
+ #t))))))
(native-inputs
- `(("cython" ,python-cython)
+ `(("autoconf" ,autoconf)
+ ("autogen" ,autogen)
+ ("automake" ,automake)
+ ("cython" ,python-cython)
("glib:bin" ,glib "bin")
+ ("gobject-introspection" ,gobject-introspection)
("gtk+:bin" ,gtk+ "bin")
("intltool" ,intltool)
("libtool" ,libtool)
("pkg-config" ,pkg-config)))
(inputs
- `(("adwaita-icon-theme" ,adwaita-icon-theme)
- ("bluez" ,bluez)
+ `(("bluez" ,bluez)
("dbus" ,dbus)
- ("gdkpixbuf" ,gdk-pixbuf)
+ ("gdkpixbuf" ,gdk-pixbuf+svg)
("glib" ,glib)
("gtk+" ,gtk+)
("iproute2" ,iproute)
+ ("iptables" ,iptables)
("net-tools" ,net-tools)
("pango" ,pango)
("polkit" ,polkit)
+ ("ppp" ,ppp)
("pulseaudio" ,pulseaudio)
("pycairo" ,python-pycairo)
("pygobject" ,python-pygobject)
("python" ,python-wrapper)
- ("libnm" ,libnma)))
+ ("libnm" ,network-manager)))
(synopsis "GTK+ Bluetooth manager")
(description "Blueman is a Bluetooth management utility using the Bluez
-D-Bus backend. It is designed to be easy to use for most common Bluetooth
-tasks.")
+ D-Bus backend. It is designed to be easy to use for most common Bluetooth
+ tasks.")
(home-page "https://github.com/blueman-project/blueman";)
(license license:gpl3+)))
--
2.26.2
0xAE6EF3046D6F7B57.asc
Description: application/pgp-keys
signature.asc
Description: OpenPGP digital signature
