screen-lockers: i3lock-color and i3lock-fancy

Done

Details

5 participants

Chris Marusich
Ludovic Courtès
ng0
ng0
ng0

Owner: unassigned

Submitted by: ng0

Severity: normal

Debbugs page

ng0 wrote on 26 May 2017 04:33

Recipients:(name . guix-patches)(address . guix-patches@gnu.org)

Message-ID:E1dEDUZ-0006gP-3L@rmmprod05.runbox

I have no idea about the error of i3lock-fancy (password is not accepted).

An commented phase in i3lock-color is still included where I tried to fix this, but I don't know much about PAM at this point.

Finishing touches welcome!

Attachment: =?UTF-8?Q?0001-gnu-Add-i3lock-color.patch?=

Attachment: =?UTF-8?Q?0002-gnu-Add-i3lock-fancy.patch?=

Chris Marusich wrote on 17 Nov 2017 01:55

Recipients:(address . ng0@pragmatique.xyz)(address . 27083@debbugs.gnu.org)

Message-ID:871skx9ql3.fsf@gmail.com

<ng0@pragmatique.xyz> writes:

Toggle quote (4 lines)

> I have no idea about the error of i3lock-fancy (password is not

> accepted). An commented phase in i3lock-color is still included where

> I tried to fix this, but I don't know much about PAM at this point.

When I checked using "guix system vm", the reason i3lock refused to

accept the password was because it could not read /etc/shadow. One

solution to this problem is to do both of the following:

1) Do not wrap i3lock in a wrapper script.

2) Install the i3lock executable as setuid-root.

When installing i3lock as a setuid-root program, it is important not to

wrap it in a script. It is common in UNIX-like systems to ignore the

setuid bit when the program is an interpreted script instead of an

executable (a simple Internet search for a phrase like "setuid bash

script" will provide lots of supporting information about this). If you

do (2) without also removing the wrapping logic that you put into the

package definition, you will find that i3lock still rejects your

password - this is because it still can't read /etc/shadow.

The attached patch is a revised version of your first patch to add

i3lock-color. I have basically just removed the wrapping phase. To

install it setuid-root along with an appropriate PAM configuration file,

just add a screen-locker service like the following to your services in

your operating system declaration:

(screen-locker-service i3lock-color "i3lock")

Note that this will create an appropriate PAM configuration file at

/etc/pam.d/i3lock, so you don't need to bother messing around with the

PAM configuration file that comes with i3lock-color.

I haven't looked at the fancy version yet. I'll check it out when I get

a little more time.

Toggle quote (3 lines)

> + %D%/packages/patches/hypre-doc-tables.patch \

> + %D%/packages/patches/hypre-ldflags.patch \

Did you intend to include these in the patch? They aren't used, so I've

removed them in my version of the patch.

Toggle quote (32 lines)> +---
> + Makefile | 7 +------
> + 1 file changed, 1 insertion(+), 6 deletions(-)
> +
> +diff --git a/Makefile b/Makefile
> +index c0fe888..b4b6cd9 100644
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -6,11 +6,6 @@ SYSCONFDIR=/etc
> + PKG_CONFIG=pkg-config
> + MANDIR=/usr/share/man
> + 
> +-# Check if pkg-config is installed, we need it for building CFLAGS/LIBS
> +-ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null 1>/dev/null || echo 1),1)
> +-$(error "$(PKG_CONFIG) was not found")
> +-endif
> +-
> + CFLAGS += -std=c99
> + CFLAGS += -pipe
> + CFLAGS += -Wall
> +@@ -18,7 +13,7 @@ CFLAGS += -O2
> + SIMD_CFLAGS += -funroll-loops
> + SIMD_CFLAGS += -msse2
> + CPPFLAGS += -D_GNU_SOURCE
> +-CPPFLAGS += -DXKBCOMPOSE=$(shell if test -e /usr/include/xkbcommon/xkbcommon-compose.h ; then echo 1 ; else echo 0 ; fi )
> ++CPPFLAGS += -DXKBCOMPOSE=1
> + CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
> + LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
> + LIBS += -lpam
> +-- 
> +2.13.0

FYI, it looks like maybe we could probably remove this patch file
entirely, and just use substitute* to modify the Makefile, if we
provided the "which" program as an input.  Specifically, if the which
program were present, then probably the check you removed would
succeed.  I haven't tried it myself, though.

Toggle quote (3 lines)

FYI, the contact.ng0@cryptolab.net email address is still mentioned in

multiple other files, too.

Toggle quote (10 lines)> +    (description
> +     "I3lock-color is a screen locker.  It is a re-patched version of
> +i3lock, which is a simple screen locker like slock.  Features include:
> +
> +@enumerate
> +@item forking process, the locked screen is preserved when you suspend from RAM
> +@item specify background color or PNG image to be displayed in the lock screen
> +@item many additional color options
> +@end enumerate\n")

I'm not sure if the trailing newline is necessary. Unless you beat me

to it, I'll check on this detail the next time I return to this thread.

Chris

Attachment: 0001-gnu-Add-i3lock-color.patch

ng0 wrote on 17 Nov 2017 02:18

Re: [bug#27083] screen-lockers: i3lock-color and i3lock-fancy

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171117101835.whd5f7lincppxlgy@abyayala

Attachment: file

ng0 wrote on 17 Nov 2017 12:17

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171117201705.75ldk4yxnpd7m3qa@abyayala

Attachment: file

From ba2a83195afb10ca7c65833f81cdc10748212873 Mon Sep 17 00:00:00 2001
From: ng0 <contact.ng0@cryptolab.net>
Date: Tue, 24 Jan 2017 13:03:42 +0000
Subject: [PATCH 1/2] gnu: Add i3lock-color.

* gnu/packages/wm.scm (i3lock-color): New variable.
---
 gnu/local.mk        |  1 +
 gnu/packages/wm.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

Toggle diff (100 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index 54d1ac91c..2ec5844dc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -744,6 +744,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/hubbub-sort-entities.patch		\
   %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
   %D%/packages/patches/hydra-disable-darcs-test.patch		\
+  %D%/packages/patches/i3lock-color-fix-makefile.patch          \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch	\
   %D%/packages/patches/icecat-bug-1348660-pt5.patch		\
   %D%/packages/patches/icecat-bug-1415133.patch			\
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 62a5b5460..e4db72a6f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -68,6 +68,7 @@
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages suckless)
   #:use-module (guix download)
   #:use-module (guix git-download))
@@ -335,6 +336,73 @@ and locate windows on all your workspaces, using an interactive dmenu
 prompt.")
       (license (license:non-copyleft "http://www.wtfpl.net/txt/copying/")))))
 
