[bug#47870] [PATCH 1/2] gnu: polkit-gnome: Add autostart .desktop file.

[Brendan Tildesley <mail@brendan.scot>]

[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]


> On 04/18/2021 5:52 PM Leo Prikler <leo.prikler@student.tugraz.at> wrote:
> 
>  
> Hi,
> 
> Am Sonntag, den 18.04.2021, 17:15 +0200 schrieb Brendan Tildesley:
> > > On 04/18/2021 4:47 PM Leo Prikler <leo.prikler@student.tugraz.at>
> > > wrote:
[...]
> > On second thought perhaps another option is just to use the MATE
> > polkit
> > agent instead? I tested it for changing network manager and it worked
> > just the same, only the GUI looks slightly different. I was searching
> >  What do you think?
> If it works for XFCE, why not?  Given that polkit-gnome has no
> dependents other than itself, should we perhaps also look into removing
> it?
> 
One issue is that mate-polkit's .desktop file has the line OnlyShowIn=MATE;
This prevents it from being launched in any other desktop. When multiple 
desktops are installed all these files sit in /run/current-desktop/profile/etc/
and rely these lines to make them not appear in other desktops.

I made a couple patches [attached] that adds XFCE to the the .desktop's OnlyShowIn.
It's a little ugly though. 
> Regards,
> Leo

[-- Attachment #2: 0002-gnu-xfce-Start-mate-polkit-agent-on-login.patch --]
[-- Type: text/x-patch, Size: 1317 bytes --]

From 835d0748ca4c0738d777aed8f895622759ea4f8d Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Mon, 19 Apr 2021 16:45:15 +1000
Subject: [PATCH 2/2] gnu: xfce: Start mate-polkit agent on login.

* gnu/packages/xfce.scm (xfce): Add mate-polkit to the xfce union
package. This will cause the authentication agent to be run on login.
This fixes users in XFCE not being able to edit NetworkManager settings.
---
 gnu/packages/xfce.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 38240d7b9f..786a8cf243 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -48,6 +48,7 @@
   #:use-module (gnu packages inkscape)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages mate)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pdf)
   #:use-module (gnu packages photo)
@@ -971,6 +972,7 @@ on your desktop.")
        ("gnome-icon-theme"     ,gnome-icon-theme)
        ("gtk-xfce-engine"      ,gtk-xfce-engine)
        ("hicolor-icon-theme"   ,hicolor-icon-theme)
+       ("mate-polkit"          ,mate-polkit)
        ("ristretto"            ,ristretto)
        ("shared-mime-info"     ,shared-mime-info)
        ("thunar"               ,thunar)
-- 
2.31.1


[-- Attachment #3: 0001-gnu-polkit-mate-Enable-autostarting-in-XFCE.patch --]
[-- Type: text/x-patch, Size: 1949 bytes --]

From ef20e6422cea8089a4ecf2e7b0293c27bc71a56b Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Mon, 19 Apr 2021 16:37:55 +1000
Subject: [PATCH 1/2] gnu: polkit-mate: Enable autostarting in XFCE.

* gnu/packages/mate.scm (polkit-mate): Add XFCE to the OnlyShowIn field
of the autostart .desktop file so it will be started by XFCE too. This
is for the same of making polkit-mate the de facto agent for XFCE in
Guix, since XFCE does not have it's own official one.

One downside of this is that since all these .desktop files end up in
/run/current-system/profile/etc/, if a user for some reasons wants to have
MATE installed, plus an XFCE that doesn't include mate-polkit, this cause
XFCE to start it anyway. Not sure if that is a big deal.
---
 gnu/packages/mate.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 44420147a3..1a8a268cc9 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1511,6 +1512,14 @@ MATE Desktop to monitor your system resources and usage.")
        ("gtk+" ,gtk+)
        ("gdk-pixbuf" ,gdk-pixbuf)
        ("polkit" ,polkit)))
+    ;; This will allow mate-polkit to be used with XFCE too.
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-desktop-for-xfce
+           (lambda _
+             (substitute* "src/polkit-mate-authentication-agent-1.desktop.in.in"
+                 (("MATE;") "MATE;XFCE;")))))))
     (home-page "https://mate-desktop.org/")
     (synopsis "DBus specific service for MATE")
     (description
-- 
2.31.1