Commit 6b3e71a4 authored by Guido Günther's avatar Guido Günther

Rediff patches

  Dropped
    Move-GConf-values-to-GSettings.patch: Applied upstream
    fix-removable-drive-support.patch: Fixed upstream
    details-Fix-changing-graphics-type-bz-1083903.patch: Fixed upstream
parent 12c56449
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 7 Nov 2014 21:03:39 +0100
Date: Thu, 13 Aug 2015 22:00:33 +0200
Subject: Make SpiceClientGtk optional
Not all architectures have it
---
virtManager/console.py | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
virtManager/console.py | 9 +++++++--
virtManager/viewers.py | 10 +++++++---
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/virtManager/console.py b/virtManager/console.py
index b9f98de..edc76ca 100644
index ab13d7b..689773e 100644
--- a/virtManager/console.py
+++ b/virtManager/console.py
@@ -25,8 +25,13 @@ from gi.repository import GObject
from gi.repository import Gtk
from gi.repository import Gdk
@@ -29,7 +29,7 @@ from .baseclass import vmmGObjectUI
from .details import DETAILS_PAGE_CONSOLE
from .serialcon import vmmSerialConsole
from .sshtunnels import ConnectionInfo
-from .viewers import SpiceViewer, VNCViewer
+from .viewers import SpiceViewer, VNCViewer, have_spice_gtk
class vmmConsolePages(vmmGObjectUI):
@@ -652,7 +652,12 @@ class vmmConsolePages(vmmGObjectUI):
if ginfo.gtype == "vnc":
viewer_class = VNCViewer
elif ginfo.gtype == "spice":
- viewer_class = SpiceViewer
+ if have_spice_gtk:
+ viewer_class = SpiceViewer
+ else:
+ raise RuntimeError("Error opening Spice console, "
+ "SpiceClientGtk missing")
+
self._viewer = viewer_class(ginfo)
self._connect_viewer_signals()
diff --git a/virtManager/viewers.py b/virtManager/viewers.py
index f2b6d69..3000378 100644
--- a/virtManager/viewers.py
+++ b/virtManager/viewers.py
@@ -25,9 +25,13 @@ from gi.repository import Gdk
import gi
gi.require_version('GtkVnc', '2.0')
from gi.repository import GtkVnc
-gi.require_version('SpiceClientGtk', '3.0')
-from gi.repository import SpiceClientGtk
-from gi.repository import SpiceClientGLib
+try:
+ gi.require_version('SpiceClientGtk', '3.0')
+ from gi.repository import SpiceClientGtk
+ from gi.repository import SpiceClientGLib
+ have_spice_gtk = True
+except ImportError:
+ have_spice_gtk = False
+
# pylint: enable=E0611
import libvirt
@@ -1498,7 +1503,10 @@ class vmmConsolePages(vmmGObjectUI):
self.widget("console-gfx-viewport").add(self.viewer.display)
self.viewer.init_widget()
elif ginfo.gtype == "spice":
- self.viewer = SpiceViewer(self)
+ if have_spice_gtk:
+ self.viewer = SpiceViewer(self)
+ else:
+ raise RuntimeError("Error opening Spice console, SpiceClientGtk missing")
self.set_enable_accel()
import logging
import socket
......@@ -8,15 +8,15 @@ Closes: #781127
1 file changed, 2 insertions(+)
diff --git a/virtManager/serialcon.py b/virtManager/serialcon.py
index 96e3d2f..ef4a394 100644
index 320811b..062d2ac 100644
--- a/virtManager/serialcon.py
+++ b/virtManager/serialcon.py
@@ -29,6 +29,8 @@ import logging
@@ -28,6 +28,8 @@ import logging
from gi.repository import Gdk
from gi.repository import GLib
from gi.repository import Gtk
+import gi
+gi.require_version('Vte', '2.90')
from gi.repository import Vte
# pylint: enable=E0611
import libvirt
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
Date: Sun, 28 Sep 2014 12:46:41 +0200
Subject: Move GConf values to GSettings
This makes sure we don't lose already configured connections.
Closes: #740047
---
data/org.virt-manager.virt-manager.convert | 29 +++++++++++++++++++++++++++++
setup.py | 2 ++
2 files changed, 31 insertions(+)
create mode 100644 data/org.virt-manager.virt-manager.convert
diff --git a/data/org.virt-manager.virt-manager.convert b/data/org.virt-manager.virt-manager.convert
new file mode 100644
index 0000000..72e07e2
--- /dev/null
+++ b/data/org.virt-manager.virt-manager.convert
@@ -0,0 +1,29 @@
+[org.virt-manager.virt-manager]
+system-tray = /apps/virt-manager/system-tray
+
+[org.virt-manager.virt-manager.connections]
+autostart = /apps/virt-manager/connections/autostart
+uris = /apps/virt-manager/connections/uris
+
+[org.virt-manager.virt-manager.details]
+show-toolbar = /apps/virt-manager/details/show-toolbar
+
+[org.virt-manager.virt-manager.paths]
+image-default = /apps/virt-manager/paths/default-image-path
+media-default = /apps/virt-manager/paths/default-media-path
+
+[org.virt-manager.virt-manager.stats]
+enable-net-poll = /apps/virt-manager/stats/enable-net-poll
+enable-disk-poll = /apps/virt-manager/stats/enable-disk-poll
+enable-memory-poll = /apps/virt-manager/stats/enable-mem-poll
+enable-cpu-poll = /apps/virt-manager/stats/enable-cpu-poll
+
+[org.virt-manager.virt-manager.vmlist-fields]
+cpu-usage = /apps/virt-manager/vmlist-fields/cpu_usage
+disk-usage = /apps/virt-manager/vmlist-fields/disk_usage
+host-cpu-usage = /apps/virt-manager/vmlist-fields/host_cpu_usage
+memory-usage = /apps/virt-manager/vmlist-fields/memory_usage
+network-traffic = /apps/virt-manager/vmlist-fields/network_traffic
+
+
+
diff --git a/setup.py b/setup.py
index 388bdf8..1f6f24c 100755
--- a/setup.py
+++ b/setup.py
@@ -607,6 +607,8 @@ setup(
]),
("share/glib-2.0/schemas",
["data/org.virt-manager.virt-manager.gschema.xml"]),
+ ("share/GConf/gsettings",
+ ["data/org.virt-manager.virt-manager.convert"]),
("share/virt-manager/ui", glob.glob("ui/*.ui")),
("share/man/man1", [
From: Debian Libvirt Maintainers
<pkg-libvirt-maintainers@lists.alioth.debian.org>
Date: Sun, 12 Oct 2014 11:55:00 +0200
Subject: fix-removable-drive-support
---
virtManager/details.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtManager/details.py b/virtManager/details.py
index c1833ae..75b9fa8 100644
--- a/virtManager/details.py
+++ b/virtManager/details.py
@@ -2092,7 +2092,7 @@ class vmmDetails(vmmGObjectUI):
kwargs["shareable"] = self.widget("disk-shareable").get_active()
if self.edited(EDIT_DISK_REMOVABLE):
- kwargs["removeable"] = bool(
+ kwargs["removable"] = bool(
self.widget("disk-removable").get_active())
if self.edited(EDIT_DISK_CACHE):
virtinst/fix-path-to-hvmloader.patch
virtinst/Fix-patch-to-pygrub.patch
Move-GConf-values-to-GSettings.patch
fix-removable-drive-support.patch
details-Fix-changing-graphics-type-bz-1083903.patch
Make-SpiceClientGtk-optional.patch
Make-sure-we-use-a-binary-compatible-version-of-vte.patch
Make-SpiceClientGtk-optional.patch
......@@ -8,10 +8,10 @@ Closes: #685749
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/guest.py b/virtinst/guest.py
index f1ed182..01dce40 100644
index b0f14b0..5c33e71 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -348,7 +348,7 @@ class Guest(XMLBuilder):
@@ -358,7 +358,7 @@ class Guest(XMLBuilder):
if (not install and
self.os.is_xenpv() and
not self.os.kernel):
......
......@@ -8,10 +8,10 @@ Closes: #685749
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/guest.py b/virtinst/guest.py
index df43a5e..f1ed182 100644
index bf4b70b..b0f14b0 100644
--- a/virtinst/guest.py
+++ b/virtinst/guest.py
@@ -663,7 +663,7 @@ class Guest(XMLBuilder):
@@ -715,7 +715,7 @@ class Guest(XMLBuilder):
self.os.init = self.os.init or "/bin/sh"
if not self.os.loader and self.os.is_hvm() and self.type == "xen":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment