unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner)
@ 2019-09-02 16:16 raingloom via Guix-patches via
  2019-09-02 17:29 ` Nicolas Goaziou
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: raingloom via Guix-patches via @ 2019-09-02 16:16 UTC (permalink / raw)
  To: 37284

* gnu/packages/fmit.scm: created

---
 gnu/packages/fmit.scm | 64 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 gnu/packages/fmit.scm

diff --git a/gnu/packages/fmit.scm b/gnu/packages/fmit.scm
new file mode 100644
index 0000000000..2db5b1ca25
--- /dev/null
+++ b/gnu/packages/fmit.scm
@@ -0,0 +1,64 @@
+(define-module (gnu packages fmit)
+  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix licenses)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages algebra)
+  #:use-module (gnu packages audio)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages gettext))
+
+(define-public fmit
+  (package
+    (name "fmit")
+    (version "1.2.6")
+    (source (origin
+	      (method git-fetch)
+	      (uri (git-reference
+		    (url "https://github.com/gillesdegottex/fmit/")
+		    (commit (string-append "v" version))))
+	      (sha256 (base32 "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" out) (string-append "PREFIXSHORTCUT=" out)))
+       #:phases
+       (modify-phases %standard-phases
+	 (delete 'configure)
+	 (add-before 'build 'qmake
+	   (lambda _
+	     (let ((out (assoc-ref %outputs "out"))) (invoke "qmake" "fmit.pro" (string-append "PREFIX=" out) (string-append "PREFIXSHORTCUT=" out) "CONFIG+=acs_qt acs_alsa acs_jack acs_portaudio"))))
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/fmit")
+                 `("QT_PLUGIN_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/plugins"))
+                         '("qtbase" "qtmultimedia" "qtsvg")))
+                 `("QML2_IMPORT_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/qml"))
+                         '("qtmultimedia"))))
+               #t))))))
+    (inputs
+     `(("fftw" ,fftw)
+       ("portaudio" ,portaudio)
+       ("qtmultimedia" ,qtmultimedia)
+       ("qtsvg" ,qtsvg)
+       ("alsa-lib" ,alsa-lib)
+       ("jack" ,jack-1)
+       ("qtbase" ,qtbase)))
+    (native-inputs
+     `(("itstool" ,itstool)
+       ("qttools" ,qttools)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("gettext" ,gnu-gettext)))
+    (synopsis "Free Musical Instrument Tuner")
+    (description "FMIT is a graphical utility for tuning musical instruments, with error and volume history, and advanced features")
+    (home-page "http://gillesdegottex.github.io/fmit/")
+    (license gpl3+)))
--
2.23.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner)
  2019-09-02 16:16 [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner) raingloom via Guix-patches via
@ 2019-09-02 17:29 ` Nicolas Goaziou
  2019-09-03  1:13 ` raingloom via Guix-patches via
       [not found] ` <handler.37284.D37284.156793426311682.notifdone@debbugs.gnu.org>
  2 siblings, 0 replies; 8+ messages in thread
From: Nicolas Goaziou @ 2019-09-02 17:29 UTC (permalink / raw)
  To: 37284

Hello,

raingloom via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/fmit.scm: created

Thank you!

> ---
>  gnu/packages/fmit.scm | 64 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 64 insertions(+)
>  create mode 100644 gnu/packages/fmit.scm
>
> diff --git a/gnu/packages/fmit.scm b/gnu/packages/fmit.scm

Is there any reason to create a new module instead of putting the
package into "music.scm"?

> +    (arguments
> +     '(#:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "PREFIX=" out) (string-append "PREFIXSHORTCUT=" out)))

This line is too long. Moreover, I think "PREFIX=" is not necessary, as
Guix adds it automatically. I'm not sure about "PREFIXSHORTCUT=", tho.

It seems PREFIX and PREFIXSHORTCUT are used in qmake, not in make, so it
may be possible to remove the whole #:make-flags altogether. WDYT?

> +       #:phases
> +       (modify-phases %standard-phases
> +	 (delete 'configure)

Indentation looks wrong. Could you take care about it?

> +	 (add-before 'build 'qmake
> +	   (lambda _
> + (let ((out (assoc-ref %outputs "out"))) (invoke "qmake" "fmit.pro"
> (string-append "PREFIX=" out) (string-append "PREFIXSHORTCUT=" out)
> "CONFIG+=acs_qt acs_alsa acs_jack acs_portaudio"))))

The line is too long. I suggest:

  (let ((out (assoc-ref %outputs "out")))
    (invoke "qmake"
            "fmit.pro"
            (string-append "PREFIX=" out)
            (string-append "PREFIXSHORTCUT=" out)
            "CONFIG+=acs_qt acs_alsa acs_jack acs_portaudio"))

> +    (inputs
> +     `(("fftw" ,fftw)
> +       ("portaudio" ,portaudio)
> +       ("qtmultimedia" ,qtmultimedia)
> +       ("qtsvg" ,qtsvg)
> +       ("alsa-lib" ,alsa-lib)
> +       ("jack" ,jack-1)
> +       ("qtbase" ,qtbase)))
> +    (native-inputs
> +     `(("itstool" ,itstool)
> +       ("qttools" ,qttools)
> +       ("hicolor-icon-theme" ,hicolor-icon-theme)
> +       ("gettext" ,gnu-gettext)))

Could you re-order (native-)inputs alphabetically?

> +    (synopsis "Free Musical Instrument Tuner")

I understand Free is the F from FMIT, but, as a synopsis, I don't think
it brings much value. Maybe "Musical instrument tuner" is enough?

> +    (description "FMIT is a graphical utility for tuning musical instruments, with error and volume history, and advanced features")
> +    (home-page "http://gillesdegottex.github.io/fmit/")

Prefer https:// here.

> +    (license gpl3+)))

If you move it to music.scm, I believe it should be prefixed with
license:

Also, the license seems wrong, it should be (list license:gpl2+
license:lgpl2.1) with a comment explaining that most of the code is
under GPL2+, but some abstract or helper classes are under LGPL2.1.

Regards,

-- 
Nicolas Goaziou

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner)
  2019-09-02 16:16 [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner) raingloom via Guix-patches via
  2019-09-02 17:29 ` Nicolas Goaziou
@ 2019-09-03  1:13 ` raingloom via Guix-patches via
  2019-09-04 16:01   ` Nicolas Goaziou
       [not found] ` <handler.37284.D37284.156793426311682.notifdone@debbugs.gnu.org>
  2 siblings, 1 reply; 8+ messages in thread
From: raingloom via Guix-patches via @ 2019-09-03  1:13 UTC (permalink / raw)
  To: mail@nicolasgoaziou.fr; +Cc: 37284@debbugs.gnu.org

Thanks for the suggestions!
How about this attempt?

Also, is this how i reply to an issue? I didn't see your email in my inbox (yet?), only on the web interface. Do I also have to subscribe to the guix-patches mailing list?

---
 gnu/packages/music.scm | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index d4aaecc1e2..a9770f4f16 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4483,3 +4483,62 @@ discard bad quality ones.
 controller.")
     (home-page "https://github.com/charlesfleche/lpd8editor")
     (license license:expat)))
