Subject: [bug#61592] [PATCH] gnu: meld: Update to 3.22.0

From: Liliana Marie Prikler <[email-masked]>
Date: Sat, 18 Feb 2023 08:28:28 +0100

Am Freitag, dem 17.02.2023 um 18:12 -0800 schrieb Andy Tai:
> * gnu/packages/patchutils.scm (meld): Update to 3.22.0
> ---
>  gnu/packages/patchutils.scm | 87 +++++++++++++++++------------------
> --
>  1 file changed, 39 insertions(+), 48 deletions(-)
> 
> diff --git a/gnu/packages/patchutils.scm
> b/gnu/packages/patchutils.scm
> index dd5e6bae9a..b5347d6a22 100644
> --- a/gnu/packages/patchutils.scm
> +++ b/gnu/packages/patchutils.scm
> @@ -5,6 +5,7 @@
>  ;;; Copyright © 2019 Christopher Baines <[email-masked]>
>  ;;; Copyright © 2021 Xinglu Chen <[email-masked]>
>  ;;; Copyright © 2022 jgart <[email-masked]>
> +;;; Copyright © 2023 Andy Tai <[email-masked]>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -29,6 +30,8 @@ (define-module (gnu packages patchutils)
>    #:use-module (guix download)
>    #:use-module (guix git-download)
>    #:use-module (guix build-system gnu)
> +  #:use-module (guix build-system glib-or-gtk)
> +  #:use-module (guix build-system meson)
>    #:use-module (guix build-system python)
>    #:use-module (gnu packages)
>    #:use-module (gnu packages ed)
> @@ -37,6 +40,7 @@ (define-module (gnu packages patchutils)
>    #:use-module (gnu packages check)
>    #:use-module (gnu packages databases)
>    #:use-module (gnu packages django)
> +  #:use-module (gnu packages freedesktop)
>    #:use-module (gnu packages file)
>    #:use-module (gnu packages gawk)
>    #:use-module (gnu packages gettext)
> @@ -47,8 +51,11 @@ (define-module (gnu packages patchutils)
>    #:use-module (gnu packages less)
>    #:use-module (gnu packages mail)
>    #:use-module (gnu packages ncurses)
> +  #:use-module (gnu packages package-management)
>    #:use-module (gnu packages perl)
> +  #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages python)
> +  #:use-module (gnu packages python-build)
>    #:use-module (gnu packages python-xyz)
>    #:use-module (gnu packages version-control)
>    #:use-module (gnu packages xml))
> @@ -214,7 +221,7 @@ (define-public vbindiff
>  (define-public meld
>    (package
>      (name "meld")
> -    (version "3.20.4")
> +    (version "3.22.0")
>      (source
>       (origin
>         (method url-fetch)
> @@ -222,66 +229,50 @@ (define-public meld
>                             (version-major+minor version)
>                             "/meld-" version ".tar.xz"))
>         (sha256
> -        (base32
> "04vx2mdbcdin0g3w8x910czfch5vyrl8drv1f2l8gxh6qvp113pl"))))
> -    (build-system python-build-system)
> +        (base32
> "03f4j27amyi28flkks8i9bhqzd6xhm6d3c6jzxc57rzniv4hgh9z"))))
> +    (build-system meson-build-system)
>      (native-inputs
> -     `(("intltool" ,intltool)
> -       ("xmllint" ,libxml2)
> -       ("glib-compile-schemas" ,glib "bin")
> -       ("python-pytest" ,python-pytest)))
> +     (list desktop-file-utils
> +       intltool
> +       itstool
> +       libxml2
> +       `(,glib "bin")
> +       `(,gtk+ "bin")                   ; for gtk-update-icon-cache
> +       gobject-introspection
> +       pkg-config
> +       python)
Even if it's a chore, please separate style changes and actual changes
into two commits.

Cheers