diff options
| author | jgh <jgh@FreeBSD.org> | 2015-09-18 00:15:10 +0800 |
|---|---|---|
| committer | jgh <jgh@FreeBSD.org> | 2015-09-18 00:15:10 +0800 |
| commit | 0c6fbf2fbc7a48091492064c48227cdcc0b8b528 (patch) | |
| tree | 6e23283b58781c4fd67cca8230817faaf8fb3fe6 /deskutils | |
| parent | d26c08a56ec84fd63c034b067865e39b116124bb (diff) | |
| download | freebsd-ports-gnome-0c6fbf2fbc7a48091492064c48227cdcc0b8b528.tar.gz freebsd-ports-gnome-0c6fbf2fbc7a48091492064c48227cdcc0b8b528.tar.zst freebsd-ports-gnome-0c6fbf2fbc7a48091492064c48227cdcc0b8b528.zip | |
- address location of cpu_map.xml in capabilities.py [1]
- Use GtkVnc.Display() not GtkVnc.Display.new() [2]
- bump portrev
Both of these issues have been addressed upstream by crobinso@redhat.com:
[1] https://github.com/virt-manager/virt-manager/commit/b15c44923c9af9d42d04a508de0d9cc8744dc73e
[2] https://github.com/virt-manager/virt-manager/commit/5df6757a0bd9b8f4dcca17a73bad3d9fe46d7823
PR: 203152 [2]
Submitted by: yonas@fizk.net [2], daniel@morante.net (via mail) [1]
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/virt-manager/Makefile | 1 | ||||
| -rw-r--r-- | deskutils/virt-manager/files/patch-virtManager_viewers.py | 11 | ||||
| -rw-r--r-- | deskutils/virt-manager/files/patch-virtinst_capabilities.py | 29 |
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 = {} |