Subject: bug#58356: closed (Re: bug#58356: [PATCH] Add xtrlock)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 17 Aug 2023 17:05:01 +0000

Your bug report

#58356: [PATCH] Add xtrlock

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
58356: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=58356
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#58356: [PATCH] Add xtrlock
From: Ludovic Courtès <[email-masked]>
To: Mehmet Tekman <[email-masked]>
Cc: [email-masked]
Date: Thu, 17 Aug 2023 19:04:19 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

Hi,

Mehmet Tekman <[email-masked]> skribis:

> From aced8b924a194495233b0698f2185b9b80d10963 Mon Sep 17 00:00:00 2001
> From: Mehmet Tekman <[email-masked]>
> Date: Tue, 11 Oct 2022 12:38:13 +0200
> Subject: [PATCH] gnu: Add xtrlock.
>
> * gnu/packages/xdisorg.scm (xtrlock): New variable.

Finally applied, with the changes below.

Thanks!

Ludo’.

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index e4049a5dc2..294a18cdd2 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1164,22 +1164,25 @@ (define-public xtrlock
      ;; LDLIBS are required for the package to build.
      ;; CFLAGS are required for it to use the shadow file, and to
      ;; be compatible with multi-touch devices.
-     '(#:make-flags (list "CFLAGS=-Wall -DSHADOW_PWD -DMULTITOUCH"
-                          "LDLIBS=-lX11 -lcrypt -lXi")
-       #:phases (modify-phases %standard-phases
-                  (delete 'configure)
-                  (delete 'check)
-                  (add-after 'unpack 'rename-makefile
-                    (lambda _
-                      (rename-file "Makefile.noimake" "Makefile")
-                      (rename-file "xtrlock.man" "xtrlock.1")))
-                  (replace 'install
-                    (lambda* (#:key outputs #:allow-other-keys)
-                      (let* ((out (assoc-ref outputs "out")))
-                        (install-file "xtrlock"
-                                      (string-append out "/bin/"))
-                        (install-file "xtrlock.1"
-                                      (string-append out "/share/man/man1/"))))))))
+     (list #:make-flags
+           #~'("CFLAGS=-O2 -g -Wall -DSHADOW_PWD -DMULTITOUCH"
+               "LDLIBS=-lX11 -lcrypt -lXi")
+           #:phases
+           #~(modify-phases %standard-phases
+               (delete 'configure)
+               (delete 'check)
+               (add-after 'unpack 'rename-makefile
+                 (lambda _
+                   (rename-file "Makefile.noimake" "Makefile")
+                   (rename-file "xtrlock.man" "xtrlock.1")))
+               (replace 'install
+                 (lambda* (#:key outputs #:allow-other-keys)
+                   (let* ((out (assoc-ref outputs "out")))
+                     (install-file "xtrlock"
+                                   (string-append out "/bin/"))
+                     (install-file "xtrlock.1"
+                                   (string-append out
+                                                  "/share/man/man1/"))))))))
     (inputs (list libx11 libxi libxfixes))
     (home-page "https://packages.debian.org/sid/xtrlock")
     (synopsis "Minimal X display lock program")
@@ -1193,7 +1196,7 @@ (define-public xtrlock
 entered the bell is sounded.  Pressing Backspace or Delete erases one
 character of a password partially typed; pressing Escape or Clear clears
 anything that has been entered.")
-    (license license:gpl3+)))
+    (license license:gpl2+)))
 
 (define-public xosd
   (package

Subject: [PATCH] Add xtrlock
From: Mehmet Tekman <[email-masked]>
To: [email-masked]
Date: Fri, 7 Oct 2022 16:01:20 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

---
 gnu/packages/xtrlock.scm | 71 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 gnu/packages/xtrlock.scm

diff --git a/gnu/packages/xtrlock.scm b/gnu/packages/xtrlock.scm
new file mode 100644
index 0000000000..2acf45e8b3
--- /dev/null
+++ b/gnu/packages/xtrlock.scm
@@ -0,0 +1,71 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2022 Mehmet Tekman <[email-masked]>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages xtrlock)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
+  #:use-module (gnu packages xorg)
+  #:use-module ((guix licenses) #:prefix license:)
+  )
+
+(define-public xtrlock
+  (let ((pkg-version "2.15")
+        (pkg-hash "0mgpysbvipd5h6x6zz4hng6b13gp3qjnpgny3azyj8k8dv85bppw")
+        (recipe-revision "0"))
+    (package
+      (name "xtrlock")
+      (version (string-append pkg-version ".r" recipe-revision))
+      (source (origin
+                (method url-fetch)
+                (uri (string-append
+                      "mirror://debian/pool/main/x/xtrlock/xtrlock_"
+                      pkg-version ".tar.xz"))
+                (sha256 (base32 pkg-hash))))
+      (build-system gnu-build-system)
+      (arguments
+       '(#:make-flags
+         (list "LDLIBS=-lX11 -lcrypt -lXi"
+               "CFLAGS=-Wall -DSHADOW_PWD -DMULTITOUCH")
+         #:phases
+         (modify-phases
+             %standard-phases
+           (delete 'configure)
+           (delete 'check)
+           (add-after 'unpack 'rename-makefile
+             (lambda _
+               (rename-file "Makefile.noimake" "Makefile")
+               (rename-file "xtrlock.man" "xtrlock.1")))
+           (replace 'install
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let* ((out (assoc-ref outputs "out")))
+                 (install-file "xtrlock" (string-append out "/bin/"))
+                 (install-file "xtrlock.1" (string-append out
"/share/man/man1/"))))))))
+      (native-inputs (list libx11 libxi libxfixes))
+      (home-page "https://packages.debian.org/sid/xtrlock")
+      (synopsis "Minimal X display lock program")
+      (description "xtrlock locks the X server till the user enters
their password at the
+keyboard.  While xtrlock is running, the mouse and keyboard are grabbed and
+the mouse cursor becomes a padlock.  Output displayed by X programs, and
+windows put up by new X clients, continue to be visible, and any new output is
+displayed normally.  The mouse and keyboard are returned when the user types
+their password, followed by Enter or Newline.  If an incorrect password is
+entered the bell is sounded.  Pressing Backspace or Delete erases one
+character of a password partially typed; pressing Escape or Clear clears
+anything that has been entered.")
+      (license license:gpl3))))
-- 
2.38.0