[bug#51903] cmn license etc

[Guillaume Le Vaillant <glv@posteo.net>]

[-- Attachment #1.1: Type: text/plain, Size: 618 bytes --]

jgart <jgart@dismail.de> skribis:

> Hi everyone,
>
> It's great that this was able to be resolved.
>
> I'm looking forward to having a cmn package for guix.
>
> Guillaume would you be so kind to send your patch to Bill?
>
> Bill, would that be helpful?
>
> I can then update the guix package to use the newer version of cmn once it is released and avoid 
> having to patch the asd file.
>
> all the best,
>
> jgart

The patches I used are in attachment. Concerning the first one, it fixes
the type issue, but I don't know how to test wether running this code
produces a correct result or not.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-cmn-fix-type-issue.patch --]
[-- Type: text/x-patch, Size: 664 bytes --]

diff -Naur cmn/cmn2.lisp cmn-new/cmn2.lisp
--- cmn/cmn2.lisp	2019-01-01 15:40:00.000000000 +0100
+++ cmn-new/cmn2.lisp	2021-11-22 11:00:26.894007683 +0100
@@ -4156,7 +4156,7 @@
 			      (push (list object note-name) tied-to-notes)
 			      (format s "~%      (setf ~A ~A)" note-name (identify object)))
 			  (let ((tied-note-name (second (find (stem-tie object) tied-to-notes :test #'eq :key #'first)))
-				(tied-tag (find :tied-to (store-data object))))
+				(tied-tag (find :tied-to (store-data object) :key #'car)))
 			    (if (not tied-tag)
 				(push (list :tied-to tied-note-name) (store-data object))
 			      (setf (second tied-tag) tied-note-name))

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-cmn-asdf-system.patch --]
[-- Type: text/x-patch, Size: 1050 bytes --]

diff -Naur cmn/cmn.asd cmn-new/cmn.asd
--- cmn/cmn.asd	2021-11-21 15:06:47.000000000 +0100
+++ cmn-new/cmn.asd	2021-11-22 11:04:03.193342791 +0100
@@ -19,5 +19,25 @@
   :description "Common Music Notation"
   :author "William Schottstaedt <bil (at) ccmra (dot) stanford (dot) edu>"
   :licence "MIT"
-  :components ((:file "cmn-all" )))
-
+  :serial t
+  :components ((:file "cmn-init")
+               (:file "cmn-utils")
+               (:file "cmn-objects")
+               (:file "cmn0")
+               (:file "cmn-grfx")
+               (:file "cmn-glyphs")
+               (:file "cmn1")
+               (:file "cmn2")
+               (:file "cmn3")
+               (:file "cmn4")
+               (:file "rqq")
+               (:file "wedge")
+               (:file "accent")
+               (:file "pedal")
+               (:file "percussion")
+               (:file "ring")
+               (:file "rests")
+               (:file "lyrics")
+               (:file "transpose")
+               (:file "pmn")
+               (:file "quarter")))

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]