diff options
Diffstat (limited to 'deskutils')
-rw-r--r-- | deskutils/virt-manager/Makefile | 51 | ||||
-rw-r--r-- | deskutils/virt-manager/distinfo | 4 | ||||
-rw-r--r-- | deskutils/virt-manager/files/patch-setup.py | 34 | ||||
-rw-r--r-- | deskutils/virt-manager/files/patch-virtManager_config.py | 13 | ||||
-rw-r--r-- | deskutils/virt-manager/files/patch-virtManager_console.py | 16 |
5 files changed, 93 insertions, 25 deletions
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile index b293235aa542..9f14d40a7daf 100644 --- a/deskutils/virt-manager/Makefile +++ b/deskutils/virt-manager/Makefile @@ -1,11 +1,9 @@ -# Created by: Jason Helfman <jgh@FreeBSD.org> # $FreeBSD$ PORTNAME= virt-manager -PORTVERSION= 0.9.5 -PORTREVISION= 8 +PORTVERSION= 1.1.0 CATEGORIES= deskutils net-mgmt -MASTER_SITES= http://virt-manager.et.redhat.com/download/sources/${PORTNAME}/ \ +MASTER_SITES= http://virt-manager.org/download/sources/${PORTNAME}/ \ LOCAL/jgh/deskutils/${PORTNAME}/ MAINTAINER= jgh@FreeBSD.org @@ -16,29 +14,36 @@ 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 \ - ${PYTHON_PKGNAMEPREFIX}virtinst>=0.600.4:${PORTSDIR}/net-mgmt/virtinst \ ${PYTHON_PKGNAMEPREFIX}vte>=0.26.2:${PORTSDIR}/x11-toolkits/py-vte \ - gtk-vnc>=0.3.10:${PORTSDIR}/net/gtk-vnc \ - librsvg2>=2.32.1:${PORTSDIR}/graphics/librsvg2 \ - ${PYTHON_PKGNAMEPREFIX}libvirt>=0:${PORTSDIR}/devel/py-libvirt + ${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.so:${PORTSDIR}/devel/libosinfo -BROKEN= Needs work after gtk-vnc update, maintainer is aware. +PYDISTUTILS_INSTALLNOSINGLE= yes +PYDISTUTILS_CONFIGURE_TARGET= configure +PYDISTUTILS_CONFIGUREARGS= --prefix=${PREFIX} +USES= python:2.7 +USE_PYTHON= distutils autoplist -OPTIONS_DEFINE= NLS -OPTIONS_SUB= yes +USE_GNOME= introspection:run intltool librsvg2 pygobject3 -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls - -USE_GNOME= pygnome2 INSTALLS_ICONS= yes -GCONF_SCHEMAS= virt-manager.schemas -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --without-tui -USES= gmake python - -post-patch: - @${REINPLACE_CMD} -e 's|itlocaledir = $$(prefix)/$$(DATADIRNAME)/locale|itlocaledir = $$(prefix)/share/locale|' \ - ${WRKSRC}/po/Makefile.in.in + +USES= desktop-file-utils gettext shebangfix +SHEBANG_FILES= virt-manager \ + virt-install \ + virt-clone \ + virt-convert + +GLIB_SCHEMAS= org.virt-manager.virt-manager.gschema.xml + +post-patch-script: + @${REINPLACE_CMD} -e 's|self.default_graphics = "spice"|self.default_graphics = "vnc"|g' \ + ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's|from gi.repository import SpiceClient.*||g' \ + ${WRKSRC}/virtManager/console.py .include <bsd.port.mk> diff --git a/deskutils/virt-manager/distinfo b/deskutils/virt-manager/distinfo index 88ec383a56c0..f282af19edcd 100644 --- a/deskutils/virt-manager/distinfo +++ b/deskutils/virt-manager/distinfo @@ -1,2 +1,2 @@ -SHA256 (virt-manager-0.9.5.tar.gz) = 5d2afb282fb8c4401f9e203dcb41a62746b9a909258d440d508219bc1a33803d -SIZE (virt-manager-0.9.5.tar.gz) = 1773882 +SHA256 (virt-manager-1.1.0.tar.gz) = ab0906cb15a132f1893f89ac4ca211c6c2c9c2d1860fbc285edbf9451c0f7941 +SIZE (virt-manager-1.1.0.tar.gz) = 2509440 diff --git a/deskutils/virt-manager/files/patch-setup.py b/deskutils/virt-manager/files/patch-setup.py new file mode 100644 index 000000000000..74036305ea60 --- /dev/null +++ b/deskutils/virt-manager/files/patch-setup.py @@ -0,0 +1,34 @@ +--- setup.py.orig 2014-09-06 22:26:12 UTC ++++ setup.py +@@ -209,14 +209,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 +@@ -605,7 +597,7 @@ setup( + ["data/org.virt-manager.virt-manager.gschema.xml"]), + ("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 +619,6 @@ setup( + + 'sdist': my_sdist, + 'install': my_install, +- '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 new file mode 100644 index 000000000000..0751189384cb --- /dev/null +++ b/deskutils/virt-manager/files/patch-virtManager_config.py @@ -0,0 +1,13 @@ +--- 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_console.py b/deskutils/virt-manager/files/patch-virtManager_console.py new file mode 100644 index 000000000000..717977bddc37 --- /dev/null +++ b/deskutils/virt-manager/files/patch-virtManager_console.py @@ -0,0 +1,16 @@ +--- virtManager/console.py.orig 2014-11-19 23:37:09 UTC ++++ virtManager/console.py +@@ -20,10 +20,13 @@ + # MA 02110-1301 USA. + # + ++import gi + from gi.repository import GObject + from gi.repository import Gtk + from gi.repository import Gdk ++gi.require_version('GtkVnc', '2.0') + from gi.repository import GtkVnc ++gi.require version('SpiceClientGtk', '3.0') + from gi.repository import SpiceClientGtk + from gi.repository import SpiceClientGLib + |