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

[Brendan Tildesley <mail@brendan.scot>]

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


> On 04/19/2021 3:47 PM Leo Prikler <leo.prikler@student.tugraz.at> wrote:
[...]
> Fair enough, so it's either gnome or mate for XFCE.
> 
> > At this point I just want to pick one and get it done with. If you
> > like
> > I can make mate-polkit like your suggestion but rename the desktop
> > file
> > so it doesn't conflict.
> It's your choice, what you want to implement:
> 1. gnome-polkit with an added desktop file (but please use an aux file
> or make-desktop-file-entry instead of an origin pointing into the
> aether)
> 2. mate-polkit-for-xfce with the renamed desktop file.
> 3. something completely else

I made a patch for mate-polkit-for-xfce.



> > Debian's package says this on gnome-polkit:
> > "This implementation was originally designed for GNOME 2, but most
> > GNOME-based desktop environments, including GNOME 3, GNOME Flashback,
> > and MATE, have their own built-in PolicyKit agents and no longer use
> > this one. The remaining users of this implementation are Cinnamon,
> > XFCE and Unity. "
> Hmm, in that case keeping gnome-polkit around longer might be desirable
> if people want to port Cinnamon or Unity.  What does Debian's desktop
> file look like and could we port it over?

It has OnlyShowIn=XFCE;Unity;X-Cinnamon;

It also applies four patches of course
0001-Select-the-current-user-to-authenticate-with-by-defa.patch
0002-Auth-dialog-Make-the-label-wrap-at-70-chars.patch
0003-Get-user-icon-from-accountsservice-instead-of-lookin.patch
0004-Use-fresh-X11-timestamps-when-displaying-authenticat.patch
http://deb.debian.org/debian/pool/main/p/policykit-1-gnome/policykit-1-gnome_0.105-7.debian.tar.xz

[-- Attachment #2: 0001-gnu-Add-mate-polkit-for-xfce.patch --]
[-- Type: text/x-patch, Size: 2064 bytes --]

From eb7c6275699e9e8615ac8abf0cef768d96fe9da0 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Mon, 19 Apr 2021 18:26:31 +1000
Subject: [PATCH 1/2] gnu: Add mate-polkit-for-xfce.

gnu/packages/xfce.scm (mate-polkit-for-xfce) New variable.
---
 gnu/packages/xfce.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 38240d7b9f..6d272a74ac 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -48,6 +49,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)
@@ -948,6 +950,23 @@ menubar and the window decorations are hidden) that helps you to save space
 on your desktop.")
     (license gpl2+)))
 
+(define-public mate-polkit-for-xfce
+  (package/inherit mate-polkit
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'patch-desktop
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((a (string-append
+                        (assoc-ref outputs "out") "/etc/xdg/autostart/"
+                        "polkit-mate-authentication-agent-"))
+                    (b (string-append a "1.desktop"))
+                    (c (string-append a "for-xfce-1.desktop")))
+               (substitute* b (("MATE;") "XFCE;"))
+               ;; To avoid a conflict if both MATE and XFCE are installed.
+               (rename-file b c)))))))
+    (properties `((hidden? . #t)))))
+
 (define-public xfce
   (package
     (name "xfce")
-- 
2.31.1


[-- Attachment #3: 0002-gnu-xfce-Autostart-mate-polkit.patch --]
[-- Type: text/x-patch, Size: 889 bytes --]

From ccfd8c55472d9af3050d27c9b151d12323d728ce Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Mon, 19 Apr 2021 20:16:05 +1000
Subject: [PATCH 2/2] gnu: xfce: Autostart mate-polkit.

* gnu/packages/xfce.scm (xfce):[inputs]: Add mate-polkit-for-xfce.
---
 gnu/packages/xfce.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 6d272a74ac..0d38649024 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -990,6 +990,7 @@ on your desktop.")
        ("gnome-icon-theme"     ,gnome-icon-theme)
        ("gtk-xfce-engine"      ,gtk-xfce-engine)
        ("hicolor-icon-theme"   ,hicolor-icon-theme)
+       ("mate-polkit-for-xfce" ,mate-polkit-for-xfce)
        ("ristretto"            ,ristretto)
        ("shared-mime-info"     ,shared-mime-info)
        ("thunar"               ,thunar)
-- 
2.31.1