bug#57190: closed ([PATCH] Correct software licenses for suckless)

[GNU bug Tracking System]

Your message dated Tue, 23 Apr 2024 14:49:25 +0100
with message-id <874jbs195m.fsf@cbaines.net>
and subject line Re: [bug#57190] [PATCH v2 1/5] gnu: Correct license for st.
has caused the debbugs.gnu.org bug report #57190,
regarding [PATCH] Correct software licenses for suckless
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
57190: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57190
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems

--- Begin Message --- Subject: [PATCH] Correct software licenses for suckless Date: Sat, 13 Aug 2022 20:40:55 -0400 User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.12.0

Corrected licenses for suckless software. Cross referenced against the appropriate package's page on https://git.suckless.org.

This patch should resolve #50883, at least partially

---
 gnu/packages/suckless.scm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm
index dbc3537ac6..c10a95e4b4 100644
--- a/gnu/packages/suckless.scm
+++ b/gnu/packages/suckless.scm
@@ -125,10 +125,7 @@ (define-public tabbed
 applications.  It was originally designed for surf but also usable with many
 other applications, i.e., st, uzbl, urxvt and xterm.")
     (license
-     ;; Dual-licensed.
-     (list
-      license:expat
-      license:x11))))
+     (list license:expat license:x11))))
 
 (define-public slstatus
   ;; No release tarballs yet.
@@ -272,7 +269,9 @@ (define-public dwm
      "dwm is a dynamic window manager for X.  It manages windows in tiled,
 monocle and floating layouts.  All of the layouts can be applied dynamically,
 optimising the environment for the application in use and the task performed.")
-    (license license:x11)))
+    (license
+     ;; Dual-licensed.
+     (list license:expat license:x11))))
 
 (define-public dmenu
   (package
@@ -303,7 +302,8 @@ (define-public dmenu
     (description
      "A dynamic menu for X, originally designed for dwm.  It manages large
 numbers of user-defined menu items efficiently.")
-    (license license:x11)))
+    (license
+     (list license:expat license:x11))))
 
 (define-public spoon
   (package
@@ -356,7 +356,7 @@ (define-public slock
     (synopsis "Simple X session lock")
     (description
      "Simple X session lock with trivial feedback on password entry.")
-    (license license:x11)))
+    (license (list license:expat license:x11))))
 
 (define-public st
   (package
@@ -396,7 +396,7 @@ (define-public st
 implements 256 colors, most VT10X escape sequences, utf8, X11 copy/paste,
 antialiased fonts (using fontconfig), fallback fonts, resizing, and line
 drawing.")
-    (license license:x11)))
+    (license (list license:expat license:x11))))
 
 (define-public xst
   (package
@@ -525,7 +525,7 @@ (define-public surf
 display websites and follow links.  It supports the XEmbed protocol which
 makes it possible to embed it in another application.  Furthermore, one can
 point surf to another URI by setting its XProperties.")
-    (license license:x11)))
+    (license (list license:expat license:x11))))
 
 (define-public sent
   (package
@@ -568,7 +568,7 @@ (define-public sent
 allows you to write down the presentation for a quick lightning talk within a
 few minutes.")
     (home-page "https://tools.suckless.org/sent/")
-    (license license:x11)))
+    (license license:isc)))
 
 (define-public wmname
   (package
@@ -598,7 +598,7 @@ (define-public wmname
 property of the root window similar to how @command{hostname} behaves.  It is
 useful for fixing problems with JDK versions and other broken programs
 assuming a reparenting window manager for instance.")
-    (license license:expat)))
+    (license (list license:expat license:x11))))
 
 (define-public xbattmon
   (package
@@ -1216,4 +1216,4 @@ (define-public svkbd
     (synopsis "Virtual on-screen keyboard")
     (description "svkbd is a simple virtual keyboard, intended to be used in
 environments, where no keyboard is available.")
-    (license license:expat)))
+    (license (list license:expat license:x11))))
--

Thanks,

Mike Delago

--- End Message ---

--- Begin Message --- Subject: Re: [bug#57190] [PATCH v2 1/5] gnu: Correct license for st. Date: Tue, 23 Apr 2024 14:49:25 +0100 User-agent: mu4e 1.12.2; emacs 29.3

Christina O'Donnell <cdo@mutix.org> writes:

> * gnu/packages/suckless.scm (st): Change license to x11 + expat.
>
> Change-Id: Iaaeae3761ad57175c5de8a36f5c8bb163c02f702
> ---
>  gnu/packages/suckless.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> I've re-rolled these,

Thanks both, since these commits are just changing metadata in a
repetitive way I squashed the changes in to a single commit and I've
pushed it to master as fca358e78f0602de25c399a9d5ab772270e091d7.

Chris

signature.asc
Description: PGP signature

--- End Message ---