[bug#51510] [PATCH 0/4] Update piper to 0.6, libratbag to 0.16.

[bug#51510] [PATCH 0/4] Update piper to 0.6, libratbag to 0.16.

[Brendan Tildesley]

[bug#51510] [PATCH 1/4] gnu: libratbag: Update to 0.16.

[Brendan Tildesley]

* gnu/packages/gnome.scm (libratbag): Update to 0.16.
---
 gnu/packages/gnome.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b138ff228b..650c4e0305 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -27,7 +27,7 @@
 ;;; Copyright © 2017, 2018 nee <nee-git@hidamari.blue>
 ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
-;;; Copyright © 2017, 2020 Brendan Tildesley <mail@brendan.scot>
+;;; Copyright © 2017, 2020, 2021 Brendan Tildesley <mail@brendan.scot>
 ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2018 Jovany Leandro G.C <bit4bit@riseup.net>
 ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
@@ -11706,7 +11706,7 @@ (define-public apostrophe
 (define-public libratbag
   (package
     (name "libratbag")
-    (version "0.14")
+    (version "0.16")
     (source
      (origin
        (method git-fetch)
@@ -11715,7 +11715,7 @@ (define-public libratbag
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1fpwp2sj8mf98bqasq2h8qwgprxi7k3iw33gcfid3d1lbyiacw0x"))))
+        (base32 "0jjf6xc3a37icp5dvbxla3ai9is2ns31m0llbfq1bmb6dk8cd4n0"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-- 
2.33.1

[bug#51510] [PATCH 2/4] gnu: piper: Update to 0.6.

[Brendan Tildesley]

* gnu/packages/gnome.scm (piper): Update to 0.6.
[inputs]: Add libratbag.
---
 gnu/packages/gnome.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 650c4e0305..c8ec3fe248 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11773,7 +11773,7 @@ (define-public libratbag
 (define-public piper
   (package
     (name "piper")
-    (version "0.5.1")
+    (version "0.6")
     (source
      (origin
        (method git-fetch)
@@ -11781,7 +11781,7 @@ (define-public piper
              (url "https://github.com/libratbag/piper")
              (commit version)))
        (sha256
-        (base32 "1nfjnsiwg2rs6gkjsxzhr2708i6di149dgwq3cf6l12rxqpb8arj"))
+        (base32 "02x4d4n0078slj2pl0rvgayrrxvna6y6vj8fxfamvazsh5xyfzwk"))
        (file-name (git-file-name name version))))
     (build-system meson-build-system)
     (native-inputs
@@ -11794,6 +11794,7 @@ (define-public piper
      `(("adwaita-icon-theme" ,adwaita-icon-theme)
        ("gtk" ,gtk+)
        ("gtk:bin" ,gtk+ "bin")
+       ("libratbag" ,libratbag)
        ("librsvg" ,librsvg)
        ("python-evdev" ,python-evdev)
        ("python-lxml" ,python-lxml)
-- 
2.33.1

[bug#51510] [PATCH 3/4] gnu: services: Add ratbag-dbus-service.

[Brendan Tildesley]

* gnu/services/desktop.scm (ratbag-dbus-service): New variable. Export
it.
---
 gnu/services/desktop.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm
index 64d0e85301..101344aced 100644
--- a/gnu/services/desktop.scm
+++ b/gnu/services/desktop.scm
@@ -150,6 +150,8 @@ (define-module (gnu services desktop)
 
             polkit-wheel-service
 
+            ratbag-dbus-service
+
             gnome-keyring-configuration
             gnome-keyring-configuration?
             gnome-keyring-service-type
@@ -1182,6 +1184,11 @@ (define polkit-wheel
 (define polkit-wheel-service
   (simple-service 'polkit-wheel polkit-service-type (list polkit-wheel)))
 
+\f
+
+(define ratbag-dbus-service
+  (simple-service 'ratbag dbus-root-service-type (list libratbag)))
+
 \f
 ;;;
 ;;; The default set of desktop services.
-- 
2.33.1

[bug#51510] [PATCH 0/4] Update piper to 0.6, libratbag to 0.16.

[Ludovic Courtès]

Brendan Tildesley <mail@brendan.scot> skribis:

> * gnu/services/desktop.scm (ratbag-dbus-service): New variable. Export
> it.

[...]

> +(define ratbag-dbus-service
> +  (simple-service 'ratbag dbus-root-service-type (list libratbag)))

I did not apply this and the next one because we would need
documentation in doc/guix.texi.

Could you make these changes and submit separately?

Thanks in advance, and apologies for the delay!

Ludo’.

[bug#51510] [PATCH 4/4] gnu: libratbag, piper: Adjust descriptions.

[Brendan Tildesley]

* gnu/packages/gnome.scm
(libratbag): [description]: Don't bother mentioning the service here.
(piper): [description]: Mention the new ratbag-dbus-service
instead. Simplify.
---
 gnu/packages/gnome.scm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c8ec3fe248..1ef78dfedf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11762,12 +11762,7 @@ (define-public libratbag
 @command{ratbagctl} command line interface for configuring devices.
 
 libratbag currently supports devices from Logitech, Etekcity, GSkill, Roccat,
-Steelseries.
-
-The ratbagd DBus service can be enabled by adding the following service to
-your operating-system definition:
-
-  (simple-service 'ratbagd dbus-root-service-type (list libratbag))")
+and Steelseries.")
     (license license:expat)))
 
 (define-public piper
@@ -11826,13 +11821,9 @@ (define-public piper
     (home-page "https://github.com/libratbag/piper/")
     (synopsis "Configure bindings and LEDs on gaming mice")
     (description "Piper is a GTK+ application for configuring gaming mice with
-onboard configuration for key bindings via libratbag.  Piper requires
-a @command{ratbagd} daemon running with root privileges.  It can be run
-manually as root, but is preferably configured as a DBus service that can
-launch on demand.  This can be configured by enabling the following service,
-provided there is a DBus service present:
+onboard configuration for key bindings via libratbag.
 
-  (simple-service 'ratbagd dbus-root-service-type (list libratbag))")
+Configure the ratbag-dbus-service to enable Piper's functionality.")
     (license license:gpl2)))
 
 (define-public parlatype
-- 
2.33.1

bug#51510: [PATCH 0/4] Update piper to 0.6, libratbag to 0.16.

[Ludovic Courtès]

Hi,

Brendan Tildesley <mail@brendan.scot> skribis:

> * gnu/packages/gnome.scm (libratbag): Update to 0.16.

[...]

> * gnu/packages/gnome.scm (piper): Update to 0.6.
> [inputs]: Add libratbag.

Applied, thanks!

Ludo’.