+(define-public i3lock-color
+  (package
+    (name "i3lock-color")
+    (version "2.9.1-c")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/chrjguill/i3lock-color/"
+                           "archive/" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "18ql0kb24qlqsijs6j99algf2lprl78mzsz53b1hshmc8jjd4m27"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; No tests included.
+       #:make-flags (list "CC=gcc")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (etc (string-append out "/etc"))
+                    (man (string-append out "/share/man"))
+                    (xkb (assoc-ref inputs "libxkbcommon"))
+                    (xkbheader (string-append xkb
+                                              "/include/xkbcommon/"
+                                              "xkbcommon-compose.h")))
+               (substitute* "Makefile"
+                 (("PKG_CONFIG=pkg-config")
+                  (string-append "PKG_CONFIG="
+                                 (which "pkg-config")))
+                 (("/usr/include/xkbcommon/xkbcommon-compose.h")
+                  xkbheader)
+                 (("PREFIX=/usr")
+                  (string-append "PREFIX=" out))
+                 (("SYSCONFDIR=/etc")
+                  (string-append "SYSCONFDIR=" etc))
+                 (("MANDIR=/usr/share/man")
+                  (string-append "MANDIR=" man)))
+               #t))))))
+    (inputs
+     `(("xcb-util-image" ,xcb-util-image)
+       ("xcb-util-keysyms" ,xcb-util-keysyms)
+       ("xcb-util" ,xcb-util)
+       ("libxcb" ,libxcb)
+       ("linux-pam" ,linux-pam)
+       ("libev" ,libev)
+       ("libx11" ,libx11)
+       ("cairo" ,cairo)))
+    (native-inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("pkg-config" ,pkg-config)
+       ("which" ,which)))
+    (home-page "https://github.com/chrjguill/i3lock-color")
+    (synopsis "Screenlocker with color configuration support")
+    (description
+     "I3lock-color is a screen locker.  It is a re-patched version of
+i3lock, which is a simple screen locker like slock.  Features include:
+
+@enumerate
+@item forking process, the locked screen is preserved when you suspend from RAM
+@item specify background color or PNG image to be displayed in the lock screen
+@item many additional color options
+@end enumerate\n")
+    (license license:bsd-3)))
+
 (define-public xmonad
   (package
     (name "xmonad")
-- 
2.15.0

From 49f8940d64ecab73d246d7652ba7358b748d0c2d Mon Sep 17 00:00:00 2001

* gnu/packages/wm.scm (i3lock-fancy): New variable.

---

gnu/packages/wm.scm | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 71 insertions(+)

Toggle diff (91 lines)diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index e4db72a6f..cf861e77e 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -44,6 +44,7 @@
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-web)
+  #:use-module (gnu packages gawk)
   #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
@@ -403,6 +404,76 @@ i3lock, which is a simple screen locker like slock.  Features include:
 @end enumerate\n")
     (license license:bsd-3)))
 
+(define-public i3lock-fancy
+  (package
+    (name "i3lock-fancy")
+    (version "0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/meskarune/i3lock-fancy/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "020m7mnfq5cvir7p9v3hkb7cvb4cai33wppxl2zdwscwwjnchc5y"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ;No tests included
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (icons (string-append out "/share/i3lock-fancy/icons/"))
+                    (i3lock (string-append (assoc-ref inputs "i3lock-color")
+                                           "/bin/i3lock"))
+                    (wmctrl (string-append (assoc-ref inputs "wmctrl")
+                                           "/bin/wmctrl"))
+                    (mconvert (string-append (assoc-ref inputs "imagemagick")
+                                             "/bin/convert"))
+                    (mimport (string-append (assoc-ref inputs "imagemagick")
+                                            "/bin/import"))
+                    (awk (string-append (assoc-ref inputs "gawk")
+                                        "/bin/gawk")))
+
+               (substitute* "lock"
+                 (("if ! i3lock") (string-append "if ! " i3lock))
+                 (("i3lock -n") (string-append i3lock " -n"))
+                 (("$(which wmctrl)") wmctrl)
+                 (("convert") mconvert)
+                 (("shot=\\(import") (string-append "shot=\(" mimport))
+                 (("awk -F") (string-append awk " -F"))
+                 ((" awk") awk)
+                 (("\\$scriptpath/icons/") icons))
+               #t)))
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (icons (string-append out "/share/i3lock-fancy/icons/")))
+
+               (install-file "lock" bin)
+               (rename-file (string-append bin "/lock")
+                            (string-append bin "/i3lock-fancy"))
+               (copy-recursively "icons" icons)
+               #t))))))
+    (native-inputs
+     `(("imagemagick" ,imagemagick)
+       ("i3lock-color" ,i3lock-color)
+       ("wmctrl" ,wmctrl)
+       ("gawk" ,gawk)))
+    (home-page "https://github.com/meskarune/i3lock-fancy")
+    (synopsis "Screenlocker with screenshot function")
+    (description
+     "@code{i3lock-fancy} is a Bash script that takes a screenshot of
+the desktop, blurs the background and adds a lock icon and text.
+It makes use of @code{i3lock-color} and can optionally be passed any
+screenshot util like @code{scrot}.  This screenlocker can be used with
+any window manager or desktop environment.")
+    (license license:expat)))
+
 (define-public xmonad
   (package
     (name "xmonad")
-- 
2.15.0

ng0 wrote on 17 Nov 2017 12:57

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171117205734.63tbjhxqbcw6sis7@abyayala

Attachment: file

ng0 wrote on 17 Nov 2017 13:02

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171117210211.vdauzbvhrjubwamt@abyayala

Attachment: file

ng0 wrote on 17 Nov 2017 13:19

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171117211901.eor5yjlvj3icgbsd@abyayala

Attachment: file

From ba2a83195afb10ca7c65833f81cdc10748212873 Mon Sep 17 00:00:00 2001
From: ng0 <contact.ng0@cryptolab.net>
Date: Tue, 24 Jan 2017 13:03:42 +0000
Subject: [PATCH 1/2] gnu: Add i3lock-color.

* gnu/packages/wm.scm (i3lock-color): New variable.
---
 gnu/local.mk        |  1 +
 gnu/packages/wm.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

Toggle diff (100 lines)diff --git a/gnu/local.mk b/gnu/local.mk
index 54d1ac91c..2ec5844dc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -744,6 +744,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/hubbub-sort-entities.patch		\
   %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
   %D%/packages/patches/hydra-disable-darcs-test.patch		\
+  %D%/packages/patches/i3lock-color-fix-makefile.patch          \
   %D%/packages/patches/icecat-avoid-bundled-libraries.patch	\
   %D%/packages/patches/icecat-bug-1348660-pt5.patch		\
   %D%/packages/patches/icecat-bug-1415133.patch			\
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 62a5b5460..e4db72a6f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -68,6 +68,7 @@
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages suckless)
   #:use-module (guix download)
   #:use-module (guix git-download))
@@ -335,6 +336,73 @@ and locate windows on all your workspaces, using an interactive dmenu
 prompt.")
       (license (license:non-copyleft "http://www.wtfpl.net/txt/copying/")))))
 