+
+(define-public fmit
+  (package
+    (name "fmit")
+    (version "1.2.6")
+    (source (origin
+	      (method git-fetch)
+	      (uri (git-reference
+		    (url "https://github.com/gillesdegottex/fmit/")
+		    (commit (string-append "v" version))))
+	      (sha256 (base32 "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+	 (delete 'configure)
+	 (add-before 'build 'qmake
+	   (lambda _
+	     (let ((out (assoc-ref %outputs "out")))
+               (invoke "qmake"
+                       "fmit.pro"
+                       (string-append "PREFIX=" out)
+                       (string-append "PREFIXSHORTCUT=" out)
+                       "CONFIG+=acs_qt acs_alsa acs_jack acs_portaudio"))))
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/fmit")
+                 `("QT_PLUGIN_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/plugins"))
+                         '("qtbase" "qtmultimedia" "qtsvg")))
+                 `("QML2_IMPORT_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/qml"))
+                         '("qtmultimedia"))))
+               #t))))))
+    (inputs
+     `(("fftw" ,fftw)
+       ("portaudio" ,portaudio)
+       ("qtmultimedia" ,qtmultimedia)
+       ("qtsvg" ,qtsvg)
+       ("alsa-lib" ,alsa-lib)
+       ("jack" ,jack-1)
+       ("qtbase" ,qtbase)))
+    (native-inputs
+     `(("gettext" ,gnu-gettext)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("itstool" ,itstool)
+       ("qttools" ,qttools)))
+    (synopsis "Musical Instrument Tuner")
+    (description
+     "FMIT is a graphical utility for tuning musical instruments,
+with error and volume history, and advanced features")
+    (home-page "https://gillesdegottex.github.io/fmit/")
+    ;; most of the code is under GPL2+, but some abstract or helper classes are under LGPL2.1
+    (license (list license:gpl2+ license:lgpl2.1))))
--
2.23.0

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner)
  2019-09-03  1:13 ` raingloom via Guix-patches via
@ 2019-09-04 16:01   ` Nicolas Goaziou
  2019-09-07 22:12     ` raingloom via Guix-patches via
  0 siblings, 1 reply; 8+ messages in thread
From: Nicolas Goaziou @ 2019-09-04 16:01 UTC (permalink / raw)
  To: raingloom; +Cc: 37284@debbugs.gnu.org

Hello,

raingloom <raingloom@protonmail.com> writes:

> Thanks for the suggestions!
> How about this attempt?

Better, indeed. I have a couple more comments, if you don't mind.
I think I will be able to commit it at next iteration.

> Also, is this how i reply to an issue? 

Like you did.

> Do I also have to subscribe to the guix-patches mailing list?

I don't think so.

> ---
>  gnu/packages/music.scm | 59 ++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 59 insertions(+)
>
> diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> index d4aaecc1e2..a9770f4f16 100644
> --- a/gnu/packages/music.scm
> +++ b/gnu/packages/music.scm
> @@ -4483,3 +4483,62 @@ discard bad quality ones.
>  controller.")
>      (home-page "https://github.com/charlesfleche/lpd8editor")
>      (license license:expat)))

Could you add a proper commit message to the patch ? It would look like:

* gnu/packages/music.scm (fmit): New variable.

Also, could you add yourself to the copyright line at the top of the
"music.scm" file?

> +(define-public fmit
> +  (package
> +    (name "fmit")
> +    (version "1.2.6")
> +    (source (origin
> +	      (method git-fetch)
> +	      (uri (git-reference
> +		    (url "https://github.com/gillesdegottex/fmit/")
> +		    (commit (string-append "v" version))))

You need to add the following line here:

    (file-name (git-file-name name version))

> +	      (sha256 (base32 "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))

This line is too long, you ought to use

    (sha256 
     (base32
      "..."))

> +    (inputs
> +     `(("fftw" ,fftw)
> +       ("portaudio" ,portaudio)
> +       ("qtmultimedia" ,qtmultimedia)
> +       ("qtsvg" ,qtsvg)
> +       ("alsa-lib" ,alsa-lib)
> +       ("jack" ,jack-1)
> +       ("qtbase" ,qtbase)))
> +    (native-inputs
> +     `(("gettext" ,gnu-gettext)
> +       ("hicolor-icon-theme" ,hicolor-icon-theme)
> +       ("itstool" ,itstool)
> +       ("qttools" ,qttools)))

You forgot to re-order inputs alphabetically.

> +    (synopsis "Musical Instrument Tuner")

I don't think title case is warranted here. "Musical instrument tuner"
is enough, IMO.

> +    (description
> +     "FMIT is a graphical utility for tuning musical instruments,
> +with error and volume history, and advanced features")

Please move the string so that it starts on the same line as
"(description ".  Also, it is missing a final dot.

> +    (home-page "https://gillesdegottex.github.io/fmit/")
> +    ;; most of the code is under GPL2+, but some abstract or helper
> classes are under LGPL2.1

  ;; Most of ... under LGPL2.1.

i.e., missing capital and the final full stop.

Could you send an updated patch? Thank you!

Regards,

-- 
Nicolas Goaziou

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner)
  2019-09-04 16:01   ` Nicolas Goaziou
@ 2019-09-07 22:12     ` raingloom via Guix-patches via
  2019-09-08  9:17       ` bug#37284: " Nicolas Goaziou
  0 siblings, 1 reply; 8+ messages in thread
From: raingloom via Guix-patches via @ 2019-09-07 22:12 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: 37284\@debbugs.gnu.org

[-- Attachment #1: Type: text/plain, Size: 3539 bytes --]

Hey!
Updated again. Is sending it as an attachment fine?

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Wednesday, September 4, 2019 4:01 PM, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:

> Hello,
>
> raingloom raingloom@protonmail.com writes:
>
> > Thanks for the suggestions!
> > How about this attempt?
>
> Better, indeed. I have a couple more comments, if you don't mind.
> I think I will be able to commit it at next iteration.
>
> > Also, is this how i reply to an issue?
>
> Like you did.
>
> > Do I also have to subscribe to the guix-patches mailing list?
>
> I don't think so.
>
> > gnu/packages/music.scm | 59 ++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 59 insertions(+)
> > diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
> > index d4aaecc1e2..a9770f4f16 100644
> > --- a/gnu/packages/music.scm
> > +++ b/gnu/packages/music.scm
> > @@ -4483,3 +4483,62 @@ discard bad quality ones.
> > controller.")
> > (home-page "https://github.com/charlesfleche/lpd8editor")
> > (license license:expat)))
>
> Could you add a proper commit message to the patch ? It would look like:
>
> -   gnu/packages/music.scm (fmit): New variable.
>
>     Also, could you add yourself to the copyright line at the top of the
>     "music.scm" file?
>
>
> > +(define-public fmit
> >
> > -   (package
> > -   (name "fmit")
> > -   (version "1.2.6")
> > -   (source (origin
> > -         (method git-fetch)
> >
> >
> > -         (uri (git-reference
> >
> >
> > -           (url "https://github.com/gillesdegottex/fmit/")
> >
> >
> > -           (commit (string-append "v" version))))
> >
> >
>
> You need to add the following line here:
>
> (file-name (git-file-name name version))
>
> > -         (sha256 (base32 "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))
> >
> >
>
> This line is too long, you ought to use
>
> (sha256
> (base32
> "..."))
>
> > -   (inputs
> > -       `(("fftw" ,fftw)
> >
> >
> > -         ("portaudio" ,portaudio)
> >
> >
> > -         ("qtmultimedia" ,qtmultimedia)
> >
> >
> > -         ("qtsvg" ,qtsvg)
> >
> >
> > -         ("alsa-lib" ,alsa-lib)
> >
> >
> > -         ("jack" ,jack-1)
> >
> >
> > -         ("qtbase" ,qtbase)))
> >
> >
> > -   (native-inputs
> > -       `(("gettext" ,gnu-gettext)
> >
> >
> > -         ("hicolor-icon-theme" ,hicolor-icon-theme)
> >
> >
> > -         ("itstool" ,itstool)
> >
> >
> > -         ("qttools" ,qttools)))
> >
> >
>
> You forgot to re-order inputs alphabetically.
>
> > -   (synopsis "Musical Instrument Tuner")
>
> I don't think title case is warranted here. "Musical instrument tuner"
> is enough, IMO.
>
> > -   (description
> > -       "FMIT is a graphical utility for tuning musical instruments,
> >
> >
> >
> > +with error and volume history, and advanced features")
>
> Please move the string so that it starts on the same line as
> "(description ". Also, it is missing a final dot.
>
> > -   (home-page "https://gillesdegottex.github.io/fmit/")
> > -   ;; most of the code is under GPL2+, but some abstract or helper
> >     classes are under LGPL2.1
> >
>
> ;; Most of ... under LGPL2.1.
>
> i.e., missing capital and the final full stop.
>
> Could you send an updated patch? Thank you!
>
> Regards,
>
> ---------------------------------------------------------------------------------------------------------------------------------------
>
> Nicolas Goaziou



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-packages-music.scm-fmit-New-variable.patch --]
[-- Type: text/x-patch; name="0001-gnu-packages-music.scm-fmit-New-variable.patch", Size: 3048 bytes --]

From 3ddc9c6b62f61993f4c47c071a4c211997366eb3 Mon Sep 17 00:00:00 2001
From: raingloom <raingloom@protonmail.com>
Date: Mon, 2 Sep 2019 15:44:15 +0200
Subject: [PATCH] * gnu/packages/music.scm (fmit): New variable.

---
 gnu/packages/music.scm | 59 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index d4aaecc1e2..a9770f4f16 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4483,3 +4483,62 @@ discard bad quality ones.
 controller.")
     (home-page "https://github.com/charlesfleche/lpd8editor")
     (license license:expat)))
+
+(define-public fmit
+  (package
+    (name "fmit")
+    (version "1.2.6")
+    (source (origin
+	      (method git-fetch)
+	      (uri (git-reference
+		    (url "https://github.com/gillesdegottex/fmit/")
+		    (commit (string-append "v" version))))
+	      (sha256 (base32 "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+	 (delete 'configure)
+	 (add-before 'build 'qmake
+	   (lambda _
+	     (let ((out (assoc-ref %outputs "out")))
+               (invoke "qmake"
+                       "fmit.pro"
+                       (string-append "PREFIX=" out)
+                       (string-append "PREFIXSHORTCUT=" out)
+                       "CONFIG+=acs_qt acs_alsa acs_jack acs_portaudio"))))
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/fmit")
+                 `("QT_PLUGIN_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/plugins"))
+                         '("qtbase" "qtmultimedia" "qtsvg")))
+                 `("QML2_IMPORT_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/qml"))
+                         '("qtmultimedia"))))
+               #t))))))
+    (inputs
+     `(("fftw" ,fftw)
+       ("portaudio" ,portaudio)
+       ("qtmultimedia" ,qtmultimedia)
+       ("qtsvg" ,qtsvg)
+       ("alsa-lib" ,alsa-lib)
+       ("jack" ,jack-1)
+       ("qtbase" ,qtbase)))
+    (native-inputs
+     `(("gettext" ,gnu-gettext)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("itstool" ,itstool)
+       ("qttools" ,qttools)))
+    (synopsis "Musical Instrument Tuner")
+    (description
+     "FMIT is a graphical utility for tuning musical instruments,
+with error and volume history, and advanced features")
+    (home-page "https://gillesdegottex.github.io/fmit/")
+    ;; most of the code is under GPL2+, but some abstract or helper classes are under LGPL2.1
+    (license (list license:gpl2+ license:lgpl2.1))))
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* bug#37284: [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner)
  2019-09-07 22:12     ` raingloom via Guix-patches via
@ 2019-09-08  9:17       ` Nicolas Goaziou
  2019-09-08  9:25         ` [bug#37284] " raingloom via Guix-patches via
  0 siblings, 1 reply; 8+ messages in thread
From: Nicolas Goaziou @ 2019-09-08  9:17 UTC (permalink / raw)
  To: raingloom; +Cc: 37284-done

Hello,

raingloom <raingloom@protonmail.com> writes:

> Updated again. Is sending it as an attachment fine?

Well, oddly, it seems that your update addressed only one of my
suggestions. So, I applied your patch with the following changes:

- fixed the commit message,
- added a copyright line,
- added the (file-name ...) line,
- split the (sha256 ...) line,
- re-ordered the inputs,
- changed case in synopsis,
- fixed typographic mistakes in the description and the licenses
  comments.

Let me know if something is wrong, in particular the copyright line,
which I add to guess.

Thank you for your contribution!

Regards,

-- 
Nicolas Goaziou

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#37284] closed (Re: [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner))
       [not found] ` <handler.37284.D37284.156793426311682.notifdone@debbugs.gnu.org>
@ 2019-09-08  9:22   ` raingloom via Guix-patches via
  0 siblings, 0 replies; 8+ messages in thread
From: raingloom via Guix-patches via @ 2019-09-08  9:22 UTC (permalink / raw)
  To: 37284@debbugs.gnu.org

> 37284: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37284
> GNU Bug Tracking System
> Contact help-debbugs@gnu.org with problems
> Hello,
>
> raingloom raingloom@protonmail.com writes:
>
> > Updated again. Is sending it as an attachment fine?
>
> Well, oddly, it seems that your update addressed only one of my
> suggestions.

That's be weird indeed, I'm pretty sure I went through all of them.... ah. Ahh heck. Forgot to commit. >_>
Git is confusing.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner)
  2019-09-08  9:17       ` bug#37284: " Nicolas Goaziou
@ 2019-09-08  9:25         ` raingloom via Guix-patches via
  0 siblings, 0 replies; 8+ messages in thread
From: raingloom via Guix-patches via @ 2019-09-08  9:25 UTC (permalink / raw)
  To: Nicolas Goaziou; +Cc: 37284-done@debbugs.gnu.org

[-- Attachment #1: Type: text/plain, Size: 1049 bytes --]

Yep, looks like I _thought_ I used `git commit -a --amend` but I forgot the -a. *facepalm*
Here is what I actually wanted to send.

‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Sunday, September 8, 2019 9:17 AM, Nicolas Goaziou <mail@nicolasgoaziou.fr> wrote:

> Hello,
>
> raingloom raingloom@protonmail.com writes:
>
> > Updated again. Is sending it as an attachment fine?
>
> Well, oddly, it seems that your update addressed only one of my
> suggestions. So, I applied your patch with the following changes:
>
> -   fixed the commit message,
> -   added a copyright line,
> -   added the (file-name ...) line,
> -   split the (sha256 ...) line,
> -   re-ordered the inputs,
> -   changed case in synopsis,
> -   fixed typographic mistakes in the description and the licenses
>     comments.
>
>     Let me know if something is wrong, in particular the copyright line,
>     which I add to guess.
>
>     Thank you for your contribution!
>
>     Regards,
>
>     --
>     Nicolas Goaziou
>



[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-packages-music.scm-fmit-New-variable.patch --]
[-- Type: text/x-patch; name="0001-gnu-packages-music.scm-fmit-New-variable.patch", Size: 3458 bytes --]

From 0bbe19a1d37c981f699d4681e237aadc61089c90 Mon Sep 17 00:00:00 2001
From: raingloom <raingloom@protonmail.com>
Date: Mon, 2 Sep 2019 15:44:15 +0200
Subject: [PATCH] * gnu/packages/music.scm (fmit): New variable.

---
 gnu/packages/music.scm | 62 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index d4aaecc1e2..0e0ead5229 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2019 Gabriel Hondet <gabrielhondet@gmail.com>
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2019 Jakob L. Kreuze <zerodaysfordays@sdf.lonestar.org>
+;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4483,3 +4484,64 @@ discard bad quality ones.
 controller.")
     (home-page "https://github.com/charlesfleche/lpd8editor")
     (license license:expat)))
+
+(define-public fmit
+  (package
+    (name "fmit")
+    (version "1.2.6")
+    (source (origin
+	      (method git-fetch)
+	      (uri (git-reference
+		    (url "https://github.com/gillesdegottex/fmit/")
+		    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+	      (sha256
+               (base32
+                "03nzkig5mw2rqwhwmg0qvc5cnk9bwh2wp13jh0mdrr935w0587mz"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+	 (delete 'configure)
+	 (add-before 'build 'qmake
+	   (lambda _
+	     (let ((out (assoc-ref %outputs "out")))
+               (invoke "qmake"
+                       "fmit.pro"
+                       (string-append "PREFIX=" out)
+                       (string-append "PREFIXSHORTCUT=" out)
+                       "CONFIG+=acs_qt acs_alsa acs_jack acs_portaudio"))))
+         (add-after 'install 'wrap-executable
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (wrap-program (string-append out "/bin/fmit")
+                 `("QT_PLUGIN_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/plugins"))
+                         '("qtbase" "qtmultimedia" "qtsvg")))
+                 `("QML2_IMPORT_PATH" ":" prefix
+                   ,(map (lambda (label)
+                           (string-append (assoc-ref inputs label)
+                                          "/lib/qt5/qml"))
+                         '("qtmultimedia"))))
+               #t))))))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("fftw" ,fftw)
+       ("jack" ,jack-1)
+       ("portaudio" ,portaudio)
+       ("qtbase" ,qtbase)
+       ("qtmultimedia" ,qtmultimedia)
+       ("qtsvg" ,qtsvg)))
+    (native-inputs
+     `(("gettext" ,gnu-gettext)
+       ("hicolor-icon-theme" ,hicolor-icon-theme)
+       ("itstool" ,itstool)
+       ("qttools" ,qttools)))
+    (synopsis "Musical instrument tuner")
+    (description "FMIT is a graphical utility for tuning musical instruments,
+with error and volume history, and advanced features.")
+    (home-page "https://gillesdegottex.github.io/fmit/")
+    ;; Most of the code is under GPL2+, but some abstract or helper classes are under LGPL2.1.
+    (license (list license:gpl2+ license:lgpl2.1))))
-- 
2.23.0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2019-09-08  9:26 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-09-02 16:16 [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner) raingloom via Guix-patches via
2019-09-02 17:29 ` Nicolas Goaziou
2019-09-03  1:13 ` raingloom via Guix-patches via
2019-09-04 16:01   ` Nicolas Goaziou
2019-09-07 22:12     ` raingloom via Guix-patches via
2019-09-08  9:17       ` bug#37284: " Nicolas Goaziou
2019-09-08  9:25         ` [bug#37284] " raingloom via Guix-patches via
     [not found] ` <handler.37284.D37284.156793426311682.notifdone@debbugs.gnu.org>
2019-09-08  9:22   ` [bug#37284] closed (Re: [bug#37284] [PATCH] added gnu/packages/fmit.scm (Free Musical Instrument Tuner)) raingloom via Guix-patches via

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).