aboutsummaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/virt-manager/Makefile1
-rw-r--r--deskutils/virt-manager/files/patch-virtManager_viewers.py11
-rw-r--r--deskutils/virt-manager/files/patch-virtinst_capabilities.py29
3 files changed, 41 insertions, 0 deletions
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index c7810464a8cc..e6fabdb2eda7 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -2,6 +2,7 @@
PORTNAME= virt-manager
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= deskutils net-mgmt
MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ \
LOCAL/jgh/deskutils/${PORTNAME}/
diff --git a/deskutils/virt-manager/files/patch-virtManager_viewers.py b/deskutils/virt-manager/files/patch-virtManager_viewers.py
new file mode 100644
index 000000000000..e06734b71908
--- /dev/null
+++ b/deskutils/virt-manager/files/patch-virtManager_viewers.py
@@ -0,0 +1,11 @@
+--- virtManager/viewers.py.orig 2015-05-31 18:53:44 UTC
++++ virtManager/viewers.py
+@@ -272,7 +272,7 @@ class VNCViewer(Viewer):
+ ###################
+
+ def _init_widget(self):
+- self._display = GtkVnc.Display.new()
++ self._display = GtkVnc.Display()
+
+ # Make sure viewer doesn't force resize itself
+ self._display.set_force_size(False)
diff --git a/deskutils/virt-manager/files/patch-virtinst_capabilities.py b/deskutils/virt-manager/files/patch-virtinst_capabilities.py
new file mode 100644
index 000000000000..4db0cc73ec1a
--- /dev/null
+++ b/deskutils/virt-manager/files/patch-virtinst_capabilities.py
@@ -0,0 +1,29 @@
+--- virtinst/capabilities.py.orig 2015-05-31 18:53:44 UTC
++++ virtinst/capabilities.py
+@@ -19,6 +19,8 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ # MA 02110-1301 USA.
+
++import logging
++import os
+ import re
+
+ from .cpu import CPU as DomainCPU
+@@ -52,10 +54,15 @@ class _CPUMapFileValues(XMLBuilder):
+ cpu_map.xml
+ """
+ # This is overwritten as part of the test suite
+- _cpu_filename = "/usr/share/libvirt/cpu_map.xml"
++ _cpu_filename = "/usr/local/share/libvirt/cpu_map.xml"
+
+ def __init__(self, conn):
+- xml = file(self._cpu_filename).read()
++ if os.path.exists(self._cpu_filename):
++ xml = file(self._cpu_filename).read()
++ else:
++ xml = None
++ logging.debug("CPU map file not found: %s", self._cpu_filename)
++
+ XMLBuilder.__init__(self, conn, parsexml=xml)
+
+ self._archmap = {}