From patchwork Wed Apr 9 15:53:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41505 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 09F1527BC4A; Wed, 9 Apr 2025 16:55:14 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 1AD8627BC49 for ; Wed, 9 Apr 2025 16:55:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2XlY-0000Y4-SN; Wed, 09 Apr 2025 11:55: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 1u2XlW-0000XD-MA for guix-patches@gnu.org; Wed, 09 Apr 2025 11:55: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 1u2XlW-0000IN-Cc for guix-patches@gnu.org; Wed, 09 Apr 2025 11:55:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=JIdu94KYT+pFaUa9fEcxQmXuJU7jG+5xrqrDrt1TjHM=; b=JEpUB+2AXGxRedTWn/T2x+DGi1Dg/8nH7dZHo3i1vnPDS/wMNEZFfkONvF/IoiMrUpr3RrScZk7Za5XuChyKNbthhh+92lavfxgm4xRau6aFAEEauXCMBs8vL22+L16OfBa94iO+6GooiG6NT/8aR31Vq/OV1zMDsKDkzbKtxhOGivp3oHr3jXPF3VFNrxbHtIhmmhjb/gq5J3VOAPKus5A0Pxe7REYojzc4Hd39WIDrc7AmfLzWhOu2G6JcLOymBx8O5GXucOfpIMZYfKfy1stHbAxTd/AOaxN40925FPPte98SOC6sTG5Y/VHISaiT9HyzDzs8QDLPcy/b7te6/Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2XlW-0005Uh-7D for guix-patches@gnu.org; Wed, 09 Apr 2025 11:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77611] [PATCH v2] gnu: Remove duplicated package show-me-the-key. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 15:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77611 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77611@debbugs.gnu.org Cc: Morgan Smith , ludo@gnu.org Received: via spool by 77611-submit@debbugs.gnu.org id=B77611.174421405020974 (code B ref 77611); Wed, 09 Apr 2025 15:55:02 +0000 Received: (at 77611) by debbugs.gnu.org; 9 Apr 2025 15:54:10 +0000 Received: from localhost ([127.0.0.1]:41289 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2Xkf-0005SD-90 for submit@debbugs.gnu.org; Wed, 09 Apr 2025 11:54:09 -0400 Received: from mail-mw2nam12olkn2078.outbound.protection.outlook.com ([40.92.23.78]:52961 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2Xkd-0005Rd-4k for 77611@debbugs.gnu.org; Wed, 09 Apr 2025 11:54:07 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=W/cpHBpecjnaGKWv8GvhMZQSRRduz78Peu6j2rDoptBDllH4gegXQt4k2+4AyKXbxvma/fThdddMUka/uVvXBdu4i3aB5sq1fnqMHehI2OAlnVWnbiOL1tZzMLmIUkthhRGoeqSF/arxISy9Tyq354N7mgai6rZHNySyCIId82KZs8ZbTksW1RxoZsr7RW0MfEQYQUgGZsILpN76KndbRrMIW8lZhBrN3TAl3QnZGmrCY3i3UMgiVkgnLluf6jzQZwK5D1pyRHoDt3e0qvVbuD43Z0f3FQaRMpgn2uHeOjFTjN/TdAx6fWo9nN+dW0RhXq9//LsvT7ORo6/EOBSTLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=JIdu94KYT+pFaUa9fEcxQmXuJU7jG+5xrqrDrt1TjHM=; b=xvF0q3ig7koI/Q4/ME1QiMbyhwjJRYnEkq4KT2t+ijfcO/oZZOhTRlwojusXVmY/eyU9Ub3mXauL1MiD3XXb00UXViN4gzNkWd4AFobtK7tFoK4C6YVtMlbXd7jmNzVuZIZ8iiHZbpkAVZSALusjdi885cZZ4dS4TlnY/UMRYMozos9bo31xXgNNKj6AQTLjIM91UZUGuVpLfYTPlESnfc30HtA1qgAOKU1OKhehsckqikKNklUqYxpMUlE8s9CGpXxszzij4QxGul1PiSKi9C0dlQXzHj7hWgGLEnBQuNYiuXR1pMWv3CUGoqY1BWr+pcvPO+z84OYYGyNZLUHvKA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JIdu94KYT+pFaUa9fEcxQmXuJU7jG+5xrqrDrt1TjHM=; b=ZV8P/e9oUCMMKlo1EdDUUQO5FJAc4aYHDvyM2JAvKnZCsF9YwGgXhLGvuebxy44M2gWtL2ZrCvzGzQzHNqE8NcN+fztO4J7b13wGTuU5V4shEcU92mo7LRNgBOap4NaoNY/YAATs28dOcKXPOtT+Q9301PvffhNCzIo3l067ObRJFzfEVGqslLX/X0jErqMSWH1aMsrvAVAHuiBLgftQT4es+G/1DSbyLURmIN/Tv5mH1JD/KnlHiE0jhjSzfKoFjVRcSgi1JVrrS94U4ZIBlqOlQRvOelJG5q0HBHi4FWjZpGV7dLFAt082tTRCnONQrhmDEV9/Zje2O7PZ0+IrPQ== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH7PR84MB1510.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:151::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.21; Wed, 9 Apr 2025 15:53:57 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8606.033; Wed, 9 Apr 2025 15:53:57 +0000 From: Morgan Smith Date: Wed, 9 Apr 2025 11:53:19 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <87wmbu3cgg.fsf@gnu.org> References: <87wmbu3cgg.fsf@gnu.org> X-ClientProxiedBy: YT4PR01CA0249.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:10f::16) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <91b15719c1f179646d9d31111cdfa4b71f16355e.1744213998.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH7PR84MB1510:EE_ X-MS-Office365-Filtering-Correlation-Id: 305c3ba8-ccbc-4977-a15a-08dd777ebc7b X-Microsoft-Antispam: BCL:0; ARA:14566002|8060799006|7092599003|19110799003|15080799006|461199028|5072599009|1602099012|440099028|10035399004|13041999003|4302099013|3412199025|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: GPGNcCIh6jm+ShYIgw53fOkPBxM8oEa6huFMQ0hfMnEdtD7WjtG0H3+G5swFteG+KCtC7rfaKPEGASfSDUZRI25rIWo+FDKvl6b5EklVFTNL+XQiF2wnIdm91yMO2QjLlplOUaLcs2FAsVjeylYZy6N0Z95VEUNBOXxeeT9TyTgIF5KFAGMOo5gDeyZBATxwT1SkU1i95Sv8KvwEaRvGytJsIj7ap1QSt7oXpzLL8E6KVFuNAXdg9DLrcXQjpdj3b6FMYSGJkmjXj7Dz4OZ4unuHIyZIvrOD39d1AskETpov9m6XsGK2J0bxb+y4pzwu1QE+cIGHeQUFO8pFeZOWOw9zqLQl6nP1t/1LaXGLA475n1RG7QaSz1BKf9nFGOh+MOjXIU2k9I5fqVnQoBnPYJrWWyDN3L3PaqG4pyY+3U/gW/lVUBGSKun86IhTk1uiQpE/ocyz9EMpIT8RX5NNLzfsjo3ypHXOPUI1Mbh25+Nx8/tculAXwPCqGaRvODfL3VhHUd5S+u1CbpV8hyW2r3oxL7Z0MF9kOmUkoGcOyn3O7Ds9uOXEfqw5kccuQmgf2q8gePxSh22W1+yYtPddZCBQMM0Z+vfEBQ3CUiacPq8S5IOwpOE7vFEdkUV/y1wM43W0lD7iY84bo+Fusq+1V9iG0CLDA9F5DgeLdEmIPnT3iFRdJqZef1+YEY5/sBKZG1XFjFoArDPTTnp/w0Op4YlJDKx9ZA9urWHS90lcUrr8MIZrSTY57xwhKjwL6oMMmoU4ygl3vdSMkPOqAvUaO0MW7maisq7bCFxP+M0+ZJiz1fY+XjgxhHtChENkHAXnzwGXHEQe3HoP9lwHt7EJZwBidoMqrnK7s4M12H6uC+HJmUouwiy3qU3Ym4cPV6PXxYqhGdmlKwcN7RGTbL0dOnlzgOc8vbP7iPqJR0Yw8i4zLqtMa9taX5asH7auf7uiRUebwj+G191+v78YQr9Fm5rZ4dsQF2vQSe/rZOJZt2aT8DqmBC6eUop9xl1IYkRQYws6MnU6jbJiSzppznEnU16zhwBArq/6VVHMMWU0f/05xA34MBWOokjaHXkcS4MuOKPRURf4+nywtHQYa9HBLnGsd3+Ky24FdD1MbdkqH/ZliErngAdOwa9/FQr0ls7kIotNF7okKbfN1VPHlPoz+w2xSqd8fODUoMrWzoPqGEcyRq1F7p/DP0+GHiJY9ihnoBuVmGvSA+teU7rt6d118GlWlsayJNeJGtTEFCzKTHLlFjmoH6awqy8PVjY7WyDtQUlfmlteBEIvWy1qjnPGH+xa8PFQWb+nX/yOwVbVlEQ5MLDk+wY+pVPenbrFHwOt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jPb1SfcucwDAeUS2dNWXiMr0GHirQL1dZUu3DMVIriN7vNfCUS4UoCLHHsAHK5J12CXunvGM8mS3/zs3LC/z9YKAl/t11eNNumYgOq49cBbKqN2W66P2NDLICOxJZc/6UMXQ3qCRI5jX8oYnACIjow4wgIXnfgarhI8jPCxvCg9UifgHgDAJh3YGGIZ5nqkXnpOo/qDjV6clk031DzaHfgBCC4L3KNBbV6e0hiLgEX3Uaz01jGv+w+a8+wKMQXOCVKAl7+rPO8trqDjNjAeE8xtwuDg9q32wx99HBpFb1DbWIJY2GykGDJIpaU5fpKrjixGb4sqbCzSd+u1xd4CToe7usXTdqtgzWwoVMoO37gT0c5aegyNzgA/s6SndE4Yb3af37Jed35XjkE9YkIzn3bM3sScX/uy3+V8MBjH5oz+LfD26KsLYrHWGHmkvM761AhYXDhoIL4vBskRRow2MJlVPxLfkFkhPEwyeewTydI4GMDI9xx2n5bshEyD4d8jdsYMg6g53WLNmxG1XGnkkKFjWKp1buxBGiUxsSJJaqEvUqtfmc7Rwj2bRaHblte+KnlgTMVGu7GWfXMNXUAHBxXSOyvlPrJ21qH0zKoJeOmJm4galYwpHjL1ALCKmwq3MV2cYIZkfPfvOzAPez2+Y0qk2JRfkJMpdrM/r+nFkw+LXNhhWZLWcu2U8EO6npwCu3svNSrTZ/U6DNCGf1fa9UJ8hO0SIdlE2fLzt+fwBpA9SbKsJmZFX871PuibwnJhtF24y5dHbgHOx/f50yiBHz4ubqD1Bk66k2tRxRNwVMR6mxeZvJWPFR4oFjWh2+p2+nsyZy+2WLfk8xKxrBjrifTGW84BX+YBp3Vv+azpyOlbHCFalZ0DZIyQzEcKmBkH0ytuDIv4wfXN517bPsfOOLdcXVlx8gOVKP/gO9WPd/oqOfEgF5wosTQTr8tGhF5lHBfmoRbYr44ZypUtLSsPAUrZb6Zx5bgXrTGutA7gBR1Cf97sql3xpOe0dQwexPWVjpZb6GRktIapdAl4esPl/Ny08Lzl1oHuHIDXD04sTHeVRuUBKTc4gOfzHHUKJsiXVDirqyWJzDyYx4jc4B8/pOQxdbpVAQwHIiugKiGCzAfIsDLPVwooeZeLwFNHtNTxO3A0cosahXV9jTn14ruT+FkhntR3GL7rFl1Tva8pBsBHgm8VE0qzhmhqs8WkRAb263KWtpK1kpKDfp1hBTiVNPSLltOkEWQKFJh9v73pVtjwRcUvkS4CtqjdSfZ7I4I1FxjQhjqHLqiAIE8QERDldSqC9zl1BCl/4GuWhxUb+CtzZkBLyByn9KZpZQyeb8W3G X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 305c3ba8-ccbc-4977-a15a-08dd777ebc7b X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2025 15:53:57.2303 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR84MB1510 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 This package is a duplicate of "showmethekey". Upstream seems to prefer naming the package without hyphens in the name. * gnu/packages/xdisorg.scm (show-me-the-key): Delete variable. * gnu/packages/video.scm (show-me-the-key): Add as a deprecated alias for showmethekey. Change-Id: I21daae0826b6fbc5adf6d10a8497099875ae09f1 --- gnu/packages/video.scm | 9 +++++++++ gnu/packages/xdisorg.scm | 31 ------------------------------- 2 files changed, 9 insertions(+), 31 deletions(-) base-commit: f0c0769189d11debf7b237a02695c44c9773d52a diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9f18f4dcc2..97be01258b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6941,3 +6941,12 @@ (define-public showmethekey Users in group ``wheel'' can skip password authentication.") (home-page "https://github.com/AlynxZhou/showmethekey") (license license:asl2.0))) + +(define-public show-me-the-key + (deprecated-package "show-me-the-key" showmethekey)) + +;;; +;;; Avoid adding new packages to the end of this file. To reduce the chances +;;; of a merge conflict, place them above by existing packages with similar +;;; functionality or similar names. +;;; diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 302c0434ca..6dbfacc895 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -4169,37 +4169,6 @@ (define-public xforms-gl (synopsis "GUI toolkit for X based on the X11 Xlib library, with OpenGL support"))) -(define-public show-me-the-key - (package - (name "show-me-the-key") - (version "1.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/AlynxZhou/showmethekey/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 - "1gvrri6kfywxk8hfchc66r6fpwlrcai2j227ib33w6503cx66rl9")))) - (build-system meson-build-system) - (inputs (list libevdev - libinput - gtk - json-glib-minimal - cairo - pango - libxkbcommon - polkit)) - (native-inputs (list `(,glib "bin") ; for glib-compile-resources - `(,gtk "bin") ; for gtk-update-icon-cache - pkg-config)) - (home-page "https://github.com/AlynxZhou/showmethekey") - (synopsis "Screencast tool to display pressed keys") - (description "Show Me the Key is a screencast tool to display your keys -and works under both Xorg and Wayland (via @code{libinput}), inspired by -@code{python-screenkey}.") - (license license:asl2.0))) - (define-public xxkb (package (name "xxkb")