+(define-public i3lock-color
+  (package
+    (name "i3lock-color")
+    (version "2.9.1-c")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/chrjguill/i3lock-color/"
+                           "archive/" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "18ql0kb24qlqsijs6j99algf2lprl78mzsz53b1hshmc8jjd4m27"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; No tests included.
+       #:make-flags (list "CC=gcc")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key outputs inputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (etc (string-append out "/etc"))
+                    (man (string-append out "/share/man"))
+                    (xkb (assoc-ref inputs "libxkbcommon"))
+                    (xkbheader (string-append xkb
+                                              "/include/xkbcommon/"
+                                              "xkbcommon-compose.h")))
+               (substitute* "Makefile"
+                 (("PKG_CONFIG=pkg-config")
+                  (string-append "PKG_CONFIG="
+                                 (which "pkg-config")))
+                 (("/usr/include/xkbcommon/xkbcommon-compose.h")
+                  xkbheader)
+                 (("PREFIX=/usr")
+                  (string-append "PREFIX=" out))
+                 (("SYSCONFDIR=/etc")
+                  (string-append "SYSCONFDIR=" etc))
+                 (("MANDIR=/usr/share/man")
+                  (string-append "MANDIR=" man)))
+               #t))))))
+    (inputs
+     `(("xcb-util-image" ,xcb-util-image)
+       ("xcb-util-keysyms" ,xcb-util-keysyms)
+       ("xcb-util" ,xcb-util)
+       ("libxcb" ,libxcb)
+       ("linux-pam" ,linux-pam)
+       ("libev" ,libev)
+       ("libx11" ,libx11)
+       ("cairo" ,cairo)))
+    (native-inputs
+     `(("libxkbcommon" ,libxkbcommon)
+       ("pkg-config" ,pkg-config)
+       ("which" ,which)))
+    (home-page "https://github.com/chrjguill/i3lock-color")
+    (synopsis "Screenlocker with color configuration support")
+    (description
+     "I3lock-color is a screen locker.  It is a re-patched version of
+i3lock, which is a simple screen locker like slock.  Features include:
+
+@enumerate
+@item forking process, the locked screen is preserved when you suspend from RAM
+@item specify background color or PNG image to be displayed in the lock screen
+@item many additional color options
+@end enumerate\n")
+    (license license:bsd-3)))
+
 (define-public xmonad
   (package
     (name "xmonad")
-- 
2.15.0

From 63e4eff6e954361a7b30fb4c060bdecbfee56da3 Mon Sep 17 00:00:00 2001

* gnu/packages/wm.scm (i3lock-fancy): New variable.

---

gnu/packages/wm.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 67 insertions(+)

Toggle diff (87 lines)diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index e4db72a6f..01faf8149 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -44,6 +44,7 @@
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-web)
+  #:use-module (gnu packages gawk)
   #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
@@ -403,6 +404,72 @@ i3lock, which is a simple screen locker like slock.  Features include:
 @end enumerate\n")
     (license license:bsd-3)))
 
