diff options
author | Roman Bogorodskiy <novel@FreeBSD.org> | 2016-04-09 03:44:44 +0000 |
---|---|---|
committer | Roman Bogorodskiy <novel@FreeBSD.org> | 2016-04-09 03:44:44 +0000 |
commit | a290b3172c2b5a1fc9bb8b5858395b948de473da (patch) | |
tree | 0dd813e8b2aba01cad3ee442c35fd6bc96fe7fb3 /deskutils | |
parent | - Update to 1.1-8 (diff) |
deskutils/virt-manager: update to 1.3.2
Notes
Notes:
svn path=/head/; revision=412795
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/virt-manager/Makefile | 7 | ||||
-rw-r--r-- | deskutils/virt-manager/distinfo | 4 | ||||
-rw-r--r-- | deskutils/virt-manager/files/patch-setup.py | 26 | ||||
-rw-r--r-- | deskutils/virt-manager/files/patch-virtManager_config.py | 13 | ||||
-rw-r--r-- | deskutils/virt-manager/files/patch-virtManager_viewers.py | 11 | ||||
-rw-r--r-- | deskutils/virt-manager/files/patch-virtinst_capabilities.py | 29 |
6 files changed, 18 insertions, 72 deletions
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile index 8e24f7f43df3..b12228d70c00 100644 --- a/deskutils/virt-manager/Makefile +++ b/deskutils/virt-manager/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= virt-manager -PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTVERSION= 1.3.2 CATEGORIES= deskutils net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ \ LOCAL/jgh/deskutils/${PORTNAME}/ @@ -27,8 +26,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus \ PYDISTUTILS_INSTALLNOSINGLE= yes PYDISTUTILS_CONFIGURE_TARGET= configure PYDISTUTILS_CONFIGUREARGS= --prefix=${PREFIX} +INSTALLS_ICONS= yes USES= python:2.7 gettext shebangfix -USE_PYTHON= autoplist distutils +USE_PYTHON= noegginfo autoplist distutils + NO_ARCH= yes USE_GNOME= introspection:run intltool librsvg2 pygobject3 diff --git a/deskutils/virt-manager/distinfo b/deskutils/virt-manager/distinfo index 92c110d4bb41..917d023d9630 100644 --- a/deskutils/virt-manager/distinfo +++ b/deskutils/virt-manager/distinfo @@ -1,2 +1,2 @@ -SHA256 (virt-manager-1.2.1.tar.gz) = 74bba80e72e5e1b4d84f1d5b7211b874e9c4ae00a0a44149d1721acab38ce6be -SIZE (virt-manager-1.2.1.tar.gz) = 2524812 +SHA256 (virt-manager-1.3.2.tar.gz) = 270c1f631fd029fee5291e83f50d69e261db666aa952c184643bc6cece77fdb3 +SIZE (virt-manager-1.3.2.tar.gz) = 2564573 diff --git a/deskutils/virt-manager/files/patch-setup.py b/deskutils/virt-manager/files/patch-setup.py index f267d7c62e9a..5d77b0a6db6a 100644 --- a/deskutils/virt-manager/files/patch-setup.py +++ b/deskutils/virt-manager/files/patch-setup.py @@ -1,19 +1,17 @@ ---- setup.py.orig 2015-08-10 18:15:04 UTC +--- setup.py.orig 2015-11-30 20:47:47 UTC +++ setup.py -@@ -208,12 +208,6 @@ class my_build(build): - build.run(self) +@@ -612,8 +612,8 @@ class VMMDistribution(distutils.dist.Dis + ] + def __init__(self, *args, **kwargs): +- self.no_update_icon_cache = False +- self.no_compile_schemas = False ++ self.no_update_icon_cache = True ++ self.no_compile_schemas = True + distutils.dist.Distribution.__init__(self, *args, **kwargs) --class my_egg_info(install_egg_info): -- """ -- Disable egg_info installation, seems pointless for a non-library -- """ -- def run(self): -- pass - - class my_install(install): -@@ -589,13 +583,11 @@ setup( +@@ -641,13 +641,11 @@ distutils.core.setup( "virt-convert", "virt-xml", ]), @@ -28,10 +26,10 @@ "man/virt-manager.1", "man/virt-install.1", "man/virt-clone.1", -@@ -617,7 +609,6 @@ setup( - +@@ -670,7 +668,6 @@ distutils.core.setup( 'sdist': my_sdist, 'install': my_install, + 'install_data': my_install_data, - 'install_egg_info': my_egg_info, 'configure': configure, diff --git a/deskutils/virt-manager/files/patch-virtManager_config.py b/deskutils/virt-manager/files/patch-virtManager_config.py deleted file mode 100644 index 0751189384cb..000000000000 --- a/deskutils/virt-manager/files/patch-virtManager_config.py +++ /dev/null @@ -1,13 +0,0 @@ ---- virtManager/config.py.orig 2014-11-19 23:35:48 UTC -+++ virtManager/config.py -@@ -20,8 +20,10 @@ - import os - import logging - -+import gi - from gi.repository import Gio - from gi.repository import GLib -+gi.require_version('Gtk', '3.0') - from gi.repository import Gtk - - from virtinst import CPU diff --git a/deskutils/virt-manager/files/patch-virtManager_viewers.py b/deskutils/virt-manager/files/patch-virtManager_viewers.py deleted file mode 100644 index e06734b71908..000000000000 --- a/deskutils/virt-manager/files/patch-virtManager_viewers.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 4db0cc73ec1a..000000000000 --- a/deskutils/virt-manager/files/patch-virtinst_capabilities.py +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 = {} |