all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#48961] [PATCH 0/2] Update Qalculate to 3.19.0.
@ 2021-06-11 18:58 Jack Hill
  2021-06-11 19:02 ` [bug#48961] [PATCH 1/2] gnu: libqalculate: Update " Jack Hill
  2021-06-12 20:59 ` bug#48961: [PATCH 0/2] Update Qalculate " Nicolas Goaziou
  0 siblings, 2 replies; 4+ messages in thread
From: Jack Hill @ 2021-06-11 18:58 UTC (permalink / raw)
  To: 48961

These changes update the libqalculate and qalculate-gtk packages to 3.19.0 
(from 3.8.0). I tested the packages on linux-x86_64. I quickly read 
through the changelogs from the intermediate releases and didn't see 
anything to indicate that we would need to make extensive changes to our 
package definitions, and, in fact, no such changes were required.

For libqalculate, we have a patch so that libcurl can find a CA store when 
updating currency exchange rate data. The patch was developed against 
3.8.0, and I've tested that it still applies and works (I was able to 
update exchange rates) with 3.19.0.

For qalculate-gtk, formerly unused translatable strings are now used 
("data/shortcuts.ui" now appears in `po/POTFILES.in`), so I removed the 
phase instructing gettext to skip those strings.

Jack Hill (2):
   gnu: libqalculate: Update to 3.19.0.
   gnu: qalculate-gtk: Update to 3.19.0.

  gnu/packages/maths.scm | 17 ++++-------------
  1 file changed, 4 insertions(+), 13 deletions(-)

-- 
2.32.0




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

* [bug#48961] [PATCH 1/2] gnu: libqalculate: Update to 3.19.0.
  2021-06-11 18:58 [bug#48961] [PATCH 0/2] Update Qalculate to 3.19.0 Jack Hill
@ 2021-06-11 19:02 ` Jack Hill
  2021-06-11 19:02   ` [bug#48961] [PATCH 2/2] gnu: qalculate-gtk: " Jack Hill
  2021-06-12 20:59 ` bug#48961: [PATCH 0/2] Update Qalculate " Nicolas Goaziou
  1 sibling, 1 reply; 4+ messages in thread
From: Jack Hill @ 2021-06-11 19:02 UTC (permalink / raw)
  To: 48961

* gnu/packages/maths (libqalculate): Update to 3.19.0.
---
 gnu/packages/maths.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index e78c5dfb93..f6658971da 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -6158,7 +6158,7 @@ researchers and developers alike to get started on SAT.")
 (define-public libqalculate
   (package
     (name "libqalculate")
-    (version "3.8.0")
+    (version "3.19.0")
     (source
      (origin
        (method git-fetch)
@@ -6167,7 +6167,7 @@ researchers and developers alike to get started on SAT.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1vbaza9c7159xf2ym90l0xkyj2mp6c3hbghhsqn29yvz08fda9df"))
+        (base32 "1w44407wb552q21dz4m2nwwdi8b9hzjb2w1l3ffsikzqckc7wbyj"))
        (patches
         (search-patches "libqalculate-3.8.0-libcurl-ssl-fix.patch"))))
     (build-system gnu-build-system)
-- 
2.32.0





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

* [bug#48961] [PATCH 2/2] gnu: qalculate-gtk: Update to 3.19.0.
  2021-06-11 19:02 ` [bug#48961] [PATCH 1/2] gnu: libqalculate: Update " Jack Hill
@ 2021-06-11 19:02   ` Jack Hill
  0 siblings, 0 replies; 4+ messages in thread
From: Jack Hill @ 2021-06-11 19:02 UTC (permalink / raw)
  To: 48961

* gnu/packages/maths.scm (qalculate-gtk): Update to 3.19.0.
[phases]: Remove 'add-pot-file.
---
 gnu/packages/maths.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f6658971da..90c1bb7721 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -6212,7 +6212,7 @@ cli.")
 (define-public qalculate-gtk
   (package
     (name "qalculate-gtk")
-    (version "3.8.0")
+    (version "3.19.0")
     (source
      (origin
        (method git-fetch)
@@ -6221,7 +6221,7 @@ cli.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840"))))
+        (base32 "1nrx7gp6f1yalbdda1gb97azhbr4xclq2xf08vvbvsk8jfd6fd2v"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
@@ -6245,15 +6245,6 @@ cli.")
            ;; 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")
-- 
2.32.0





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

* bug#48961: [PATCH 0/2] Update Qalculate to 3.19.0.
  2021-06-11 18:58 [bug#48961] [PATCH 0/2] Update Qalculate to 3.19.0 Jack Hill
  2021-06-11 19:02 ` [bug#48961] [PATCH 1/2] gnu: libqalculate: Update " Jack Hill
@ 2021-06-12 20:59 ` Nicolas Goaziou
  1 sibling, 0 replies; 4+ messages in thread
From: Nicolas Goaziou @ 2021-06-12 20:59 UTC (permalink / raw)
  To: Jack Hill; +Cc: 48961-done

Hello,

Jack Hill <jackhill@jackhill.us> writes:

> Jack Hill (2):
>   gnu: libqalculate: Update to 3.19.0.
>   gnu: qalculate-gtk: Update to 3.19.0.
>
Applied. Thank you.

Regards,
-- 
Nicolas Goaziou




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

end of thread, other threads:[~2021-06-12 21:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-11 18:58 [bug#48961] [PATCH 0/2] Update Qalculate to 3.19.0 Jack Hill
2021-06-11 19:02 ` [bug#48961] [PATCH 1/2] gnu: libqalculate: Update " Jack Hill
2021-06-11 19:02   ` [bug#48961] [PATCH 2/2] gnu: qalculate-gtk: " Jack Hill
2021-06-12 20:59 ` bug#48961: [PATCH 0/2] Update Qalculate " Nicolas Goaziou

Code repositories for project(s) associated with this external index

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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.