[gnome-boxes/flatpak-update-libvirt] flatpak: Update libvirt to 6.1.0

[Felipe Borges <felipeborges src gnome org>]

commit b4eb4ed1938364f6b0f51a74018d7f1ed71dc6e2
Author: Felipe Borges <felipeborges gnome org>
Date:   Tue Mar 24 13:44:55 2020 +0100

    flatpak: Update libvirt to 6.1.0
    
    And carry the check-for-disk-type-correctly patch that fixes
    https://bugzilla.redhat.com/1811728
    
    Libvirt now also mandates that the build directory is different
    than the source directory.

 .../libvirt-check-for-disk-type-correctly.patch    | 39 ++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Boxes.json             | 28 +++++++++++++---
 2 files changed, 62 insertions(+), 5 deletions(-)
---
diff --git a/build-aux/flatpak/libvirt-check-for-disk-type-correctly.patch 
b/build-aux/flatpak/libvirt-check-for-disk-type-correctly.patch
new file mode 100644
index 00000000..1ee4a3d9
--- /dev/null
+++ b/build-aux/flatpak/libvirt-check-for-disk-type-correctly.patch
@@ -0,0 +1,39 @@
+From 3918dbd84e4951b43f93fbf50ef52be00274850c Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn redhat com>
+Date: Mon, 9 Mar 2020 16:40:57 +0100
+Subject: [PATCH] virDomainDiskTranslateSourcePool: Check for disk type
+ correctly
+
+When rewriting the virDomainDiskTranslateSourcePool() function in
+v6.1.0-rc1~184 a typo was introduced. Previously, we allowed
+startup policy only for those volumes which translated to
+VIR_STORAGE_TYPE_FILE. But starting with the referenced commit,
+the value we checked for was changed to VIR_STORAGE_VOL_FILE
+which comes from a different enum and has a different value too.
+This is wrong, because virStorageSourceGetActualType() returns a
+value from the original enum.
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1811728
+
+Signed-off-by: Michal Privoznik <mprivozn redhat com>
+Reviewed-by: Peter Krempa <pkrempa redhat com>
+---
+ src/conf/domain_conf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
+index d8471acd2d..d2d97daf80 100644
+--- a/src/conf/domain_conf.c
++++ b/src/conf/domain_conf.c
+@@ -31856,7 +31856,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
+     }
+ 
+     if (def->startupPolicy != 0 &&
+-        virStorageSourceGetActualType(def->src) != VIR_STORAGE_VOL_FILE) {
++        virStorageSourceGetActualType(def->src) != VIR_STORAGE_TYPE_FILE) {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+                        _("'startupPolicy' is only valid for "
+                          "'file' type volume"));
+-- 
+2.25.1
+
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index 5c9555a7..b3ae165d 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -51,8 +51,8 @@
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://www.infradead.org/~tgr/libnl/files/libnl-1.1.4.tar.gz";,
-                    "sha256" : "4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063"
+                    "url" : 
"https://github.com/thom311/libnl/releases/download/libnl3_5_0/libnl-3.5.0.tar.gz";,
+                    "sha256" : "352133ec9545da76f77e70ccb48c9d7e5324d67f6474744647a7ed382b5e05fa"
                 }
             ]
         },
@@ -135,10 +135,24 @@
                 }
             ]
         },
+        {
+            "name" : "docutils",
+            "buildsystem" : "simple",
+            "build-commands" : [
+                "pip3 install --prefix=/app docutils-0.16-py2.py3-none-any.whl"
+            ],
+            "sources" : [
+                {
+                    "type" : "file",
+                    "url" : 
"https://files.pythonhosted.org/packages/81/44/8a15e45ffa96e6cf82956dd8d7af9e666357e16b0d93b253903475ee947f/docutils-0.16-py2.py3-none-any.whl";,
+                    "sha256" : "0c5b78adfbf7762415433f5515cd5c9e762339e23369dbe8000d84a4bf4ab3af"
+                }
+            ]
+        },
         {
             "name" : "libvirt",
+            "builddir" : true,
             "config-opts" : [
-                "--without-html-subdir",
                 "--without-storage-mpath"
             ],
             "build-options" : {
@@ -147,8 +161,12 @@
             "sources" : [
                 {
                     "type" : "archive",
-                    "url" : "https://libvirt.org/sources/libvirt-5.3.0.tar.xz";,
-                    "sha256" : "8564bdd506817b3957fa67e4f06b217922d30f19e416c4dc620995fd155dc101"
+                    "url" : "https://libvirt.org/sources/libvirt-6.1.0.tar.xz";,
+                    "sha256" : "167c185be45560e73dd3e14ed375778b555c01455192de2dafc4d0f74fabebc0"
+                },
+                {
+                    "type" : "patch",
+                    "path" : "libvirt-check-for-disk-type-correctly.patch"
                 }
             ]
         },