Subject: [bug#38032] [PATCH 3/4] gnu: virt-manager: Update to 2.2.1.

From: Miguel Arruga Vivas <[email-masked]>
Date: Sat, 2 Nov 2019 17:48:35 +0100

Gtksourceview is a new dependency of virt-manager.  The phase
fix-qemu-img-reference replaces an absolute reference
to /usr/bin/qemu-img and the other phases have been fixed to the new
file names.
---

* gnu/packages/virtualization.scm (virt-manager): Update to version
2.2.1.  Point to the correct file in fix-setup and fix-default-uri
phases.  Add fix-qemu-img-reference phase.  Add gtksourceview as an
input.
---
 gnu/packages/virtualization.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
>From e6a50f3353f685a77da1be643bc88b79df9d6d9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Arruga=20Vivas?=
 <[email-masked]>
Date: Sat, 2 Nov 2019 00:45:48 +0100
Subject: [PATCH 3/4] gnu: virt-manager: Update to 2.2.1.

* gnu/packages/virtualization.scm (virt-manager): Update to version
2.2.1.  Point to the correct file in fix-setup and fix-default-uri
phases.  Add fix-qemu-img-reference phase.  Add gtksourceview as an
input.
---
 gnu/packages/virtualization.scm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 19614b0ac3..f113eee5f7 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -577,7 +577,7 @@ virtualization library.")
 (define-public virt-manager
   (package
     (name "virt-manager")
-    (version "2.1.0")
+    (version "2.2.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://virt-manager.org/download/sources"
@@ -585,7 +585,7 @@ virtualization library.")
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1m038kyngmxlgz91c7z8g73lb2wy0ajyah871a3g3wb5cnd0dsil"))))
+                "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g"))))
     (build-system python-build-system)
     (arguments
      `(#:use-setuptools? #f          ; uses custom distutils 'install' command
@@ -603,13 +603,19 @@ virtualization library.")
        (modify-phases %standard-phases
          (add-after 'unpack 'fix-setup
            (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "virtcli/cliconfig.py"
+             (substitute* "virtinst/buildconfig.py"
                (("/usr") (assoc-ref outputs "out")))
              #t))
+         (add-after 'unpack 'fix-qemu-img-reference
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "virtconv/formats.py"
+	       (("/usr(/bin/qemu-img)" _ suffix)
+		(string-append (assoc-ref inputs "qemu") suffix)))
+             #t))
          (add-after 'unpack 'fix-default-uri
            (lambda* (#:key inputs #:allow-other-keys)
              ;; Xen is not available for now - so only patch qemu.
-             (substitute* "virtManager/connect.py"
+             (substitute* "virtManager/createconn.py"
                (("/usr(/bin/qemu-system)" _ suffix)
                 (string-append (assoc-ref inputs "qemu") suffix)))
              #t))
@@ -640,6 +646,7 @@ virtualization library.")
      `(("dconf" ,dconf)
        ("gtk+" ,gtk+)
        ("gtk-vnc" ,gtk-vnc)
+       ("gtksourceview" ,gtksourceview)
        ("libvirt" ,libvirt)
        ("libvirt-glib" ,libvirt-glib)
        ("libosinfo" ,libosinfo)
-- 
2.23.0