GNU bug report logs - #38504
[PATCH] Update StumpWM to release 19.11

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38504 in the body.
You can then email your comments to 38504 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Evan Straw <evan.straw99 <at> gmail.com>
To: guix-patches <at> gnu.org
Subject: [PATCH] Update StumpWM to release 19.11
Date: Thu, 05 Dec 2019 12:18:55 -0800

The following series of patches will update StumpWM to version 19.11
which was released 8 days ago at time of writing.

-- Evan Straw
evan.straw99 <at> gmail.com

Message #8 received at 38504 <at> debbugs.gnu.org (full text, mbox):

From: Evan Straw <evan.straw99 <at> gmail.com>
To: 38504 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: stumpwm: Update to 19.11.
Date: Thu, 05 Dec 2019 12:47:43 -0800

[0001-gnu-stumpwm-Update-to-19.11.patch (text/x-patch, inline)]

From e5d5040b6821371abdc67cb1f55b29b89d1df48d Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99 <at> gmail.com>
Date: Thu, 5 Dec 2019 11:31:31 -0800
Subject: [PATCH 1/2] gnu: stumpwm: Update to 19.11.

* gnu/packages/wm.scm (stumpwm): Update to 19.11.

Co-authored-by: Brett Gilio <brettg <at> posteo.net>
---
 gnu/packages/wm.scm | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 53dbda5942..c61aa7bb8f 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -27,6 +27,8 @@
 ;;; Copyright © 2019 John Soo <jsoo1 <at> asu.edu>
 ;;; Copyright © 2018, 2019 Pierre Langlois <pierre.langlois <at> gmx.com>
 ;;; Copyright © 2016, 2017 Andy Patterson <ajpatter <at> uwaterloo.ca>
+;;; Copyright © 2019 Evan Straw <evan.straw99 <at> gmail.com>
+;;; Copyright © 2019 Brett Gilio <brettg <at> posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1495,7 +1497,7 @@ compositors that support the layer-shell protocol.")
 (define-public stumpwm
   (package
     (name "stumpwm")
-    (version "18.11")
+    (version "19.11")
     (source
      (origin
        (method git-fetch)
@@ -1504,11 +1506,7 @@ compositors that support the layer-shell protocol.")
              (commit version)))
        (file-name (git-file-name "stumpwm" version))
        (sha256
-        (base32 "003g1fmh7446ws49866kzny4lrk1wf034dq5fa4m9mq1nzc7cwv7"))
-       (patches
-        ;; This patch is included in the post-18.11 git master tree
-        ;; and can be removed when we move to the next release.
-        (search-patches "stumpwm-fix-broken-read-one-line.patch"))))
+        (base32 "1ha8803ll7472kqxsy2xz0v5d4sv8apmc9z631d67m31q0z1m9rz"))))
     (build-system asdf-build-system/sbcl)
     (native-inputs `(("fiasco" ,sbcl-fiasco)
                      ("texinfo" ,texinfo)))
-- 
2.20.1

Message #11 received at 38504 <at> debbugs.gnu.org (full text, mbox):

From: Evan Straw <evan.straw99 <at> gmail.com>
To: 38504 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: Remove obsolete stumpwm patch
Date: Thu, 05 Dec 2019 12:47:57 -0800

[0002-gnu-Remove-obsolete-stumpwm-patch.patch (text/x-patch, inline)]

From 5e8433417b01c7a6d551a98d8354015e5a4a7356 Mon Sep 17 00:00:00 2001
From: Evan Straw <evan.straw99 <at> gmail.com>
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 <brettg <at> posteo.net>
---
 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 <glv <at> posteo.net>
 # Copyright © 2019 John Soo <jsoo1 <at> asu.edu>
 # Copyright © 2019 Jonathan Brielmaier <jonathan.brielmaier <at> web.de>
+# Copyright © 2019 Evan Straw <evan.straw99 <at> gmail.com>
+# Copyright © 2019 Brett Gilio <brettg <at> posteo.de>
 #
 # 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 <shamaz.mazum <at> gmail.com>
-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

Message #14 received at 38504 <at> debbugs.gnu.org (full text, mbox):

From: Brett Gilio <brettg <at> posteo.net>
To: Evan Straw <evan.straw99 <at> gmail.com>
Cc: 38504 <at> debbugs.gnu.org
Subject: Re: [bug#38504] [PATCH 2/2] gnu: Remove obsolete stumpwm patch
Date: Fri, 06 Dec 2019 18:38:06 -0600

Evan Straw <evan.straw99 <at> gmail.com> writes:

> * gnu/local.mk (): New variable.


As far as I can tell, everything _looks_ okay with these patches. Except
this. Perhaps it needs to be revised to be.

* gnu/local.mk (name-of-removed-file.patch): Remove as unneeded.

I will get around to testing these changes ASAP.

Wdyt?

-- 
Brett M. Gilio
https://git.sr.ht/~brettgilio/

Message #17 received at 38504 <at> debbugs.gnu.org (full text, mbox):

From: Brett Gilio <brettg <at> posteo.net>
To: Evan Straw <evan.straw99 <at> gmail.com>
Cc: 38504 <at> debbugs.gnu.org
Subject: Re: [bug#38504] [PATCH] Update StumpWM to release 19.11
Date: Fri, 06 Dec 2019 19:04:45 -0600

Evan Straw <evan.straw99 <at> gmail.com> writes:

> The following series of patches will update StumpWM to version 19.11
> which was released 8 days ago at time of writing.
>
> -- Evan Straw
> evan.straw99 <at> gmail.com
>

Hi Evan,

I gave these patches a test using the `guix system vm` mechanism. They
seem to work fine in that context. I think that after we receive your
revised 2/2 patch we will let this sit here for a few days longer so
people with different machine configurations can test it out and report
any potential errors.

Thanks!

-- 
Brett M. Gilio
https://git.sr.ht/~brettgilio/

Message #20 received at 38504 <at> debbugs.gnu.org (full text, mbox):

From: Pierre Langlois <pierre.langlois <at> gmx.com>
To: guix-patches <at> gnu.org
Cc: 38504 <at> debbugs.gnu.org
Subject: Re: [bug#38504] [PATCH] Update StumpWM to release 19.11
Date: Sat, 07 Dec 2019 16:43:25 +0000

Hi Evan,

Evan Straw writes:

> The following series of patches will update StumpWM to version 19.11
> which was released 8 days ago at time of writing.

Nice one, I just wanted to say I've tested your patches and the new
StumpWM version is working for me, thanks!

Pierre

Message #28 received at 38504-done <at> debbugs.gnu.org (full text, mbox):

From: Brett Gilio <brettg <at> posteo.net>
To: Evan Straw <evan.straw99 <at> gmail.com>
Cc: 38504-done <at> debbugs.gnu.org
Subject: Re: [bug#38504] [PATCH] Update StumpWM to release 19.11
Date: Sun, 08 Dec 2019 21:32:04 -0600

Hi Evan,

This patch series was tested by me and at least one other person on a variety
of machines. I have pushed them to master with commits:

9beec2173f9243456b6aca470acd926d0dcf9b45
59198ba198cdc131aef967843daa898fb5092833

Thanks!

-- 
Brett M. Gilio
https://git.sr.ht/~brettgilio/

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.