From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kei Kebreau Subject: Re: [PATCH] gnu: Add denemo. Date: Fri, 09 Dec 2016 22:09:02 -0500 Message-ID: <87twaciipd.fsf@openmailbox.org> References: <87r35ikzjw.fsf@openmailbox.org> <87eg1g7p8n.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55700) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cFY2P-0005mS-Pd for guix-devel@gnu.org; Fri, 09 Dec 2016 22:09:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cFY2M-0008Lg-JF for guix-devel@gnu.org; Fri, 09 Dec 2016 22:09:25 -0500 In-Reply-To: <87eg1g7p8n.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Fri, 09 Dec 2016 22:43:20 +0100") List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: guix-devel@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Kei Kebreau skribis: > >> Here is an updated patch for GNU Denemo. > > Nice work! > Thank you! :) >> Everything seems fine except for grafting (i.e. disabling grafting >> renders the issue invisible). For some reason, "find-files" >> does not recognize a file with a Unicode-encoded filename when called >> inside "rename-matching-files" from guix/build/graft.scm. When >> "find-files" is used on its own, the file is recognized properly. >> Is anyone familiar with the grafting code available to help figure out >> what is happening to the file name? > > Problem is that the grafting code (=E2=80=98graft-derivation/shallow=E2= =80=99 in (guix > grafts)) is running in the C locale, so it expects file names to be > ASCII. I=E2=80=99ll look into it. > I saw your email about renaming the file with the Unicode name. Your method worked fine. > Some comments on the package: > >> From 6bd5843bef06a02ecf1235090350562c8b096aca Mon Sep 17 00:00:00 2001 >> From: Kei Kebreau >> Date: Thu, 8 Dec 2016 14:00:43 -0500 >> Subject: [PATCH] gnu: Add denemo. >> >> * gnu/packages/music.scm (denemo): New variable. > > [...] > >> + (arguments >> + `(#:phases >> + (modify-phases %standard-phases >> + (replace 'check >> + (lambda _ >> + (zero? (system* "make" "-C" "tests" "check"))))))) > > Is this really needed? Perhaps leave a comment explaining whether/why > =E2=80=9Cmake check=E2=80=9D at the top level is broken (and perhaps repo= rt it as a bug > upstream!). > Maybe because upstream doesn't test it? Denemo documentation says to use this command to run the testsuite (http://denemo.org/hacking-sources/#Test_suite). I've added a comment explaining that. >> + (native-inputs >> + `(("autoconf" ,autoconf) >> + ("automake" ,automake) > > This is not needed (or it=E2=80=99s a bug too ;-)). > Indeed it is not. I've removed these inputs from the new patch. As a side note, lilypond was required as a runtime dependency so I moved it to propagated-inputs. >> + (license (list license:cc-by-sa3.0 >> + license:lgpl2.1+ >> + license:gpl2 >> + license:gpl2+ >> + license:gpl3 >> + license:gpl3+)))) > > I think =E2=80=98gpl3+=E2=80=99 is enough here since it =E2=80=9Cwins=E2= =80=9D. You can leave a comment > explaining where the other licenses appear, though. > Looking over the plethora of libre licenses included in the source, I decided to just use the overarching gpl3+ from COPYING. > Thanks! > Thank you for the review! The new patch is attached. > Ludo=E2=80=99. --=-=-= Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-denemo.patch Content-Transfer-Encoding: quoted-printable From=20656a59ee358362a9c3ec9b98f8e1a8cd1dc28b7f Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Fri, 9 Dec 2016 21:58:08 -0500 Subject: [PATCH] gnu: Add denemo. * gnu/packages/music.scm (denemo): New variable. =2D-- gnu/packages/music.scm | 68 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 68 insertions(+) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 34beb09f4..116e8d482 100644 =2D-- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -231,6 +231,74 @@ score, keyboard, guitar, drum and controller views.") many input formats and provides a customisable Vi-style user interface.") (license license:gpl2+))) =20 +(define-public denemo + (package + (name "denemo") + (version "2.0.14") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/denemo/denemo-" + version ".tar.gz")) + (sha256 + (base32 + "1a7g38695g7jjypx25qp0dx0asrh72xwdj0mdhmb9pfyzlppq0wh")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (replace 'check + ;; Denemo's documentation says to use this command to run its + ;; testsuite. + (lambda _ + (zero? (system* "make" "-C" "tests" "check")))) + (add-after 'install 'correct-filename + ;; "graft-derivation/shallow" from the (guix grafts) module run= s in + ;; the C locale, expecting file names to be ASCII encoded. This + ;; phase renames a filename with a Unicode character in it to m= eet + ;; the aforementioned condition. + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (chdir (string-append + out + "/share/denemo/templates/instruments/woodwind")) + (rename-file "Clarinet in B=E2=99=AD.denemo" + "Clarinet in Bb.denemo")) + #t))))) + (native-inputs + `(("glib:bin", glib "bin") ; for gtester + ("pkg-config" ,pkg-config))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("aubio" ,aubio) + ("evince" ,evince) + ("fftw" ,fftw) + ("fluidsynth" ,fluidsynth) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("gtk-doc" ,gtk-doc) + ("gtksourceview" ,gtksourceview) + ("guile" ,guile-2.0) + ("intltool" ,intltool) + ("librsvg" ,librsvg) + ("libsndfile" ,libsndfile) + ("libtool" ,libtool) + ("libxml2" ,libxml2) + ("portaudio" ,portaudio) + ("portmidi" ,portmidi) + ("rubberband" ,rubberband))) + (propagated-inputs + `(("lilypond", lilypond))) + (synopsis "Graphical music notation, front-end to GNU Lilypond") + (description + "GNU Denemo is a music notation editor that provides a convenient +interface to the powerful music engraving program Lilypond. Music can be +typed in using the computer keyboard, played in using a MIDI keyboard, or +even input via a microphone connected to the sound card. The final product +is publication-quality music notation that is continuously generated in the +background while you work.") + (home-page "http://www.denemo.org") + (license license:gpl3+))) + (define-public hydrogen (package (name "hydrogen") =2D-=20 2.11.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlhLcc4ACgkQ5qXuPBlG eg18yA//ex39DIzIZNq5EL/UbIEUQfgJnCjBx+eczCPUaJfXrYlwmInygVseh5yU RLcAcGLnievXdnvpLhlpCFRGPYxwm2fqTDsBNHli45JBKJijwsoWt3WdPnP9qQZj PKQF+9VgiZJv51d566cWbCcbk9cSyQAF7SRdMq77/j/2kwbtU+7cxbGZ//xoYdV+ Ys/szmBd6GBY+/EXy8wSrOc1arIRlVLClYDx4EJuNpTBo84bmZACm+wODXQwUKE4 6EswhU0DpTSUVTsI7SavwVR+Q0z6c7BF66IWe/1X+y/qv2FvrPugTBx7/0CvINed s9jWrkzmeFf3Hao6k7g8uEvr3303MU4cFgFqz869Ig3EgggamCzKZ3ixYj7hRux4 Flr6z6DKxj7aSDuQvoJu4FrN4RJaJQdTrSLzRLTDY2sldAX7mAw/c/d506dCMyNQ fEj3xKTwplWysdb8v66Qhkqx9DhjUALI2V/IpH0AM9decITxfB+W6s7mnKGG0Tyj VCL1XDTcbIYx9HL63hpdVTXU5bBW0POsPDWmNhI4KMsMZjt3DtYxbVUEAQmkiW69 S0fmyUKav6QUsh0vPn8LY/3Vf+v8XQirofSNR+7IarxBjU9QEIHWptOpOY77364+ FH783BVn/ELVGtkH7jg0bwLP1WwCaimzlquu8BHeDA9cYNrd6Pc= =ROkx -----END PGP SIGNATURE----- --==-=-=--