Index: head/deskutils/virt-manager/Makefile =================================================================== --- head/deskutils/virt-manager/Makefile (revision 393906) +++ head/deskutils/virt-manager/Makefile (revision 393907) @@ -1,54 +1,53 @@ # $FreeBSD$ PORTNAME= virt-manager -PORTVERSION= 1.1.0 -PORTREVISION= 6 +PORTVERSION= 1.2.1 CATEGORIES= deskutils net-mgmt MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ \ LOCAL/jgh/deskutils/${PORTNAME}/ MAINTAINER= jgh@FreeBSD.org COMMENT= Toolkit to interact with virtualization capabilities LICENSE= LGPL3 LIB_DEPENDS= libvirt.so:${PORTSDIR}/devel/libvirt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:${PORTSDIR}/textproc/py-libxml2 \ vte3>=0:${PORTSDIR}/x11-toolkits/vte3 \ ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \ ${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:${PORTSDIR}/www/py-urlgrabber \ ${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt \ gtk-vnc>=0.4.4:${PORTSDIR}/net/gtk-vnc \ libvirt-glib>=0.1.9:${PORTSDIR}/devel/libvirt-glib \ libosinfo>=0:${PORTSDIR}/devel/libosinfo \ spice-gtk>=0.26:${PORTSDIR}/deskutils/spice-gtk PYDISTUTILS_INSTALLNOSINGLE= yes PYDISTUTILS_CONFIGURE_TARGET= configure PYDISTUTILS_CONFIGUREARGS= --prefix=${PREFIX} USES= python:2.7 gettext shebangfix USE_PYTHON= autoplist distutils NO_ARCH= yes USE_GNOME= introspection:run intltool librsvg2 pygobject3 INSTALLS_ICONS= yes python_OLD_CMD= /usr/bin/python2 "-tt" SHEBANG_FILES= virt-manager \ virt-install \ virt-clone \ virt-convert \ virt-xml GLIB_SCHEMAS= org.virt-manager.virt-manager.gschema.xml #add workaround for two autoplist functions post-install: @${MKDIR} ${STAGEDIR}/${PREFIX}/share/glib-2.0/schemas/ .for file in ${GLIB_SCHEMAS} ${INSTALL_DATA} ${WRKSRC}/data/${file} ${STAGEDIR}/${PREFIX}/share/glib-2.0/schemas .endfor .include Index: head/deskutils/virt-manager/distinfo =================================================================== --- head/deskutils/virt-manager/distinfo (revision 393906) +++ head/deskutils/virt-manager/distinfo (revision 393907) @@ -1,2 +1,2 @@ -SHA256 (virt-manager-1.1.0.tar.gz) = ab0906cb15a132f1893f89ac4ca211c6c2c9c2d1860fbc285edbf9451c0f7941 -SIZE (virt-manager-1.1.0.tar.gz) = 2509440 +SHA256 (virt-manager-1.2.1.tar.gz) = 74bba80e72e5e1b4d84f1d5b7211b874e9c4ae00a0a44149d1721acab38ce6be +SIZE (virt-manager-1.2.1.tar.gz) = 2524812 Index: head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py =================================================================== --- head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py (revision 393906) +++ head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py (nonexistent) @@ -1,32 +0,0 @@ -From 0aeee5c449d608d75f5632e9aa47f5e433eb3879 Mon Sep 17 00:00:00 2001 -From: Cole Robinson -Date: Sun, 26 Apr 2015 11:50:01 -0400 -Subject: serialcon: Fix opening with xen (bz 1215357) - -Apparently xen doesn't set device alias names, and OpenConsole -just opens the first device unconditionally. - -Properly handling that would be to report it in the UI that we can -only open the first console, but for now just drop the alias check. -Apparently SUSE already does this as mentioned in the RH bug - -https://bugzilla.redhat.com/show_bug.cgi?id=1215357 - -diff --git a/virtManager/serialcon.py b/virtManager/serialcon.py -index 92c2029..320811b 100644 ---- ./virtManager/serialcon.py -+++ ./virtManager/serialcon.py -@@ -205,8 +205,9 @@ class LibvirtConsoleConnection(ConsoleConnection): - name = dev and dev.alias.name or None - logging.debug("Opening console stream for dev=%s alias=%s", - dev, name) -- if not name: -- raise RuntimeError(_("Cannot open a device with no alias name")) -+ # libxl doesn't set aliases, their open_console just defaults to -+ # opening the first console device, so don't force prescence of -+ # an alias - - stream = self.conn.get_backend().newStream(libvirt.VIR_STREAM_NONBLOCK) - self.vm.open_console(name, stream) --- -cgit v0.10.2 Property changes on: head/deskutils/virt-manager/files/patch-virtManager_serialcon-bug1215357.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/virt-manager/files/patch-virtManager_serialcon.py =================================================================== --- head/deskutils/virt-manager/files/patch-virtManager_serialcon.py (revision 393906) +++ head/deskutils/virt-manager/files/patch-virtManager_serialcon.py (nonexistent) @@ -1,10 +0,0 @@ ---- virtManager/serialcon.py.orig 2014-07-28 15:11:32 UTC -+++ virtManager/serialcon.py -@@ -326,7 +326,6 @@ class vmmSerialConsole(vmmGObject): - self.terminal = Vte.Terminal() - self.terminal.set_scrollback_lines(1000) - self.terminal.set_audible_bell(False) -- self.terminal.set_visible_bell(True) - - self.terminal.connect("button-press-event", self.show_serial_rcpopup) - self.terminal.connect("commit", self.console.send_data, self.terminal) Property changes on: head/deskutils/virt-manager/files/patch-virtManager_serialcon.py ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/deskutils/virt-manager/files/patch-setup.py =================================================================== --- head/deskutils/virt-manager/files/patch-setup.py (revision 393906) +++ head/deskutils/virt-manager/files/patch-setup.py (revision 393907) @@ -1,38 +1,38 @@ ---- setup.py.orig 2014-09-06 22:26:12 UTC +--- setup.py.orig 2015-08-10 18:15:04 UTC +++ setup.py -@@ -209,14 +209,6 @@ class my_build(build): +@@ -208,12 +208,6 @@ class my_build(build): build.run(self) -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): - """ - Error if we weren't 'configure'd with the correct install prefix -@@ -601,11 +593,9 @@ setup( +@@ -589,13 +583,11 @@ setup( "virt-convert", "virt-xml", ]), - ("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", [ + ("man/man1", [ "man/virt-manager.1", "man/virt-install.1", "man/virt-clone.1", -@@ -627,7 +617,6 @@ setup( +@@ -617,7 +609,6 @@ setup( 'sdist': my_sdist, 'install': my_install, - 'install_egg_info': my_egg_info, 'configure': configure,