diff options
| -rw-r--r-- | libre/virt-manager/PKGBUILD | 16 | ||||
| -rw-r--r-- | libre/virt-manager/libre.patch | 56 |
2 files changed, 58 insertions, 14 deletions
diff --git a/libre/virt-manager/PKGBUILD b/libre/virt-manager/PKGBUILD index 8dbfe34d2..3f6fc48ed 100644 --- a/libre/virt-manager/PKGBUILD +++ b/libre/virt-manager/PKGBUILD @@ -8,24 +8,18 @@ pkgbase=virt-manager pkgname=virt-install pkgver=1.4.2 -pkgrel=1.parabola1 +pkgrel=2.parabola1 pkgdesc="Console user interface for managing virtual machines, without non-FSDG compliant distros and operating systems support" arch=('any') url="http://virt-manager.org/" license=('GPL') -depends=('python2' 'libvirt-python2' 'libxml2' 'libvirt' - 'libosinfo' 'python2-ipaddr' 'python2-gobject' 'python2-requests' - 'cpio') -makedepends=('intltool>=0.35.0' - 'dbus-python' 'gtk-vnc' 'rarian' - 'yajl' 'librsvg' 'libuser' 'python2-cairo' - 'python2-ipy' 'newt-syrup' 'openbsd-netcat' 'x11-ssh-askpass' - 'graphite' 'spice-gtk3' - 'libvirt-glib' 'vte3') +depends=('python2-gobject' 'libvirt-glib' 'libvirt-python2' + 'python2-requests' 'python2-ipaddr' 'libosinfo') +makedepends=('intltool') source=("https://virt-manager.org/download/sources/virt-manager/virt-manager-$pkgver.tar.gz" 'libre.patch') sha256sums=('43e440bb099facf59b59c27c2fc4eb2c42ef0d4ed8d67d93c9e3d98538b6d574' - 'd076cbe2b68752cae89f89075ff6605e89b6ece611c19c0643cea84ccd85de4b') + '6df161707a56c6fcd00c326bef43994e44098288e8037b42c9ba4c953479eb43') prepare() { cd "$srcdir/$pkgbase-$pkgver" diff --git a/libre/virt-manager/libre.patch b/libre/virt-manager/libre.patch index 98486472a..4f1afedc1 100644 --- a/libre/virt-manager/libre.patch +++ b/libre/virt-manager/libre.patch @@ -2057,7 +2057,21 @@ # Move 'generic' to the front of the list types = virtinst.OSDB.list_types() -@@ -1046,8 +1044,6 @@ +@@ -1009,13 +1007,7 @@ + # Pretty names for OSes. If a new OS is not found here, + # its capitalized name is used. + oses = { +- "bsd": _("BSD"), + "generic": _("Generic"), +- "linux": _("Linux"), +- "macos": _("macOS"), +- "other": _("Others"), +- "solaris": _("Solaris"), +- "windows": _("Windows"), + } + + # When only the "supported" types are requested, +@@ -1046,32 +1038,14 @@ completion_model = self.widget("install-os-version-entry").get_completion().get_model() completion_model.clear() @@ -2066,7 +2080,23 @@ # All the subgroups for top-level types. Distributions not # belonging to these groups will be shown either in a "Others" # group, or top-level if there are no other groups. -@@ -1070,8 +1066,6 @@ +- groups = { +- "altlinux": _("ALT Linux"), +- "centos": _("CentOS"), +- "debian": _("Debian"), +- "fedora": _("Fedora"), +- "freebsd": _("FreeBSD"), +- "mageia": _("Mageia"), +- "netbsd": _("NetBSD"), +- "openbsd": _("OpenBSD"), +- "opensuse": _("openSUSE"), +- "rhel": _("Red Hat Enterprise Linux"), +- "sled": _("SUSE Linux Enterprise Desktop"), +- "sles": _("SUSE Linux Enterprise Server"), +- "ubuntu": _("Ubuntu"), +- } ++ groups = {} + if self._show_all_os_was_selected: # List all the OSes, and determine which OSes have groups, # and which do not. @@ -2075,7 +2105,7 @@ all_distros = set([_os.distro for _os in variants]) distros = [_os for _os in all_distros if _os in groups] distros.sort() -@@ -1099,15 +1093,13 @@ +@@ -1099,15 +1073,13 @@ else: # We are showing only the supported systems, so query them, # and add them directly to their type. @@ -2093,6 +2123,26 @@ widget.set_active(0) +@@ -1224,9 +1196,7 @@ + + osstr = "" + have_os = True +- if self._guest.os.is_container(): +- osstr = _("Linux") +- elif not distro: ++ if not distro: + osstr = _("Generic") + have_os = False + elif not version: +@@ -1328,7 +1298,7 @@ + break + + if not variant: +- return (None, None, False, None, None) ++ return (None, None, True, None, None) + + if drow: + distro = drow[OS_COL_ID] --- virt-manager-1.4.2.orig/virtcli/cliconfig.py 2017-08-08 17:04:11.000000000 -0500 +++ virt-manager-1.4.2/virtcli/cliconfig.py 2017-08-15 01:23:24.289573171 -0500 @@ -79,8 +79,6 @@ |