+(define-public i3lock-fancy
+  (package
+    (name "i3lock-fancy")
+    (version "0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/meskarune/i3lock-fancy/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "020m7mnfq5cvir7p9v3hkb7cvb4cai33wppxl2zdwscwwjnchc5y"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ;No tests included
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (icons (string-append out "/share/i3lock-fancy/icons/"))
+                    (wmctrl (string-append (assoc-ref inputs "wmctrl")
+                                           "/bin/wmctrl"))
+                    (mconvert (string-append (assoc-ref inputs "imagemagick")
+                                             "/bin/convert"))
+                    (mimport (string-append (assoc-ref inputs "imagemagick")
+                                            "/bin/import"))
+                    (awk (string-append (assoc-ref inputs "gawk")
+                                        "/bin/gawk")))
+
+               (substitute* "lock"
+                 (("$(which wmctrl)") wmctrl)
+                 (("convert") mconvert)
+                 (("shot=\\(import") (string-append "shot=\(" mimport))
+                 (("awk -F") (string-append awk " -F"))
+                 ((" awk") awk)
+                 (("\\$scriptpath/icons/") icons))
+               #t)))
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (icons (string-append out "/share/i3lock-fancy/icons/")))
+
+               (install-file "lock" bin)
+               (rename-file (string-append bin "/lock")
+                            (string-append bin "/i3lock-fancy"))
+               (copy-recursively "icons" icons)
+               #t))))))
+    (native-inputs
+     `(("imagemagick" ,imagemagick)
+       ("i3lock-color" ,i3lock-color)
+       ("wmctrl" ,wmctrl)
+       ("gawk" ,gawk)))
+    (home-page "https://github.com/meskarune/i3lock-fancy")
+    (synopsis "Screenlocker with screenshot function")
+    (description
+     "@code{i3lock-fancy} is a Bash script that takes a screenshot of
+the desktop, blurs the background and adds a lock icon and text.
+It makes use of @code{i3lock-color} and can optionally be passed any
+screenshot util like @code{scrot}.  This screenlocker can be used with
+any window manager or desktop environment.")
+    (license license:expat)))
+
 (define-public xmonad
   (package
     (name "xmonad")
-- 
2.15.0

ng0 wrote on 19 Nov 2017 03:04

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171119110400.thfoe7usnzomwgrf@abyayala

Attachment: file

Chris Marusich wrote on 30 Nov 2017 23:20

Recipients:(name . ng0)(address . ng0@infotropique.org)(address . 27083@debbugs.gnu.org)

Message-ID:87374uc3tk.fsf@gmail.com

Hi ng0,

I'm glad to hear i3lock works for you, too!

I was able to find time to draft feedback for your latest i3lock-color

patch, but not for i3lock-fancy (although it looks very simple, and I

will check it in the next few days). In the interest of not moving too

slowly, I'm sending what I have to you now.

ng0 <ng0@infotropique.org> writes:

Toggle quote (11 lines)> I've changed my mind. As there's also 'i3lock' (without the -color suffix)
> but we don't package it (yet), it would take away the freedom to
> decide which i3lock you want to use.
> The author of i3lock-fancy wantsus to use i3lock-color, but there's
> also a check and it falls back to the normal i3lock.
>
> Therefore I think it must be up to people using i3lock-fancy to
> install i3lock-color AND i3lock-fancy in their system profile
> (or just i3lock-color in systemprofile + suid it, and i3lock-fancy
> in the user profile).

I agree with your assessment.  For now, I think that's a fine plan,
although I dislike the fact that by adding the i3lock-fancy package by
itself, we will make it possible for someone to naively install just
that package to their profile, only to find that it doesn't work because
i3lock itself is not installed in the system as a screen locker program.
However, I can't think of a better solution at this time, and we're
already doing something similar for the other screen locker packages.
For example, if you install xscreensaver into your profile without also
installing it into the system as a screen locker service, xscreensaver
won't work because it won't be setuid-root.  So I think it's OK.

Toggle quote (10 lines)>> > > > > > -;;; Copyright (c) 2016, 2017 ng0 <contact.ng0@cryptolab.net>
>> > > > > > +;;; Copyright (c) 2016, 2017 ng0 <ng0@no-reply.pragmatique.xyz>
>> > > > > 
>> > > > > FYI, the contact.ng0@cryptolab.net email address is still mentioned in
>> > > > > multiple other files, too.
>> > > > 
>> > > > Yes. I'm only changing addresses once I touch the file. So old
>> > > > addresses might be in there for a long time. Otoh, I will
>> > > > prepare a patch and change all my header addresses.

Understood.

Toggle quote (15 lines)>> > > > > > +    (description
>> > > > > > +     "I3lock-color is a screen locker.  It is a re-patched version of
>> > > > > > +i3lock, which is a simple screen locker like slock.  Features include:
>> > > > > > +
>> > > > > > +@enumerate
>> > > > > > +@item forking process, the locked screen is preserved when you suspend from RAM
>> > > > > > +@item specify background color or PNG image to be displayed in the lock screen
>> > > > > > +@item many additional color options
>> > > > > > +@end enumerate\n")
>> > > > > 
>> > > > > I'm not sure if the trailing newline is necessary.  Unless you beat me
>> > > > > to it, I'll check on this detail the next time I return to this thread.
>> > > > 
>> > > > I've seen this multiple times before and have just followed this style.

I looked into this, and it seems that newlines are elided from the

output. Check "guix package --show=maxflow" and "guix edit maxflow" to

see a particularly striking example.

Toggle quote (13 lines)> diff --git a/gnu/local.mk b/gnu/local.mk
> index 54d1ac91c..2ec5844dc 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -744,6 +744,7 @@ dist_patch_DATA =						\
>    %D%/packages/patches/hubbub-sort-entities.patch		\
>    %D%/packages/patches/hurd-fix-eth-multiplexer-dependency.patch        \
>    %D%/packages/patches/hydra-disable-darcs-test.patch		\
> +  %D%/packages/patches/i3lock-color-fix-makefile.patch          \
>    %D%/packages/patches/icecat-avoid-bundled-libraries.patch	\
>    %D%/packages/patches/icecat-bug-1348660-pt5.patch		\
>    %D%/packages/patches/icecat-bug-1415133.patch			\

Now that the Makefile is patched using substitute*, we can remove this

added line from gnu/local.mk.

Toggle quote (21 lines)> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 62a5b5460..e4db72a6f 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -68,6 +68,7 @@
>    #:use-module (gnu packages gperf)
>    #:use-module (gnu packages imagemagick)
>    #:use-module (gnu packages lua)
> +  #:use-module (gnu packages linux)
>    #:use-module (gnu packages suckless)
>    #:use-module (guix download)
>    #:use-module (guix git-download))
> @@ -335,6 +336,73 @@ and locate windows on all your workspaces, using an interactive dmenu
>  prompt.")
>        (license (license:non-copyleft "http://www.wtfpl.net/txt/copying/")))))
>  
> +(define-public i3lock-color
> +  (package
> +    (name "i3lock-color")
> +    (version "2.9.1-c")

According to "guix lint", version 2.10.1-c is now available. Should we

use it?

Toggle quote (14 lines)> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (string-append "https://github.com/chrjguill/i3lock-color/"
> +                           "archive/" version ".tar.gz"))
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "18ql0kb24qlqsijs6j99algf2lprl78mzsz53b1hshmc8jjd4m27"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:tests? #f ; No tests included.
> +       #:make-flags (list "CC=gcc")

Why is this #:make-flags argument necessary? I'm not suggesting it

isn't; I just don't know whether it is or not, and I'm curious.

Toggle quote (25 lines)> +       #:phases
> +       (modify-phases %standard-phases
> +         (replace 'configure
> +           (lambda* (#:key outputs inputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (etc (string-append out "/etc"))
> +                    (man (string-append out "/share/man"))
> +                    (xkb (assoc-ref inputs "libxkbcommon"))
> +                    (xkbheader (string-append xkb
> +                                              "/include/xkbcommon/"
> +                                              "xkbcommon-compose.h")))
> +               (substitute* "Makefile"
> +                 (("PKG_CONFIG=pkg-config")
> +                  (string-append "PKG_CONFIG="
> +                                 (which "pkg-config")))
> +                 (("/usr/include/xkbcommon/xkbcommon-compose.h")
> +                  xkbheader)
> +                 (("PREFIX=/usr")
> +                  (string-append "PREFIX=" out))
> +                 (("SYSCONFDIR=/etc")
> +                  (string-append "SYSCONFDIR=" etc))
> +                 (("MANDIR=/usr/share/man")
> +                  (string-append "MANDIR=" man)))
> +               #t))))))

I like that we were able to remove the patch file by using substitute*!

Hopefully once you upstream your changes, we can simplify this further.

Toggle quote (14 lines)> +    (inputs
> +     `(("xcb-util-image" ,xcb-util-image)
> +       ("xcb-util-keysyms" ,xcb-util-keysyms)
> +       ("xcb-util" ,xcb-util)
> +       ("libxcb" ,libxcb)
> +       ("linux-pam" ,linux-pam)
> +       ("libev" ,libev)
> +       ("libx11" ,libx11)
> +       ("cairo" ,cairo)))
> +    (native-inputs
> +     `(("libxkbcommon" ,libxkbcommon)
> +       ("pkg-config" ,pkg-config)
> +       ("which" ,which)))

i3lock-color retains the following references when built:

Toggle snippet (12 lines)$ guix gc --references /gnu/store/kfymvwgm4g0avs3b97micq8477sa0if6-i3lock-color-2.9.1-c | sort -t - -k 2 -k 1,1
/gnu/store/nwxv9s2q8pi0m6gn6fyidpj8442dwp6f-cairo-1.14.10
/gnu/store/6wyjls0q2c9gjskkplsr1ad09p3d8gzg-gcc-5.4.0-lib
/gnu/store/3h31zsqxjjg52da5gp3qmhkh4x8klhah-glibc-2.25
/gnu/store/8zyry9663xgcrgg7fkrdrw40511d1gyz-libev-4.24
/gnu/store/3cxhfkh0n1naan9db0z302mwqpxqkry6-libxcb-1.12
/gnu/store/vyip2r21g65q90jy79nm5gsz6yl1s7gp-libxkbcommon-0.7.1
/gnu/store/jf7sby087sakbsirdxrfi5cizf3ya4md-linux-pam-1.3.0
/gnu/store/f4y2v0ynyr1rhzjxv1m6xlglgg0grxll-xcb-util-0.4.0
/gnu/store/x67589ylz75jadmhab8z6z03f1i5l5rv-xcb-util-image-0.4.0

Specifically, libxkbcommon is referenced. Therefore, it might be a

runtime dependency of the program. Are you sure it should be a

native-input? If it really is required at runtime, it should be an

input, not a native-input.

In addition, xcb-util-keysyms and libx11 are both unreferenced. Does

i3lock-color build correctly without them? If so, can we just remove

them? If not, should they be native-inputs?

Toggle quote (2 lines)

> + (synopsis "Screenlocker with color configuration support")

Could you change this phrase to "screen locker" instead of
"screenlocker"?  That is what you use in the description, and it's also
what we use in the synopses/descriptions of the other screen lockers
we've already packaged (and the manual).  The consistency might make
this package more discoverable.

Toggle quote (5 lines)

> i3lock-color should be removed before commiting this patch,

> and we should add a note about this to the description. Like:

> "You will need to install i3lock or one of its variants (like

> i3lock-color) to make use of i3lock-fancy."

I don't understand: why do we need to remove i3lock-color?

Chris

ng0 wrote on 1 Dec 2017 01:27

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171201092731.aea3sdto6dgsqisk@abyayala

Attachment: file

Chris Marusich wrote on 2 Dec 2017 01:59

Recipients:(name . ng0)(address . ng0@n0.is)

Message-ID:878teltpq6.fsf@gmail.com

ng0 <ng0@n0.is> writes:

Toggle quote (5 lines)

> Hi Chris,

> thanks for your review. I'll have no time to address it before next week,

> just a couple of comments.

No worries! Whenever you can update it, that's great! We're almost

there; I think the next update will probably be the final one.

Toggle quote (33 lines)> Chris Marusich transcribed 9.7K bytes:
>>
>> ...
>> 
>> ng0 <ng0@infotropique.org> writes:
>> 
>> > I've changed my mind. As there's also 'i3lock' (without the -color suffix)
>> > but we don't package it (yet), it would take away the freedom to
>> > decide which i3lock you want to use.
>> > The author of i3lock-fancy wantsus to use i3lock-color, but there's
>> > also a check and it falls back to the normal i3lock.
>> >
>> > Therefore I think it must be up to people using i3lock-fancy to
>> > install i3lock-color AND i3lock-fancy in their system profile
>> > (or just i3lock-color in systemprofile + suid it, and i3lock-fancy
>> > in the user profile).
>> 
>> I agree with your assessment.  For now, I think that's a fine plan,
>> although I dislike the fact that by adding the i3lock-fancy package by
>> itself, we will make it possible for someone to naively install just
>> that package to their profile, only to find that it doesn't work because
>> i3lock itself is not installed in the system as a screen locker program.
>> However, I can't think of a better solution at this time, and we're
>> already doing something similar for the other screen locker packages.
>> For example, if you install xscreensaver into your profile without also
>> installing it into the system as a screen locker service, xscreensaver
>> won't work because it won't be setuid-root.  So I think it's OK.
>
> We'll continue to have these problems with applications, maybe we should
> consider it a bug and find a common description. So far it's limited to
> screensavers, but I can't think of a reason why this problem would stay
> limited to applications of the screensaver class.

I've created an email thread to discuss this in more detail on

guix-devel. The subject is: "Installing some packages results in

"incomplete deployment"". Please look for it and reply there if you

have any other thoughts on that matter.

For this patch, though, I think it's fine to ask users to install

i3lock-fancy and also add to their operating system declaration a screen

locker service that uses i3lock. That's how the existing screen lockers

have been packaged.

Toggle quote (6 lines)

> For this specific application (i3lock-fancy), I could ask meskarune if she'd like to add

> an error message if none is place already. At the top of the script

> check for the existence of the i3lock binary in the users path (simply

> 'i3lock', not (only) total paths). If not found, throw an error and abort

> with a message that "you need to install i3lock-color".

I think that would be nice. I also think we can add i3lock-fancy to

Guix even before she makes those changes.

Toggle quote (15 lines)>> > i3lock-color should be removed before commiting this patch,
>> > and we should add a note about this to the description. Like:
>> > "You will need to install i3lock or one of its variants (like
>> > i3lock-color) to make use of i3lock-fancy."
>> 
>> I don't understand: why do we need to remove i3lock-color?
>
> i3lock-fancy is Bash script. I'm patching in the references it
> should keep. The 2 calls of i3lock in there must be just 'i3lock',
> this will call the binary with the suid, not for example the one
> in the store path of i3lock-color (which never worked).
> More correct would be this remark:
> i3lock-color should be removed from the inputs before commiting
> this patch, and we should add a note about this to the description.

I understand now, and I agree.

Chris

ng0 wrote on 9 Dec 2017 05:25

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171209132538.uvtlqmv3wnm4uvyp@abyayala

Chris Marusich transcribed 4.6K bytes:

Toggle quote (11 lines)> ng0 <ng0@n0.is> writes:
> 
> > Hi Chris,
> >
> > thanks for your review. I'll have no time to address it before next week,
> > just a couple of comments.
> 
> No worries!  Whenever you can update it, that's great!  We're almost
> there; I think the next update will probably be the final one.
> 

New version, I think I've addressed everything you mentioned.
Furthermore I was able to improve the files due to some
changes upstream made.
I've fixed the description of i3lock-fancy and I've opened
a discussion/bugticket on the name of the executable of i3lock-fancy
(in https://github.com/meskarune/i3lock-fancy/issues/103).

Beyond this patch:
I wonder if it is a bug or lack of functionality in i3lock
or i3lock-color that I can switch to the tty when it's locked.
There are other screenlockers that do not allow me to do this,
the screen is really locked, not just tty7 or whereever your X might
be running.

I have not tested this version of the patches beyond building them.
I will do so after sending this and report later today if
I can still lock my screen. it should just work.
-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
  WWW: https://n0.is

From f11bc2af6aa43cdd52c76c8640fc2d8eff71fa8d Mon Sep 17 00:00:00 2001

* gnu/packages/wm.scm (i3lock-color): New variable.

---

gnu/packages/wm.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-

1 file changed, 49 insertions(+), 1 deletion(-)

Toggle diff (84 lines)diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 6912d6f2d..8fcce1eab 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -9,7 +9,7 @@
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
+;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
 ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
 ;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
 ;;; Copyright © 2017 Mekeor Melire <mekeor.melire@gmail.com>
@@ -44,6 +44,7 @@
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-web)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
@@ -68,6 +69,7 @@
   #:use-module (gnu packages gperf)
   #:use-module (gnu packages imagemagick)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages suckless)
   #:use-module (guix download)
   #:use-module (guix git-download))
@@ -335,6 +337,52 @@ and locate windows on all your workspaces, using an interactive dmenu
 prompt.")
       (license (license:non-copyleft "http://www.wtfpl.net/txt/copying/")))))
 
+(define-public i3lock-color
+  (package
+    (name "i3lock-color")
+    (version "2.10.1c")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/PandorasFox/i3lock-color/"
+                           "archive/" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "119xvdm4r6irqk0mar80hx6s8ydw26y35h7712rd7nbg7pb7i053"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ;No tests included.
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'bootstrap
+           (lambda _
+             (zero? (system* "autoreconf" "-vfi")))))))
+    (inputs
+     `(("xcb-util-image" ,xcb-util-image)
+       ("xcb-util" ,xcb-util)
+       ("libxcb" ,libxcb)
+       ("linux-pam" ,linux-pam)
+       ("libxkbcommon" ,libxkbcommon)
+       ("libev" ,libev)
+       ("cairo" ,cairo)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf)
+        ("automake" ,automake)))
+    (home-page "https://github.com/PandorasFox/i3lock-color")
+    (synopsis "Screen locker with color configuration support")
+    (description
+     "Re-patched version of i3lock, which is a simple screen
+locker like slock.  Features include:
+
+@enumerate
+@item forking process, the locked screen is preserved when you suspend from RAM
+@item specify background color or image to be displayed in the lock screen
+@item many additional color options
+@end enumerate")
+    (license license:bsd-3)))
+
 (define-public xmonad
   (package
     (name "xmonad")
-- 
2.15.1

From 9ea21f2e1c20aceff4ff12bf00cd5b31e0bf02fc Mon Sep 17 00:00:00 2001

* gnu/packages/wm.scm (i3lock-fancy): New variable.

---

gnu/packages/wm.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++

1 file changed, 67 insertions(+)

Toggle diff (87 lines)diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8fcce1eab..d9732e8d0 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -45,6 +45,7 @@
   #:use-module (gnu packages haskell-check)
   #:use-module (gnu packages haskell-web)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages gawk)
   #:use-module (gnu packages base)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages perl)
@@ -383,6 +384,72 @@ locker like slock.  Features include:
 @end enumerate")
     (license license:bsd-3)))
 
