[bug#42302] [PATCH] gnu: Add xssproxy

[bug#42302] [PATCH] gnu: Add xssproxy

[Ivan Kozlov]

xssproxy is a tiny daemon that provides an Idle Inhibition Service specification conformant D-Bus interface to libXss. It allows programs that support only this interface (like older Firefox and IceCat) to inhibit screen locking or blanking on systems without a conformant screen locker program.

* gnu/packages/xdisorg.scm (xssproxy): New variable.
---
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index cec9bf0799..3e71b07636 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -37,6 +37,7 @@
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com>
 ;;; Copyright © 2020 Alex McGrath <amk@amk.ie>
+;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1360,6 +1361,40 @@ demos.  It also acts as a nice screen locker.")
                "http://metadata.ftp-master.debian.org/changelogs/"
                "/main/x/xscreensaver/xscreensaver_5.36-1_copyright")))))
 
+(define xssproxy
+  (package
+    (name "xssproxy")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/timakro/xssproxy/archive/v"
+                                  version
+                                  ".tar.gz"))
+              (sha256
+               (base32
+                "05pp9f0rx7g8gahqvr7krlfy90mlcb94ig4m5flmrfszwrr9v8k7"))))
+    (build-system gnu-build-system)
+    (arguments `(#:make-flags `("bindir=/bin"
+                                "man1dir=/share/man/man1"
+                                ,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+                                "CC=gcc")
+                 #:phases (modify-phases %standard-phases
+                            (delete 'configure)
+                            (delete 'check))))
+    (inputs `(("glib" ,glib)
+              ("pkg-config" ,pkg-config)
+              ("libx11" ,libx11)
+              ("libxext" ,libxext)
+              ("libxscrnsaver" ,libxscrnsaver)
+              ("dbus" ,dbus)))
+    (synopsis "Forward freedesktop.org Idle Inhibition Service calls to Xss")
+    (description "xssproxy implements the org.freedesktop.ScreenSaver D-Bus interface
+described in the Idle Inhibition Service Draft by the freedesktop.org developers.
+The inhibition of the screensaver is then controlled using the XScreenSaverSuspend
+function from the Xss (X11 Screen Saver extension) library.")
+    (home-page "https://github.com/timakro/xssproxy")
+    (license license:gpl3+)))
+
 (define-public xsel
   (package
     (name "xsel")

[bug#42302] [PATCH] gnu: Add xssproxy

[Ludovic Courtès]

Hi,

Ivan Kozlov <kanichos@yandex.ru> skribis:

> xssproxy is a tiny daemon that provides an Idle Inhibition Service specification conformant D-Bus interface to libXss. It allows programs that support only this interface (like older Firefox and IceCat) to inhibit screen locking or blanking on systems without a conformant screen locker program.
>
> * gnu/packages/xdisorg.scm (xssproxy): New variable.

Nice!  Note: you don’t need to provide a description of the package in
the commit log.

Overall the patch looks good to me, modulo minor issues reported by
‘guix lint’ (see below for how to address them):

--8<---------------cut here---------------start------------->8---
gnu/packages/xdisorg.scm:1384:12: xssproxy@1.0.0: 'pkg-config' should probably be a native input
gnu/packages/xdisorg.scm:1368:12: xssproxy@1.0.0: the source file name should contain the package name
gnu/packages/xdisorg.scm:1368:12: xssproxy@1.0.0: the source URI should not be an autogenerated tarball
--8<---------------cut here---------------end--------------->8---

> +(define xssproxy

Use ‘define-public’ instead.

> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://github.com/timakro/xssproxy/archive/v"
> +                                  version
> +                                  ".tar.gz"))

Use ’git-fetch’ instead of ‘url-fetch’ to fetch the source over Git
instead of an autogenerated tarball, and add a ‘file-name’ field.

> +    (synopsis "Forward freedesktop.org Idle Inhibition Service calls to Xss")
> +    (description "xssproxy implements the org.freedesktop.ScreenSaver D-Bus interface
> +described in the Idle Inhibition Service Draft by the freedesktop.org developers.
> +The inhibition of the screensaver is then controlled using the XScreenSaverSuspend
> +function from the Xss (X11 Screen Saver extension) library.")

You can use markup for clarity, for instance
@code{org.freedesktop.ScreenSaver}.

Could you send an updated patch?

Thank you!

Ludo’.

[bug#42302] [PATCH] gnu: Add xssproxy

[Ivan Kozlov]

Hello,

Thanks for the corrections.

>Note: you don’t need to provide a description of the package in
>the commit log.

It was a clarification for guix-patches readers. I hadn’t thought about ‘git am’ and the like and I’ll write such things as email replies in the future.

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index cec9bf0799..f4d77a5338 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -37,6 +37,7 @@
 ;;; Copyright © 2020 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Boris A. Dekshteyn <boris.dekshteyn@gmail.com>
 ;;; Copyright © 2020 Alex McGrath <amk@amk.ie>
+;;; Copyright © 2020 Ivan Kozlov <kanichos@yandex.ru>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1360,6 +1361,43 @@ demos.  It also acts as a nice screen locker.")
                "http://metadata.ftp-master.debian.org/changelogs/"
                "/main/x/xscreensaver/xscreensaver_5.36-1_copyright")))))
 
+(define-public xssproxy
+  (package
+    (name "xssproxy")
+    (version "1.0.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/timakro/xssproxy.git")
+                    (commit (string-append "v" version))))
+              (file-name (string-append name "-" version "-checkout"))
+              (sha256
+               (base32
+                "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"))))
+    (build-system gnu-build-system)
+    (arguments `(#:make-flags `("bindir=/bin"
+                                "man1dir=/share/man/man1"
+                                ,(string-append "DESTDIR=" (assoc-ref %outputs "out"))
+                                "CC=gcc")
+                 #:phases (modify-phases %standard-phases
+                            (delete 'configure)
+                            (delete 'check))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("glib" ,glib)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxscrnsaver" ,libxscrnsaver)
+       ("dbus" ,dbus)))
+    (synopsis "Forward freedesktop.org Idle Inhibition Service calls to Xss")
+    (description "xssproxy implements the @code{org.freedesktop.ScreenSaver} D-Bus interface
+described in the Idle Inhibition Service Draft by the freedesktop.org developers.
+The inhibition of the screensaver is then controlled using the XScreenSaverSuspend
+function from the Xss (X11 Screen Saver extension) library.")
+    (home-page "https://github.com/timakro/xssproxy")
+    (license license:gpl3+)))
+
 (define-public xsel
   (package
     (name "xsel")




10.07.2020, 23:49, "Ludovic Courtès" <ludo@gnu.org>:
> Hi,
>
> Ivan Kozlov <kanichos@yandex.ru> skribis:
>
>>  xssproxy is a tiny daemon that provides an Idle Inhibition Service specification conformant D-Bus interface to libXss. It allows programs that support only this interface (like older Firefox and IceCat) to inhibit screen locking or blanking on systems without a conformant screen locker program.
>>
>>  * gnu/packages/xdisorg.scm (xssproxy): New variable.
>
> Nice! Note: you don’t need to provide a description of the package in
> the commit log.
>
> Overall the patch looks good to me, modulo minor issues reported by
> ‘guix lint’ (see below for how to address them):
>
> --8<---------------cut here---------------start------------->8---
> gnu/packages/xdisorg.scm:1384:12: xssproxy@1.0.0: 'pkg-config' should probably be a native input
> gnu/packages/xdisorg.scm:1368:12: xssproxy@1.0.0: the source file name should contain the package name
> gnu/packages/xdisorg.scm:1368:12: xssproxy@1.0.0: the source URI should not be an autogenerated tarball
> --8<---------------cut here---------------end--------------->8---
>
>>  +(define xssproxy
>
> Use ‘define-public’ instead.
>
>>  + (source (origin
>>  + (method url-fetch)
>>  + (uri (string-append "https://github.com/timakro/xssproxy/archive/v"
>>  + version
>>  + ".tar.gz"))
>
> Use ’git-fetch’ instead of ‘url-fetch’ to fetch the source over Git
> instead of an autogenerated tarball, and add a ‘file-name’ field.
>
>>  + (synopsis "Forward freedesktop.org Idle Inhibition Service calls to Xss")
>>  + (description "xssproxy implements the org.freedesktop.ScreenSaver D-Bus interface
>>  +described in the Idle Inhibition Service Draft by the freedesktop.org developers.
>>  +The inhibition of the screensaver is then controlled using the XScreenSaverSuspend
>>  +function from the Xss (X11 Screen Saver extension) library.")
>
> You can use markup for clarity, for instance
> @code{org.freedesktop.ScreenSaver}.
>
> Could you send an updated patch?
>
> Thank you!
>
> Ludo’.

bug#42302: [PATCH] gnu: Add xssproxy

[Ludovic Courtès]

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

Hi,

Ivan Kozlov <kanichos@yandex.ru> skribis:

>>Note: you don’t need to provide a description of the package in
>>the commit log.
>
> It was a clarification for guix-patches readers. I hadn’t thought about ‘git am’ and the like and I’ll write such things as email replies in the future.

Sure, no problem!

Applied with the minor changes below to placate ‘guix lint’.

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1566 bytes --]

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index f486c7e654..6033b40380 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1368,7 +1368,7 @@ demos.  It also acts as a nice screen locker.")
     (source (origin
               (method git-fetch)
               (uri (git-reference
-                    (url "https://github.com/timakro/xssproxy.git")
+                    (url "https://github.com/timakro/xssproxy")
                     (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
@@ -1391,10 +1391,11 @@ demos.  It also acts as a nice screen locker.")
        ("libxscrnsaver" ,libxscrnsaver)
        ("dbus" ,dbus)))
     (synopsis "Forward freedesktop.org Idle Inhibition Service calls to Xss")
-    (description "xssproxy implements the @code{org.freedesktop.ScreenSaver} D-Bus interface
-described in the Idle Inhibition Service Draft by the freedesktop.org developers.
-The inhibition of the screensaver is then controlled using the XScreenSaverSuspend
-function from the Xss (X11 Screen Saver extension) library.")
+    (description "xssproxy implements the @code{org.freedesktop.ScreenSaver}
+D-Bus interface described in the Idle Inhibition Service Draft by the
+freedesktop.org developers.  The inhibition of the screensaver is then
+controlled using the XScreenSaverSuspend function from the Xss (X11 Screen
+Saver extension) library.")
     (home-page "https://github.com/timakro/xssproxy")
     (license license:gpl3+)))