[bug#40320] [PATCH 1/2] gnu: Add libqalculate

[bug#40320] [PATCH 1/2] gnu: Add libqalculate

[R Veera Kumar]

Libqalculate is a multi-purpose cli desktop calculator and library.
It provides basic and advanced functionality.

Signed-off-by: R Veera Kumar <vkor@vkten.in>
---
 gnu/packages/maths.scm | 57 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 028f0e6ef9..1fa1d493fb 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -79,6 +79,7 @@
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fontutils)
@@ -86,8 +87,10 @@
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages java)
   #:use-module (gnu packages less)
@@ -5319,3 +5322,57 @@ researchers and developers alike to get started on SAT.")
       (home-page
        "http://minisat.se/MiniSat.html")
       (license license:expat))))
+
+(define-public libqalculate
+  (let ((commit "90b52e685c1b0575558c5dd449dde71c313d084a")
+        (revision "1"))
+    (package
+      (name "libqalculate")
+      (version (git-version "3.8.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Qalculate/libqalculate/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"))))
+      (build-system gnu-build-system)
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("intltool" ,intltool)
+         ("automake" ,automake)
+         ("autoconf" ,autoconf)
+         ("libtool" ,libtool)
+         ("m4" ,m4)
+         ("doxygen" ,doxygen)
+         ("file" ,file)))
+      (inputs
+       `(("gmp" ,gmp)
+         ("mpfr" ,mpfr)
+         ("libxml2" ,libxml2)
+         ("curl" ,curl)
+         ("icu4c" ,icu4c)
+         ("gettext" ,gettext-minimal)
+         ("gnuplot" ,gnuplot)
+         ("readline" ,readline)
+         ("libiconv" ,libiconv)))
+      (arguments
+       `( #:phases
+         (modify-phases %standard-phases
+           (delete 'bootstrap) ;; fails in autogen.sh
+           (add-before 'configure 'autogen
+             (lambda _
+               (setenv "NOCONFIGURE" "TRUE")
+               (invoke "./autogen.sh"))))))
+      (home-page "https://qalculate.github.io/")
+      (synopsis "Multi-purpose cli desktop calculator and library")
+      (description
+       "Libqalculate is a multi-purpose cli desktop calculator and library.
+It provides basic and advanced functionality.  Features include customizable
+functions, unit calculations, and conversions, physical constants, symbolic
+calculations (including integrals and equations), arbitrary precision,
+uncertainity propagation, interval arithmetic, plotting and a user-friendly
+cli.")
+      (license license:gpl2+))))
-- 
2.26.0

[bug#40320] [PATCH 2/2] gnu: Add qalculate-gtk

[R Veera Kumar]

Qalculate-gtk is the GTK frontend for libqalculate.
It is a multi-purpose GUI desktop calculator.
It provides basic and advanced functionality.

Signed-off-by: R Veera Kumar <vkor@vkten.in>
---
 gnu/packages/maths.scm | 55 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 1fa1d493fb..4716129f98 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -62,6 +62,7 @@
   #:use-module (guix utils)
   #:use-module ((guix build utils) #:select (alist-replace))
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system ruby)
@@ -5376,3 +5377,57 @@ calculations (including integrals and equations), arbitrary precision,
 uncertainity propagation, interval arithmetic, plotting and a user-friendly
 cli.")
       (license license:gpl2+))))