+(define-public i3lock-fancy
+  (package
+    (name "i3lock-fancy")
+    (version "0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/meskarune/i3lock-fancy/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "020m7mnfq5cvir7p9v3hkb7cvb4cai33wppxl2zdwscwwjnchc5y"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ;No tests included
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (icons (string-append out "/share/i3lock-fancy/icons/"))
+                    (wmctrl (string-append (assoc-ref inputs "wmctrl")
+                                           "/bin/wmctrl"))
+                    (mconvert (string-append (assoc-ref inputs "imagemagick")
+                                             "/bin/convert"))
+                    (mimport (string-append (assoc-ref inputs "imagemagick")
+                                            "/bin/import"))
+                    (awk (string-append (assoc-ref inputs "gawk")
+                                        "/bin/gawk")))
+
+               (substitute* "lock"
+                 (("$(which wmctrl)") wmctrl)
+                 (("convert") mconvert)
+                 (("shot=\\(import") (string-append "shot=\(" mimport))
+                 (("awk -F") (string-append awk " -F"))
+                 ((" awk") awk)
+                 (("\\$scriptpath/icons/") icons))
+               #t)))
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (bin (string-append out "/bin"))
+                    (icons (string-append out "/share/i3lock-fancy/icons/")))
+
+               (install-file "lock" bin)
+               (rename-file (string-append bin "/lock")
+                            (string-append bin "/i3lock-fancy"))
+               (copy-recursively "icons" icons)
+               #t))))))
+    (native-inputs
+     `(("imagemagick" ,imagemagick)
+       ("wmctrl" ,wmctrl)
+       ("gawk" ,gawk)))
+    (home-page "https://github.com/meskarune/i3lock-fancy")
+    (synopsis "Screen locker with screenshot function")
+    (description
+     "@code{i3lock-fancy} is a Bash script that takes a screenshot of
+the desktop, blurs the background and adds a lock icon and text.
+It requires @code{i3lock-color} or @code{i3lock} and can optionally
+be passed any screenshot util like @code{scrot}.
+This screen locker can be used with any window manager or
+desktop environment.")
+    (license license:expat)))
+
 (define-public xmonad
   (package
     (name "xmonad")
-- 
2.15.1

ng0 wrote on 9 Dec 2017 06:25

Recipients:(name . Chris Marusich)(address . cmmarusich@gmail.com)

Message-ID:20171209142523.7mzdwhyof7h24edf@abyayala

Attachment: file

Ludovic Courtès wrote on 11 Dec 2017 05:47

Recipients:(name . ng0)(address . ng0@n0.is)

Message-ID:87374h1im9.fsf@gnu.org

Hi,

ng0 <ng0@n0.is> skribis:

Toggle quote (6 lines)

> I wonder if it is a bug or lack of functionality in i3lock

> or i3lock-color that I can switch to the tty when it's locked.

> There are other screenlockers that do not allow me to do this,

> the screen is really locked, not just tty7 or whereever your X might

> be running.

Really? I’m not sure the screen locker, which is a “regular” X11

client, can prevent you from switching to a tty.

Toggle quote (7 lines)

> From f11bc2af6aa43cdd52c76c8640fc2d8eff71fa8d Mon Sep 17 00:00:00 2001

> From: ng0 <contact.ng0@cryptolab.net>

> Date: Tue, 24 Jan 2017 13:03:42 +0000

> Subject: [PATCH 1/2] gnu: Add i3lock-color.

> * gnu/packages/wm.scm (i3lock-color): New variable.

Applied with these changes:

Toggle diff (31 lines)diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 8fcce1eab..e3bf01902 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
-;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
 ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
 ;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
@@ -373,13 +373,13 @@ prompt.")
     (home-page "https://github.com/PandorasFox/i3lock-color")
     (synopsis "Screen locker with color configuration support")
     (description
-     "Re-patched version of i3lock, which is a simple screen
-locker like slock.  Features include:
+     "i3lock-color is a simpler X11 screen locker derived from i3lock.
+Features include:
 
 @enumerate
-@item forking process, the locked screen is preserved when you suspend from RAM
-@item specify background color or image to be displayed in the lock screen
-@item many additional color options
+@item forking process, the locked screen is preserved when you suspend to RAM;
+@item specify background color or image to be displayed in the lock screen;
+@item many additional color options.
 @end enumerate")
     (license license:bsd-3)))

Toggle quote (7 lines)

> From 9ea21f2e1c20aceff4ff12bf00cd5b31e0bf02fc Mon Sep 17 00:00:00 2001

> From: ng0 <contact.ng0@cryptolab.net>

> Date: Tue, 24 Jan 2017 15:57:13 +0000

> Subject: [PATCH 2/2] gnu: Add i3lock-fancy.

> * gnu/packages/wm.scm (i3lock-fancy): New variable.

Applied, thanks!

Ludo’.

Ludovic Courtès wrote on 11 Dec 2017 05:47

control message for bug #27083

Recipients:(address . control@debbugs.gnu.org)

Message-ID:871sk11ilu.fsf@gnu.org

tags 27083 fixed

close 27083

ng0 wrote on 11 Dec 2017 06:03

Re: [bug#27083] screen-lockers: i3lock-color and i3lock-fancy

Recipients:(name . Ludovic Courtès)(address . ludo@gnu.org)

Message-ID:20171211140325.jvs456ybsvstm75c@abyayala

Ludovic Courtès transcribed 2.8K bytes:

Toggle quote (13 lines)> Hi,
> 
> ng0 <ng0@n0.is> skribis:
> 
> > I wonder if it is a bug or lack of functionality in i3lock
> > or i3lock-color that I can switch to the tty when it's locked.
> > There are other screenlockers that do not allow me to do this,
> > the screen is really locked, not just tty7 or whereever your X might
> > be running.
> 
> Really?  I’m not sure the screen locker, which is a “regular” X11
> client, can prevent you from switching to a tty.

So in the case of i3lock* this is no proble. Upstream details:

https://github.com/meskarune/i3lock-fancy/issues/104

Toggle quote (43 lines)> > From f11bc2af6aa43cdd52c76c8640fc2d8eff71fa8d Mon Sep 17 00:00:00 2001
> > From: ng0 <contact.ng0@cryptolab.net>
> > Date: Tue, 24 Jan 2017 13:03:42 +0000
> > Subject: [PATCH 1/2] gnu: Add i3lock-color.
> >
> > * gnu/packages/wm.scm (i3lock-color): New variable.
> 
> Applied with these changes:
> 

> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index 8fcce1eab..e3bf01902 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -8,7 +8,7 @@
>  ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
>  ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
> -;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
> +;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
>  ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
>  ;;; Copyright © 2016 doncatnip <gnopap@gmail.com>
>  ;;; Copyright © 2016 Ivan Vilata i Balaguer <ivan@selidor.net>
> @@ -373,13 +373,13 @@ prompt.")
>      (home-page "https://github.com/PandorasFox/i3lock-color")
>      (synopsis "Screen locker with color configuration support")
>      (description
> -     "Re-patched version of i3lock, which is a simple screen
> -locker like slock.  Features include:
> +     "i3lock-color is a simpler X11 screen locker derived from i3lock.
> +Features include:
>  
>  @enumerate
> -@item forking process, the locked screen is preserved when you suspend from RAM
> -@item specify background color or image to be displayed in the lock screen
> -@item many additional color options
> +@item forking process, the locked screen is preserved when you suspend to RAM;
> +@item specify background color or image to be displayed in the lock screen;
> +@item many additional color options.
>  @end enumerate")
>      (license license:bsd-3)))
>

Ok, thanks.

Toggle quote (13 lines)

> > From 9ea21f2e1c20aceff4ff12bf00cd5b31e0bf02fc Mon Sep 17 00:00:00 2001

> > From: ng0 <contact.ng0@cryptolab.net>

> > Date: Tue, 24 Jan 2017 15:57:13 +0000

> > Subject: [PATCH 2/2] gnu: Add i3lock-fancy.

> >

> > * gnu/packages/wm.scm (i3lock-fancy): New variable.

> Applied, thanks!

> Ludo’.

-- 
GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588
GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys
  WWW: https://n0.is

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 27083@patchwise.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 27083

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date