Date: Thu, 17 Sep 2015 16:15:11 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397122 - in head/deskutils/virt-manager: . files Message-ID: <201509171615.t8HGFBEs070565@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Thu Sep 17 16:15:10 2015 New Revision: 397122 URL: https://svnweb.freebsd.org/changeset/ports/397122 Log: - 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] Added: head/deskutils/virt-manager/files/patch-virtManager_viewers.py (contents, props changed) head/deskutils/virt-manager/files/patch-virtinst_capabilities.py (contents, props changed) Modified: head/deskutils/virt-manager/Makefile Modified: head/deskutils/virt-manager/Makefile ============================================================================== --- head/deskutils/virt-manager/Makefile Thu Sep 17 15:50:13 2015 (r397121) +++ head/deskutils/virt-manager/Makefile Thu Sep 17 16:15:10 2015 (r397122) @@ -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}/ Added: head/deskutils/virt-manager/files/patch-virtManager_viewers.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/virt-manager/files/patch-virtManager_viewers.py Thu Sep 17 16:15:10 2015 (r397122) @@ -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) Added: head/deskutils/virt-manager/files/patch-virtinst_capabilities.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/virt-manager/files/patch-virtinst_capabilities.py Thu Sep 17 16:15:10 2015 (r397122) @@ -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 = {}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509171615.t8HGFBEs070565>