+
+(define-public qalculate-gtk
+  (let ((commit "87f78ab3d7ed0dedf56edc38242d559ac07b1330")
+        (revision "1"))
+    (package
+      (name "qalculate-gtk")
+      (version (git-version "3.8.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/Qalculate/qalculate-gtk/")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840"))))
+      (build-system glib-or-gtk-build-system)
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("intltool" ,intltool)
+         ("automake" ,automake)
+         ("autoconf" ,autoconf)
+         ("libtool" ,libtool)
+         ("file" ,file)
+         ("m4" ,m4)))
+      (inputs
+       `(("gmp" ,gmp)
+         ("mpfr" ,mpfr)
+         ("libqalculate" ,libqalculate)
+         ("libxml2" ,libxml2)
+         ("glib" ,glib)
+         ("gtk+" ,gtk+)))
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           (delete 'bootstrap) ;; fails in autogen.sh
+           (add-before 'configure 'autogen
+             (lambda _
+               (setenv "NOCONFIGURE" "TRUE")
+               (invoke "./autogen.sh")))
+           (add-before 'check 'update-po-files ;; to pass po check
+             (lambda _
+               (with-output-to-file "po/POTFILES.skip"
+                 (lambda _ (format #t "data/shortcuts.ui~%"))))))))
+      (home-page "https://qalculate.github.io/")
+      (synopsis "Multi-purpose graphical desktop calculator")
+      (description
+       "Qalculate-gtk is the GTK frontend for libqalculate.  It is a
+multi-purpose GUI desktop calculator.  It provides basic and advanced
+functionality.  Features include customizable functions, unit calculations,
+and conversions, physical constants, symbolic calculations (including
+integrals and equations), arbitrary precision, uncertainity propagation,
+interval arithmetic, plotting and a user-friendly cli.")
+      (license license:gpl2+))))
-- 
2.26.0

[bug#40320] [PATCH 2/2] gnu: Add qalculate-gtk

[Danny Milosavljevic]

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

> +  (let ((commit "87f78ab3d7ed0dedf56edc38242d559ac07b1330")
> +        (revision "1"))
> +    (package
> +      (name "qalculate-gtk")
> +      (version (git-version "3.8.0" revision commit))

Same as in libqalculate, please use the git tag "v3.8.0" instead.

> +         ("automake" ,automake)
> +         ("autoconf" ,autoconf)

Why?

> +           (add-before 'check 'update-po-files ;; to pass po check

Please use just one semicolon for this kind of comment.
Maybe also include the error message one would get otherwise, as a comment.

> +             (lambda _
> +               (with-output-to-file "po/POTFILES.skip"
> +                 (lambda _ (format #t "data/shortcuts.ui~%"))))))))

Please end the phase in #t.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40320] [PATCH 1/2] gnu: Add libqalculate

[Danny Milosavljevic]

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

Hi Veera,

thanks for the patch!

I have a few suggestions:

On Mon, 30 Mar 2020 10:52:23 +0530
R Veera Kumar <vkor@vkten.in> wrote:

> +(define-public libqalculate
> +  (let ((commit "90b52e685c1b0575558c5dd449dde71c313d084a")
> +        (revision "1"))

According to github[1], this seems to be the tag "v3.8.0".

> +      (version (git-version "3.8.0" revision commit))

... so please just use (version "3.8.0")

> +               (commit commit)

... and (commit (string-append "v" version))

> +         ("automake" ,automake)
> +         ("autoconf" ,autoconf)

It's unusual to need those in a release.  Why are they necessary?

> +      (arguments
> +       `( #:phases
> +         (modify-phases %standard-phases
> +           (delete 'bootstrap) ;; fails in autogen.sh
> +           (add-before 'configure 'autogen

Why not just (replace 'bootstrap
 ...
) ?

>+      (synopsis "Multi-purpose cli desktop calculator and library")
> +      (description
> +       "Libqalculate is a multi-purpose cli desktop calculator and library.
> +It provides basic and advanced functionality.  Features include customizable
> +functions, unit calculations, and conversions, physical constants, symbolic
> +calculations (including integrals and equations), arbitrary precision,
> +uncertainity propagation, interval arithmetic, plotting and a user-friendly
> +cli.")

Maybe mention that this is the library, not the program.

[1] https://github.com/Qalculate/libqalculate/releases


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40320] [PATCH 1/2] gnu: Add libqalculate

[R Veera Kumar]

On Mon, Mar 30, 2020 at 12:45:39PM +0200, Danny Milosavljevic wrote:
> Hi Veera,
> 
> thanks for the patch!
> 
> I have a few suggestions:
> 
> On Mon, 30 Mar 2020 10:52:23 +0530
> R Veera Kumar <vkor@vkten.in> wrote:
> 
> > +         ("automake" ,automake)
> > +         ("autoconf" ,autoconf)
> 
> It's unusual to need those in a release.  Why are they necessary?
> 

The github release tarball includes the configure script but the not the
git clone checkout of tag version. It has only autogen.sh script. The
website explicitly says that and I have also checked it.

Thanks,
R Veera Kumar
India
[OUTREACHY CONTRIB]

[bug#40320] [PATCH v2 1/2] gnu: Add libqalculate.

[R Veera Kumar]

* gnu/packages/maths.scm (libqalculate): New variable.
* gnu/packages/maths.scm: Add missing modules.
* gnu: maths: Add copyright line.

Signed-off-by: R Veera Kumar <vkor@vkten.in>
---
Changes in v2:
 - Change commit msg as per changelog format
 - Use git release tag instead of commit id
 - Use 'bootstrap with setenv appropriately
 - Correct inputs and native-inputs
---
 gnu/packages/maths.scm | 56 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 5e56289682..0594e0dd66 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -35,6 +35,7 @@
 ;;; Copyright © 2019 Robert Smith <robertsmith@posteo.net>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
 ;;; Copyright © 2020 Felix Gruber <felgru@posteo.net>
+;;; Copyright © 2020 R Veera Kumar <vkor@vkten.in>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -79,6 +80,7 @@
   #:use-module (gnu packages dbm)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages elf)
+  #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fltk)
   #:use-module (gnu packages fontutils)
@@ -86,8 +88,10 @@
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages graphviz)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages java)
   #:use-module (gnu packages less)
@@ -5320,3 +5324,55 @@ researchers and developers alike to get started on SAT.")
       (home-page
        "http://minisat.se/MiniSat.html")
       (license license:expat))))
+
+(define-public libqalculate
+  (package
+    (name "libqalculate")
+    (version "3.8.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Qalculate/libqalculate/")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("gettext" ,gettext-minimal)
+       ("intltool" ,intltool)
+       ("automake" ,automake)
+       ("autoconf" ,autoconf)
+       ("libtool" ,libtool)
+       ("doxygen" ,doxygen)
+       ("file" ,file)))
+    (inputs
+     `(("gmp" ,gmp)
+       ("mpfr" ,mpfr)
+       ("libxml2" ,libxml2)
+       ("curl" ,curl)
+       ("icu4c" ,icu4c)
+       ("gnuplot" ,gnuplot)
+       ("readline" ,readline)
+       ("libiconv" ,libiconv)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'bootstrap 'setenv
+           ;; Prevent the autogen.sh script to carry out the configure
+           ;; script, which has not yet been patched to replace /bin/sh.
+           (lambda _
+             (setenv "NOCONFIGURE" "TRUE")
+             #t)))))
+    (home-page "https://qalculate.github.io/")
+    (synopsis "Multi-purpose cli desktop calculator and library")
+    (description
+     "Libqalculate is a multi-purpose cli desktop calculator and library.
+It provides basic and advanced functionality.  Features include customizable
+functions, unit calculations, and conversions, physical constants, symbolic
+calculations (including integrals and equations), arbitrary precision,
+uncertainity propagation, interval arithmetic, plotting and a user-friendly
+cli.")
+    (license license:gpl2+)))
-- 
2.26.0

[bug#40320] [PATCH v2 2/2] gnu: Add qalculate-gtk.

[R Veera Kumar]

* gnu/packages/maths.scm (qalculate-gtk): New variable.
* gnu/packages/maths.scm: Add missing modules.

Signed-off-by: R Veera Kumar <vkor@vkten.in>
---
Changes in v2:
 - Change commit msg as per changelog format
 - Use git release tag instead of commit id
 - Use 'bootstrap with setenv appropriately
 - Remove m4 from native-inputs
---
 gnu/packages/maths.scm | 58 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 0594e0dd66..b66c330711 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -63,6 +63,7 @@
   #:use-module (guix utils)
   #:use-module ((guix build utils) #:select (alist-replace))
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system python)
   #:use-module (guix build-system ruby)
@@ -5376,3 +5377,60 @@ calculations (including integrals and equations), arbitrary precision,
 uncertainity propagation, interval arithmetic, plotting and a user-friendly
 cli.")
     (license license:gpl2+)))
+
+(define-public qalculate-gtk
+  (package
+    (name "qalculate-gtk")
+    (version "3.8.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/Qalculate/qalculate-gtk/")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840"))))
+    (build-system glib-or-gtk-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("intltool" ,intltool)
+       ("automake" ,automake)
+       ("autoconf" ,autoconf)
+       ("libtool" ,libtool)
+       ("file" ,file)))
+    (inputs
+     `(("gmp" ,gmp)
+       ("mpfr" ,mpfr)
+       ("libqalculate" ,libqalculate)
+       ("libxml2" ,libxml2)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'bootstrap 'setenv
+           ;; Prevent the autogen.sh script to carry out the configure
+           ;; script, which has not yet been patched to replace /bin/sh.
+           (lambda _
+             (setenv "NOCONFIGURE" "TRUE")
+             #t))
+         (add-before 'check 'add-pot-file
+           ;; the file contains translations and are currently not in use
+           ;; left out on purpose so add it to POTFILES.skip
+           (lambda _
+             (with-output-to-file "po/POTFILES.skip"
+               (lambda _
+                 (format #t "data/shortcuts.ui~%")
+                 #t))
+             #t)))))
+    (home-page "https://qalculate.github.io/")
+    (synopsis "Multi-purpose graphical desktop calculator")
+    (description
+     "Qalculate-gtk is the GTK frontend for libqalculate.  It is a
+multi-purpose GUI desktop calculator.  It provides basic and advanced
+functionality.  Features include customizable functions, unit calculations,
+and conversions, physical constants, symbolic calculations (including
+integrals and equations), arbitrary precision, uncertainity propagation,
+interval arithmetic, plotting.")
+    (license license:gpl2+)))
-- 
2.26.0

bug#40320: [PATCH v2 2/2] gnu: Add qalculate-gtk.

[Ludovic Courtès]

R Veera Kumar <vkor@vkten.in> skribis:

> * gnu/packages/maths.scm (qalculate-gtk): New variable.
> * gnu/packages/maths.scm: Add missing modules.
>
> Signed-off-by: R Veera Kumar <vkor@vkten.in>
> ---
> Changes in v2:
>  - Change commit msg as per changelog format
>  - Use git release tag instead of commit id
>  - Use 'bootstrap with setenv appropriately
>  - Remove m4 from native-inputs

Applied as well with similar changes to the commit log.

I’m closing this issue now.

Thank you!

Ludo’.

[bug#40320] [PATCH v2 1/2] gnu: Add libqalculate.

[Ludovic Courtès]

Hi Veera,

R Veera Kumar <vkor@vkten.in> skribis:

> * gnu/packages/maths.scm (libqalculate): New variable.
> * gnu/packages/maths.scm: Add missing modules.
> * gnu: maths: Add copyright line.
>
> Signed-off-by: R Veera Kumar <vkor@vkten.in>
> ---
> Changes in v2:
>  - Change commit msg as per changelog format
>  - Use git release tag instead of commit id
>  - Use 'bootstrap with setenv appropriately
>  - Correct inputs and native-inputs

Perfect, I’ve applied it and will push shortly, thank you!

I’ve kept only the first line of the commit message above, because we
don’t usually mention changes in the list of modules used and copyright
lines, and ‘Signed-off-by’ is for the person who applies the patch on
your behalf.

Apart from this tiny issue it’s all good!

Ludo’.