From patchwork Thu Aug 17 17:04:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 52964 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E165C27BBEA; Thu, 17 Aug 2023 18:05:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3E2E227BBE2 for ; Thu, 17 Aug 2023 18:05:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWgQi-00021e-7p; Thu, 17 Aug 2023 13:05:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWgQg-00021G-Fg for guix-patches@gnu.org; Thu, 17 Aug 2023 13:05:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWgQg-0005iT-6k for guix-patches@gnu.org; Thu, 17 Aug 2023 13:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWgQf-0006m4-OE for guix-patches@gnu.org; Thu, 17 Aug 2023 13:05:01 -0400 Subject: bug#58356: [PATCH] Add xtrlock Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 17 Aug 2023 17:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 58356 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: moreinfo patch To: Mehmet Tekman Cc: 58356-done@debbugs.gnu.org Mail-Followup-To: 58356@debbugs.gnu.org, ludo@gnu.org, mtekman89@gmail.com Received: via spool by 58356-done@debbugs.gnu.org id=D58356.169229187825994 (code D ref 58356); Thu, 17 Aug 2023 17:05:01 +0000 Received: (at 58356-done) by debbugs.gnu.org; 17 Aug 2023 17:04:38 +0000 Received: from localhost ([127.0.0.1]:45458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWgQH-0006lB-Vf for submit@debbugs.gnu.org; Thu, 17 Aug 2023 13:04:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWgQC-0006kt-UI for 58356-done@debbugs.gnu.org; Thu, 17 Aug 2023 13:04:35 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qWgQ5-0005fV-Vc; Thu, 17 Aug 2023 13:04:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=5mYuqTaP5s8n350/Gaq+uK0XZMfyyYX+0Igw2y/Vomw=; b=YRsmP3yGiu81lRIP9zz/ +sINEpCa6Fv2eO71+4Ke1OAe2rdTVJMcMnTwh2VSLhFO7GTAyRe9Ld6eVtVZz01wl2iMIednTr0RU tbAJobrXNfdAr855QFa9MQWg8htLlSRivJKDk3sRk9w4/jWZfNT2Lh1bvzvxSU2zpciVk9vV5IORJ BsC/TEx2k9rktm7yRd/Jk82qHe18AYea1bjpJee7ffNH5VgAPqFNjRi2O8zGsiyTVsDBXiDVDxO9w OYyJ5L5zMbeOL9PcG0n0oK1/H7TdYxkby67dOv8sJhyUdAhRvNx02E8faY3GulCsUiz4NLtAjZei7 BWfN2HfJcnffWQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= References: <87czb2297f.fsf@gmail.com> Date: Thu, 17 Aug 2023 19:04:19 +0200 In-Reply-To: (Mehmet Tekman's message of "Tue, 11 Oct 2022 13:27:54 +0200") Message-ID: <87il9dvbvw.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, Mehmet Tekman skribis: > From aced8b924a194495233b0698f2185b9b80d10963 Mon Sep 17 00:00:00 2001 > From: Mehmet Tekman > 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