From patchwork Thu Dec 5 20:47:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Evan Straw X-Patchwork-Id: 16395 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 02AA317851; Thu, 5 Dec 2019 21:38:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 734151784F for ; Thu, 5 Dec 2019 21:38:17 +0000 (GMT) Received: from localhost ([::1]:32904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icypF-0006tw-0H for patchwork@mira.cbaines.net; Thu, 05 Dec 2019 16:38:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38790) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icyp6-0006rG-Fm for guix-patches@gnu.org; Thu, 05 Dec 2019 16:38:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icyp3-0001fv-7q for guix-patches@gnu.org; Thu, 05 Dec 2019 16:38:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39406) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icyp2-0001di-4q for guix-patches@gnu.org; Thu, 05 Dec 2019 16:38:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1icyp0-000123-Kt for guix-patches@gnu.org; Thu, 05 Dec 2019 16:38:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38504] [PATCH 2/2] gnu: Remove obsolete stumpwm patch References: <87immur0eo.fsf@gmail.com> In-Reply-To: <87immur0eo.fsf@gmail.com> Resent-From: Evan Straw Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Dec 2019 21:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38504 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38504@debbugs.gnu.org Received: via spool by 38504-submit@debbugs.gnu.org id=B38504.15755818343888 (code B ref 38504); Thu, 05 Dec 2019 21:38:02 +0000 Received: (at 38504) by debbugs.gnu.org; 5 Dec 2019 21:37:14 +0000 Received: from localhost ([127.0.0.1]:45378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icyoB-00010a-IW for submit@debbugs.gnu.org; Thu, 05 Dec 2019 16:37:14 -0500 Received: from mail-pl1-f182.google.com ([209.85.214.182]:45223) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1icy2f-0007si-3h for 38504@debbugs.gnu.org; Thu, 05 Dec 2019 15:48:08 -0500 Received: by mail-pl1-f182.google.com with SMTP id w7so1718267plz.12 for <38504@debbugs.gnu.org>; Thu, 05 Dec 2019 12:48:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version:content-disposition :content-transfer-encoding:content-description; bh=TKfiPDWYNXdkeYcC3HE1ekjE+rGlbsuEy047bd87Q9Y=; b=ocwiFAH8KJuGtqwbYXTIlHy2YlK/9FZRz+4RR7EQhKFWwwROKSQgWKwopxvwgt9RtS hi05MScN0BW2owXUOmqrZx/tOe3QnxwItAspNHyy5mpf+Gt4g/8M1IF1gErQOM1XPgAx qWnuglh3YVASYQT4HryMFdNsP2O+tCinJWtdisBSzmiZHXAfjVPcqDXXPKhGabXMygiR hYUGawGC9Njwr/4+7MyXUYAhQwLPWd6NZDZtEe8pG++h8TvgVu5L2eJIdvJdunjzkTNU G10Pp4oanNSE4arxtAOwwDFS/g+C+Z+x508BUrwOOzri3VY9AN9xcS5bBkk2zwhjUMAS bCdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-disposition:content-transfer-encoding:content-description; bh=TKfiPDWYNXdkeYcC3HE1ekjE+rGlbsuEy047bd87Q9Y=; b=pGsQXCseGsDQR0XxWXNziN85eAYIMEvhjbzVsld+cpIt/WJ/lz2+YIS8WZeycESfJh ZJUJe8gi3NH2aJsvCezDOVDuOAtWqUNRv6taF3PEFVirbXBOplWWTejxBt7eErIPhfje AtUvPJsWpFhhQ4RuWydNUw/inRvdxq8r+Exkh5yudEUMlRdrMf/aJIMqSe64BpXW73cI Nm66EzAmhh8OHS5Ern4j/9Ki0KklpNiDgMwATVVJW/eUGUmVDuExy9nQp0qO8YIp23an s7cDAYvxzHk10L+0/MC/GT0SuJBh4gzFA55gLyR7zGRhCra7M+WKdm2QTffxgQDZh1lx RyMg== X-Gm-Message-State: APjAAAXEoEO4djmQYmUI47jUlztinolOAo+Nv+1RPU6UJoQTTKIOsqK3 qN7OXs69TcZ3yWtN79SrpZd7JF7D X-Google-Smtp-Source: APXvYqw7aqgTWVxcq0A8AY2CEqxzGc1DZw4oCf5ZO+S8QblJGYgAlb682yw0DZcqwnolYDFVtMLUiQ== X-Received: by 2002:a17:90a:3ae3:: with SMTP id b90mr11806595pjc.62.1575578878736; Thu, 05 Dec 2019 12:47:58 -0800 (PST) Received: from virtualplaza ([205.175.97.42]) by smtp.gmail.com with ESMTPSA id 91sm606891pjq.18.2019.12.05.12.47.58 for <38504@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Dec 2019 12:47:58 -0800 (PST) From: Evan Straw Date: Thu, 05 Dec 2019 12:47:57 -0800 Message-ID: <87d0d2qz2a.fsf@gmail.com> MIME-Version: 1.0 Content-Disposition: inline; filename=0002-gnu-Remove-obsolete-stumpwm-patch.patch Content-Description: [PATCH 2/2] gnu: Remove obsolete stumpwm patch X-Mailman-Approved-At: Thu, 05 Dec 2019 16:37:10 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches From 5e8433417b01c7a6d551a98d8354015e5a4a7356 Mon Sep 17 00:00:00 2001 From: Evan Straw Date: Thu, 5 Dec 2019 11:33:37 -0800 Subject: [PATCH 2/2] gnu: Remove obsolete stumpwm patch * gnu/local.mk (): New variable. According to the comments in the package definition this patch is no longer needed now that a new release of StumpWM is out, so this commit removes the patch. Co-authored-by: Brett Gilio --- gnu/local.mk | 3 +- .../stumpwm-fix-broken-read-one-line.patch | 45 ------------------- 2 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 gnu/packages/patches/stumpwm-fix-broken-read-one-line.patch diff --git a/gnu/local.mk b/gnu/local.mk index 06eb76cc2e..ec4f8db490 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -23,6 +23,8 @@ # Copyright © 2019 Guillaume Le Vaillant # Copyright © 2019 John Soo # Copyright © 2019 Jonathan Brielmaier +# Copyright © 2019 Evan Straw +# Copyright © 2019 Brett Gilio # # This file is part of GNU Guix. # @@ -1363,7 +1365,6 @@ dist_patch_DATA = \ %D%/packages/patches/soundconverter-remove-gconf-dependency.patch \ %D%/packages/patches/steghide-fixes.patch \ %D%/packages/patches/streamlink-update-test.patch \ - %D%/packages/patches/stumpwm-fix-broken-read-one-line.patch \ %D%/packages/patches/supercollider-boost-1.70-build-fix.patch \ %D%/packages/patches/superlu-dist-awpm-grid.patch \ %D%/packages/patches/superlu-dist-fix-mpi-deprecations.patch \ diff --git a/gnu/packages/patches/stumpwm-fix-broken-read-one-line.patch b/gnu/packages/patches/stumpwm-fix-broken-read-one-line.patch deleted file mode 100644 index f8dac61307..0000000000 --- a/gnu/packages/patches/stumpwm-fix-broken-read-one-line.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a13db62a4da06426cf2eb2376d1a3723b5ee52d5 Mon Sep 17 00:00:00 2001 -From: Vasily Postnicov -Date: Fri, 14 Dec 2018 20:01:53 +0300 -Subject: [PATCH] READ-ONE-LINE: Turn COMPLETIONS into a keyword argument - -This keeps READ-ONE-line backwards compatible to changes prior -dae0422811771d179077b9336618f2b19be85b7b. Currently both -ARGUMENT-POP-OR-READ and ARGUMENT-POP-REST-OR-READ are still being -called with the previous lambda list. Update the calls to the -READ-ONE-LINE that used the 'new' lambda list, COMPLETING-READ and -YES-OR-NO-P. - -Closes #538 ---- - input.lisp | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/input.lisp b/input.lisp -index b698a368..7904b35f 100644 ---- a/input.lisp -+++ b/input.lisp -@@ -307,10 +307,13 @@ passed the substring to complete on and is expected to return a list - of matches. If require-match argument is non-nil then the input must - match with an element of the completions." - (check-type completions (or list function symbol)) -- (let ((line (read-one-line screen prompt completions :initial-input initial-input :require-match require-match))) -+ (let ((line (read-one-line screen prompt -+ :completions completions -+ :initial-input initial-input -+ :require-match require-match))) - (when line (string-trim " " line)))) - --(defun read-one-line (screen prompt completions &key (initial-input "") require-match password) -+(defun read-one-line (screen prompt &key completions (initial-input "") require-match password) - "Read a line of input through stumpwm and return it. Returns nil if the user aborted." - (let ((*input-last-command* nil) - (*input-completions* completions) -@@ -842,6 +845,7 @@ user presses 'y'" - user presses 'yes'" - (loop for line = (read-one-line (current-screen) - (format nil "~a(yes or no) " message) -+ :completions - '("yes" "no")) - until (find line '("yes" "no") :test 'string-equal) - do (message "Please answer yes or no") -- 2.20.1