[bug#66488] [PATCH gnome-team 0/3] Update gitg

[bug#66488] [PATCH gnome-team 0/3] Update gitg

[Liliana Marie Prikler]

Hi Guix,

this series updates gitg and some of its immediate dependencies.

Liliana Marie Prikler (3):
  gnu: libgit2-glib: Update to 1.2.0.
  gnu: libhandy: Update to 1.8.2.
  gnu: gitg: Update to 44.

 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        | 15 ++++----
 .../gitg-fix-positional-argument.patch        | 36 -------------------
 3 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 gnu/packages/patches/gitg-fix-positional-argument.patch


base-commit: b701a7018d94aebef6a967ec235c72c1f7cdfe5c
-- 
2.41.0

[bug#66488] [PATCH gnome-team 1/3] gnu: libgit2-glib: Update to 1.2.0.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (libgit2-glib): Update to 1.2.0.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 99a1a2a663..26858871ed 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11996,7 +11996,7 @@ (define-public libhandy-0.0
 (define-public libgit2-glib
   (package
     (name "libgit2-glib")
-    (version "1.1.0")
+    (version "1.2.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -12004,7 +12004,7 @@ (define-public libgit2-glib
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1wqypx0xv20vk0zfh20c474z6rdgbxbklcr2wkhl30dgbmbxg3f3"))))
+                "1441w7gzn6m3adhx4g6wcbkmscka2929si963dciyklghgddlc8k"))))
     (build-system meson-build-system)
     (native-inputs
      (list `(,glib "bin") ;; For glib-mkenums
-- 
2.41.0

[bug#66488] [PATCH gnome-team 3/3] gnu: gitg: Update to 44.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gitg): Update to 44.
[source]: Remove “gitg-fix-positional-argument.patch”.
[inputs]: Add gpgme and libhandy.
* gnu/packages/patches/gitg-fix-positional-argument.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Unregister it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnome.scm                        |  7 ++--
 .../gitg-fix-positional-argument.patch        | 36 -------------------
 3 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 gnu/packages/patches/gitg-fix-positional-argument.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index be4c304e9b..0c0e587ae6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1276,7 +1276,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-id.patch		\
   %D%/packages/patches/ghostscript-no-header-uuid.patch		\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
-  %D%/packages/patches/gitg-fix-positional-argument.patch	\
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-networking-gnutls-binding.patch	\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 59acd8381d..fc815b25ec 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12027,7 +12027,7 @@ (define-public libgit2-glib
 (define-public gitg
   (package
     (name "gitg")
-    (version "41")
+    (version "44")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -12035,8 +12035,7 @@ (define-public gitg
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0aa6djcf7rjw0q688mfy47k67bbjpnx6aw1xs94abfhgn6gipdkz"))
-              (patches (search-patches "gitg-fix-positional-argument.patch"))))
+                "0m135v2qm5kaa2jki0y2lbh0wa69bqfh9a4cm7db153v7smrj3jv"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -12060,6 +12059,7 @@ (define-public gitg
                   `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
     (inputs
      (list glib
+           gpgme
            gsettings-desktop-schemas
            gspell
            gtk+
@@ -12068,6 +12068,7 @@ (define-public gitg
            libdazzle
            libgee
            libgit2-glib
+           libhandy
            libpeas
            libsecret
            libsoup-minimal-2
diff --git a/gnu/packages/patches/gitg-fix-positional-argument.patch b/gnu/packages/patches/gitg-fix-positional-argument.patch
deleted file mode 100644
index 1d3513921c..0000000000
--- a/gnu/packages/patches/gitg-fix-positional-argument.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1978973b12848741b08695ec2020bac98584d636 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 24 Jan 2022 12:17:52 +0000
-Subject: [PATCH] meson: drop unused argument for i18n.merge_file()
-
-Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0.
-
-data/meson.build:8:0: ERROR: Function does not take positional arguments.
-data/meson.build:44:0: ERROR: Function does not take positional arguments.
----
- data/meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/data/meson.build b/data/meson.build
-index a8b90fd1..2413531d 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -6,7 +6,6 @@ desktop_config = configuration_data()
- desktop_config.set('icon', application_id)
- desktop_config.set('binary', gitg_name)
- i18n.merge_file(
--  desktop,
-   type: 'desktop',
-   input: configure_file(
-     input: desktop + '.in.in',
-@@ -42,7 +41,6 @@ appdata_config = configuration_data()
- appdata_config.set('app-id', application_id)
- appdata_config.set('gettext', gitg_name)
- i18n.merge_file(
--  appdata,
-   type: 'xml',
-   input: configure_file(
-     input: appdata + '.in.in',
--- 
-GitLab
-
-- 
2.41.0

[bug#66488] [PATCH gnome-team 2/3] gnu: libhandy: Update to 1.8.2.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (libhandy): Update to 1.8.2.
---
 gnu/packages/gnome.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 26858871ed..59acd8381d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11927,7 +11927,7 @@ (define-public terminator
 (define-public libhandy
   (package
     (name "libhandy")
-    (version "1.7.90")
+    (version "1.8.2")
     (source
      (origin
        (method git-fetch)
@@ -11936,7 +11936,7 @@ (define-public libhandy
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1z8sbx7g19c1p8dy0sn0l25qfvrd2j28h269lsqm1y98r818h2k1"))))
+        (base32 "031bmrxc62p86fpk1x8kg4zljxf5bd2cgq8bsm7nrk5yipha2xvy"))))
     (build-system meson-build-system)
     (arguments
      (list #:configure-flags
-- 
2.41.0

[bug#66488] [PATCH gnome-team 0/3] Update gitg

[Maxim Cournoyer]

Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Hi Guix,
>
> this series updates gitg and some of its immediate dependencies.
>
> Liliana Marie Prikler (3):
>   gnu: libgit2-glib: Update to 1.2.0.
>   gnu: libhandy: Update to 1.8.2.
>   gnu: gitg: Update to 44.

Well done; the series LGTM!

-- 
Thanks,
Maxim

bug#66488: [PATCH gnome-team 0/3] Update gitg

[Liliana Marie Prikler]

Am Donnerstag, dem 12.10.2023 um 10:23 -0400 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Hi Guix,
> > 
> > this series updates gitg and some of its immediate dependencies.
> > 
> > Liliana Marie Prikler (3):
> >   gnu: libgit2-glib: Update to 1.2.0.
> >   gnu: libhandy: Update to 1.8.2.
> >   gnu: gitg: Update to 44.
> 
> Well done; the series LGTM!
Thanks.

Pushed