[bug#67234] [PATCH gnome-team 0/2] Update GNOME Calculator

[bug#67234] [PATCH gnome-team 0/2] Update GNOME Calculator

[Vivien Kraus via Guix-patches via]

Dear guix,

The next target on my list is GNOME Calculator.

What do you think?

Best regards,

Vivien

Vivien Kraus (2):
  gnu: gnome-calculator: Update to 44.0.
  gnu: gnome-calculator: Update style.

 gnu/packages/gnome.scm | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)


base-commit: 72e886328c14c832b2ed71c400069b63852ee18d
-- 
2.41.0

[bug#67234] [PATCH gnome-team 1/2] gnu: gnome-calculator: Update to 44.0.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-calculator): Update to 44.0.
[inputs]: Replace libsoup-minimal-2 with libsoup.  Remove libhandy.
[propagated-inputs]: Add gee, glib, gtk.

Change-Id: I86dcfedf2b50a0e250ed954e40ef570214f4a23c
---
 gnu/packages/gnome.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2958da2cd9..8cd7d47d33 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10801,7 +10801,7 @@ (define-public libunique
 (define-public gnome-calculator
   (package
     (name "gnome-calculator")
-    (version "42.2")
+    (version "44.0")
     (source
      (origin
        (method url-fetch)
@@ -10810,7 +10810,7 @@ (define-public gnome-calculator
                            name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1866qn0r9xp7b7j1436kry2k3bdh9ikhz2wm41jxcn1nljyb3nik"))))
+         "0hqhnwaw7zam0r7b61ir68710hxmc5rxb0172mz9lc48kwr67rql"))))
     (build-system meson-build-system)
     (arguments
      '(#:glib-or-gtk? #t
@@ -10837,11 +10837,13 @@ (define-public gnome-calculator
            gtksourceview
            libadwaita
            libgee
-           libhandy
-           libsoup-minimal-2
+           libsoup
            libxml2
            mpc
            mpfr))
+    (propagated-inputs
+     ;; Marked as requires.private in either .pc
+     (list libgee glib gtk))
     (home-page "https://wiki.gnome.org/Apps/Calculator")
     (synopsis "Desktop calculator")
     (description
-- 
2.41.0

[bug#67234] [PATCH gnome-team 2/2] gnu: gnome-calculator: Update style.

[Vivien Kraus via Guix-patches via]

* gnu/packages/gnome.scm (gnome-calculator) [arguments]: Convert to list of
G-Expressions.

Change-Id: I217aec53e66808cc11a26f5df58fd25355d898b0
---
 gnu/packages/gnome.scm | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8cd7d47d33..e0dbf7ba5a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -10813,18 +10813,19 @@ (define-public gnome-calculator
          "0hqhnwaw7zam0r7b61ir68710hxmc5rxb0172mz9lc48kwr67rql"))))
     (build-system meson-build-system)
     (arguments
-     '(#:glib-or-gtk? #t
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'skip-gtk-update-icon-cache
-           (lambda _
-             (substitute* "meson.build"
-               (("gtk_update_icon_cache: true")
-                "gtk_update_icon_cache: false"))))
-         (add-before 'check 'pre-check
-           (lambda _
-             ;; Tests require a writable HOME.
-             (setenv "HOME" (getcwd)))))))
+     (list
+      #:glib-or-gtk? #t
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'skip-gtk-update-icon-cache
+            (lambda _
+              (substitute* "meson.build"
+                (("gtk_update_icon_cache: true")
+                 "gtk_update_icon_cache: false"))))
+          (add-before 'check 'pre-check
+            (lambda _
+              ;; Tests require a writable HOME.
+              (setenv "HOME" (getcwd)))))))
     (native-inputs
      (list gettext-minimal
            `(,glib "bin")               ;for glib-compile-schemas, gio-2.0.
-- 
2.41.0

bug#67234: [PATCH gnome-team 2/2] gnu: gnome-calculator: Update style.

[Liliana Marie Prikler]

Am Donnerstag, dem 16.11.2023 um 23:18 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (gnome-calculator) [arguments]: Convert to
> list of G-Expressions.
Pushed.  Thanks