From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59101) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGNa1-0004rH-Kd for guix-patches@gnu.org; Sun, 19 Nov 2017 06:16:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGNZy-0001SO-88 for guix-patches@gnu.org; Sun, 19 Nov 2017 06:16:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:38140) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eGNZy-0001SI-2e for guix-patches@gnu.org; Sun, 19 Nov 2017 06:16:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eGNZx-0007Pu-Qa for guix-patches@gnu.org; Sun, 19 Nov 2017 06:16:01 -0500 Subject: [bug#27083] screen-lockers: i3lock-color and i3lock-fancy Resent-Message-ID: Date: Sun, 19 Nov 2017 11:04:00 +0000 From: ng0 Message-ID: <20171119110400.thfoe7usnzomwgrf@abyayala> References: <871skx9ql3.fsf@gmail.com> <20171117101835.whd5f7lincppxlgy@abyayala> <20171117201705.75ldk4yxnpd7m3qa@abyayala> <20171117205734.63tbjhxqbcw6sis7@abyayala> <20171117210211.vdauzbvhrjubwamt@abyayala> <20171117211901.eor5yjlvj3icgbsd@abyayala> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="as6tux4eucm5is6h" Content-Disposition: inline In-Reply-To: <20171117211901.eor5yjlvj3icgbsd@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 --as6tux4eucm5is6h Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable ng0 transcribed 35K bytes: > ng0 transcribed 25K bytes: > > ng0 transcribed 23K bytes: > > > ng0 transcribed 22K bytes: > > > > New version appended. i3lock-fancy needs some fixes, but I can conf= irm > > > > that i3lock-color works! > > >=20 > > > in i3lock-fancy script: > > >=20 > > > # try to use a forked version of i3lock with prepared parameters > > > if ! /gnu/store/kfymvwgm4g0avs3b97micq8477sa0if6-i3lock-color-2.9.1-c= /bin/i3lock "${param_add[@]}" "${param[@]}" -i "$image" > /dev/null 2>&1; t= hen > > > # We have failed, lets get back to stock one > > > i3lock "${param_add[@]}" -i "$image" > > > fi > > >=20 > > >=20 > > > Would /run/current-system/profile/bin/i3lock-fancy be better? > > > The most realistic scenario I see is to just set 'i3lock' and > > > propagate i3lock-color with i3lock-fancy. >=20 > 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. >=20 > 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). >=20 > 3rd version of patches appended. >=20 > > I have just copied /run/current-system/profile/bin/i3lock-fancy to $HOM= E/i3lock-fancy > > and changed the /gnu/store/kfymvwgm4g0avs3b97micq8477sa0if6-i3lock-colo= r-2.9.1-c/bin/i3lock > > bit to read just "i3lock". This way i3lock-fancy works for me. > > There's a general 'lag' in both i3lock-color and i3lock-fancy, but > > I blame my Desktop. > >=20 > > I'll send an update soon. > >=20 > From ba2a83195afb10ca7c65833f81cdc10748212873 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/local.mk | 1 + > gnu/packages/wm.scm | 68 +++++++++++++++++++++++++++++++++++++++++++++++= ++++++ > 2 files changed, 69 insertions(+) >=20 > 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 =3D \ > %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/"= ))))) > =20 > +(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=3Dgcc") > + #: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=3Dpkg-config") > + (string-append "PKG_CONFIG=3D" > + (which "pkg-config"))) > + (("/usr/include/xkbcommon/xkbcommon-compose.h") > + xkbheader) > + (("PREFIX=3D/usr") > + (string-append "PREFIX=3D" out)) > + (("SYSCONFDIR=3D/etc") > + (string-append "SYSCONFDIR=3D" etc)) > + (("MANDIR=3D/usr/share/man") > + (string-append "MANDIR=3D" 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 f= rom 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") > --=20 > 2.15.0 >=20 > From 63e4eff6e954361a7b30fb4c060bdecbfee56da3 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 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))) > =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) > + ("i3lock-color" ,i3lock-color) 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." > + ("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") > --=20 > 2.15.0 >=20 I'll contribute a Makefile upstream so that we can shorten the package defi= nition. --=20 GnuPG: A88C8ADD129828D7EAC02E52E22F9BBFEE348588 GnuPG: https://dl.n0.is/dist/keys/ WWW: https://we.make.ritual.n0.is --as6tux4eucm5is6h Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEqIyK3RKYKNfqwC5S4i+bv+40hYgFAloRZSAACgkQ4i+bv+40 hYhzqw/+JOacJdC1V6J7SESaGEbfNjRiGYXmbkI4N7gfVhk7nAS1zUjXwFh5V95g KiiqIlxBNUAi+KksZl+Tl6gb8dqSCsOVs0+28nxFs0xp8fFBjLGWM9m+WH6jPYFt 4uw9b6NFUhSrS/xNv04v+BAvOSSoZT8eAmnAHIOMq+OXD0WRVDsE0PVyiyjkN2WP VzV+fY/uSb83V+jfEYP/Z5oDg5YzTufF5nXiT3m6ymi+S6s2ngysZ4WrAVFC5z34 BSDSzN2llpKim4D9yM4AehiiStCLVSGtda1eOdyFsa6HEIjYR6xcEIJ62AwOSLbw SLD7/BPn8LbX1+JFpYBRR3sWCXZaXSvjRWwBVxm7X8+fYDIgdIJRGCnTLfm7CeQO D28tbwEHByr4cugftkZAZY0bcikm3vQ0lxEjAAMS5pQJ5tBbeZkxtn2gL47JaTRh /wlxcuxyQ6lwyXE3ceRXZeG44Y7kkoeuve0A4PvimMoNdy4dEdPvMOz4/VEvEGBO Ojavlxns5beDIriN7HaD8IuwRwwHu1fJzQkl3fzMSDQwrIccR4BOZt7jJ9H5I1aQ +l9rf5KXFmDZFfGGlAoYATYV4PgKg0CMyCOh+emt+U5VyX9F5/mlfIBUp17PQx8a Et3lPzdfAHQtQiheYFCPBsEY+GRVanZcJIxYfbnz9ts8anCr69Y= =jY9F -----END PGP SIGNATURE----- --as6tux4eucm5is6h--