From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNg4r-0008Eq-GT for guix-patches@gnu.org; Sat, 09 Dec 2017 09:26:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNg4o-0004El-0L for guix-patches@gnu.org; Sat, 09 Dec 2017 09:26:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:44561) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eNg4n-0004EL-QV for guix-patches@gnu.org; Sat, 09 Dec 2017 09:26:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eNg4n-0000zN-H3 for guix-patches@gnu.org; Sat, 09 Dec 2017 09:26:01 -0500 Subject: [bug#27083] screen-lockers: i3lock-color and i3lock-fancy Resent-Message-ID: Date: Sat, 9 Dec 2017 14:25:23 +0000 From: ng0 Message-ID: <20171209142523.7mzdwhyof7h24edf@abyayala> References: <871skx9ql3.fsf@gmail.com> <20171117101835.whd5f7lincppxlgy@abyayala> <20171117201705.75ldk4yxnpd7m3qa@abyayala> <20171117205734.63tbjhxqbcw6sis7@abyayala> <20171117210211.vdauzbvhrjubwamt@abyayala> <20171117211901.eor5yjlvj3icgbsd@abyayala> <87374uc3tk.fsf@gmail.com> <20171201092731.aea3sdto6dgsqisk@abyayala> <878teltpq6.fsf@gmail.com> <20171209132538.uvtlqmv3wnm4uvyp@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="2eifadvsu6yovm5w" Content-Disposition: inline In-Reply-To: <20171209132538.uvtlqmv3wnm4uvyp@abyayala> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Chris Marusich Cc: 27083@debbugs.gnu.org --2eifadvsu6yovm5w Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable ng0 transcribed 9.9K bytes: > Chris Marusich transcribed 4.6K bytes: > > ng0 writes: > >=20 > > > Hi Chris, > > > > > > thanks for your review. I'll have no time to address it before next w= eek, > > > just a couple of comments. > >=20 > > 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. > >=20 >=20 > 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). >=20 > 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. >=20 > 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. Confirmation: It still works. > --=20 > GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 > GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys > WWW: https://n0.is > From f11bc2af6aa43cdd52c76c8640fc2d8eff71fa8d Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Tue, 24 Jan 2017 13:03:42 +0000 > Subject: [PATCH 1/2] gnu: Add i3lock-color. >=20 > * gnu/packages/wm.scm (i3lock-color): New variable. > --- > gnu/packages/wm.scm | 50 +++++++++++++++++++++++++++++++++++++++++++++++= ++- > 1 file changed, 49 insertions(+), 1 deletion(-) >=20 > 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 =C2=A9 2016 Al McElrath > ;;; Copyright =C2=A9 2016 Carlo Zancanaro > ;;; Copyright =C2=A9 2016 Ludovic Court=C3=A8s > -;;; Copyright =C2=A9 2016, 2017 ng0 > +;;; Copyright =C2=A9 2016, 2017 ng0 > ;;; Copyright =C2=A9 2016 doncatnip > ;;; Copyright =C2=A9 2016 Ivan Vilata i Balaguer > ;;; Copyright =C2=A9 2017 Mekeor Melire > @@ -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/"= ))))) > =20 > +(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 f= rom RAM > +@item specify background color or image to be displayed in the lock scre= en > +@item many additional color options > +@end enumerate") > + (license license:bsd-3))) > + > (define-public xmonad > (package > (name "xmonad") > --=20 > 2.15.1 >=20 > From 9ea21f2e1c20aceff4ff12bf00cd5b31e0bf02fc Mon Sep 17 00:00:00 2001 > From: ng0 > Date: Tue, 24 Jan 2017 15:57:13 +0000 > Subject: [PATCH 2/2] gnu: Add i3lock-fancy. >=20 > * gnu/packages/wm.scm (i3lock-fancy): New variable. > --- > gnu/packages/wm.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++= ++++++ > 1 file changed, 67 insertions(+) >=20 > 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))) > =20 > +(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/ar= chive/" > + 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 "imagemag= ick") > + "/bin/convert")) > + (mimport (string-append (assoc-ref inputs "imagemagi= ck") > + "/bin/import")) > + (awk (string-append (assoc-ref inputs "gawk") > + "/bin/gawk"))) > + > + (substitute* "lock" > + (("$(which wmctrl)") wmctrl) > + (("convert") mconvert) > + (("shot=3D\\(import") (string-append "shot=3D\(" mimpor= t)) > + (("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") > --=20 > 2.15.1 >=20 --=20 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://c.n0.is/ng0_pubkeys/tree/keys WWW: https://n0.is --2eifadvsu6yovm5w Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAlor8lIACgkQ4i+bv+40 hYg5RQ//X9lhX1nCoK/JoUwCyZzw9Cs0hiU+7SbZAKeJ8RgQ11cdm0Q0IA5zfslT 76MRGX/qW2IumoWhlx2Ap1epX+uQbUPq+ttLdeoFqYcr0qXgmPasW/Rdpui6Vr6G itzDoUuyUVUan+L1hWbW08gAPveNSrW/gIscMOEJlVRQCC2idH2gTOj9KkWTm7VJ 2lRsg5goT3bol/zyr9b5Ntflco7lD6qp6TgaA/wdWyMGHoJK8732kS7hiKgay9lY stADH7Pq6EMoJ8BmuX8rwDqdnktvV7N04bZkn9k7MV1J5GCGO8EmIEspuwq4HO3E STdNCawBXI/XX7dB+awlEHFOS/pJjCAN4IFRR0+lYKzaWZNE35wO47WdAE9OPpTi tqB6+7sKxcqsOPly1zpDM1HTtK/z9R4VI2YM2IsuPd49Ic04XJ1tVtGGH+BI2dlT jWe5LecIuO6Lvqq+KGhjqieNjKmTN5+lvRD7GnD3PkmedM22/eSMPE9i00bbo5rC H9jwz+3tmtTvMLFuZOG7AohIKqqYP2J3JwmgLLuor7BsWM+EIo+GaJ5hjogxpMVn oBz1d/8IQG8k/LUL9W6V5EgN7JwApNUNgjTkPRVcWx3UGHBmuu71GUOnZohV4eOc W7uE0oRf6hAYTxkdqvqfkn1NZXihdbDS8MztHI/g+prZ+U9FoXE= =uPqo -----END PGP SIGNATURE----- --2eifadvsu6yovm5w--