From 66bb4d46d7b6afd666f7a6653fd4e440bc3eeceb Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Tue, 20 Dec 2016 19:17:38 -0300
Subject: virt-install-1.4.0-2.parabola6: minor fix

---
 libre/virt-manager/PKGBUILD    |  4 ++--
 libre/virt-manager/libre.patch | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

(limited to 'libre/virt-manager')

diff --git a/libre/virt-manager/PKGBUILD b/libre/virt-manager/PKGBUILD
index 3b9bb3696..f792653f6 100644
--- a/libre/virt-manager/PKGBUILD
+++ b/libre/virt-manager/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virt-manager
 pkgname=virt-install
 pkgver=1.4.0
-pkgrel=2.parabola5
+pkgrel=2.parabola6
 pkgdesc="Console user interface for managing virtual machines, without non-FSDG compliant distros and operating systems support"
 arch=('any')
 url="http://virt-manager.org/"
@@ -23,7 +23,7 @@ makedepends=('intltool>=0.35.0'
 source=("https://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz"
         'libre.patch')
 sha256sums=('bf31a40cc48500cbf87a0e93a5838fc3f6ce4e2fa03f8bce6aa2615625e6caca'
-            'df2961a0efe68c07f29cf2578f986432fd3a2c0db289b9630866faa24f116211')
+            'a8475425176762a48f0be96e96840181e8a28176482da6986df11ad4c041a7c4')
 
 prepare() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/libre/virt-manager/libre.patch b/libre/virt-manager/libre.patch
index d7f475dc3..fdb788101 100644
--- a/libre/virt-manager/libre.patch
+++ b/libre/virt-manager/libre.patch
@@ -423,7 +423,7 @@ index ef66ba4..da077df 100644
          self.askpass_package = _split_list(_get_param("askpass_packages", ""))
          self.libvirt_packages = _split_list(_get_param("libvirt_packages", ""))
 diff --git a/virtinst/guest.py b/virtinst/guest.py
-index 6a42536..985a73e 100644
+index 6a42536..a444ab9 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
 @@ -608,7 +608,6 @@ class Guest(XMLBuilder):
@@ -465,7 +465,17 @@ index 6a42536..985a73e 100644
  
  
      def _hv_supported(self):
-@@ -847,8 +841,7 @@ class Guest(XMLBuilder):
+@@ -822,8 +816,7 @@ class Guest(XMLBuilder):
+             return
+ 
+         default = True
+-        if (self._os_object.need_old_xen_disable_acpi() and
+-            not self.conn.check_support(support.SUPPORT_CONN_CAN_ACPI)):
++        if (not self.conn.check_support(support.SUPPORT_CONN_CAN_ACPI)):
+             default = False
+ 
+         if self.features.acpi == "default":
+@@ -847,8 +840,7 @@ class Guest(XMLBuilder):
              self.conn.check_support(self.conn.SUPPORT_CONN_VMPORT)):
              self.features.vmport = False
  
@@ -475,6 +485,26 @@ index 6a42536..985a73e 100644
              self.conn.check_support(self.conn.SUPPORT_CONN_HYPERV_VAPIC)):
              if self.features.hyperv_relaxed is None:
                  self.features.hyperv_relaxed = True
+@@ -948,9 +940,7 @@ class Guest(XMLBuilder):
+             return True
+ 
+         if (self.os.is_arm_vexpress() and
+-            self.os.dtb and
+-            self._os_object.supports_virtiommio() and
+-            self.conn.check_support(support.SUPPORT_CONN_VIRTIO_MMIO)):
++            self.os.dtb):
+             return True
+ 
+         return False
+@@ -1142,7 +1132,7 @@ class Guest(XMLBuilder):
+             self._add_spice_usbredir()
+ 
+         video_model = self._os_object.default_videomodel(self)
+-        if video_model == 'vmvga' and self.stable_defaults(force=True):
++        if self.stable_defaults(force=True):
+             video_model = 'vga'
+ 
+         for video in self.get_devices("video"):
 diff --git a/virtinst/initrdinject.py b/virtinst/initrdinject.py
 index eb5f419..726264a 100644
 --- a/virtinst/initrdinject.py
-- 
cgit v1.2.3