e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch
c5ce0ab5-connection-fix-transport-detection.patch 6daff68a-fix-italian-lang-file.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=323
This commit is contained in:
Charles Arnold
Git OBS Bridge
parent
dc08495c33
commit
b27495e815
31
6daff68a-fix-italian-lang-file.patch
Normal file
31
6daff68a-fix-italian-lang-file.patch
Normal file
@ -0,0 +1,31 @@
|
||||
Note: This is just a part of the upstream patch
|
||||
|
||||
Subject: Update translations, and fix it.po problems
|
||||
From: Cole Robinson crobinso@redhat.com Wed Jun 29 08:49:00 2016 -0400
|
||||
Date: Wed Jun 29 08:49:00 2016 -0400:
|
||||
Git: 6daff68a3f04fd166d555e4ad632564adc0e57a2
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1350185
|
||||
|
||||
Index: virt-manager-1.4.0/po/it.po
|
||||
===================================================================
|
||||
--- virt-manager-1.4.0.orig/po/it.po
|
||||
+++ virt-manager-1.4.0/po/it.po
|
||||
@@ -1460,7 +1460,7 @@ msgstr "Invia combinazione di tasti"
|
||||
#: ../virtManager/console.py:289
|
||||
#, python-format
|
||||
msgid "%(vm-name)s on %(connection-name)s"
|
||||
-msgstr "%(nome-mv)s su %(nome-connessione)s"
|
||||
+msgstr "%(vm-name)s su %(connection-name)s"
|
||||
|
||||
#: ../virtManager/console.py:296
|
||||
#, python-format
|
||||
@@ -2515,7 +2515,7 @@ msgstr "Disabilitato"
|
||||
#: ../virtManager/details.py:2435
|
||||
#, python-format
|
||||
msgid "%(current-memory)s of %(total-memory)s"
|
||||
-msgstr "%(memoria-corrente)s di %(memoria-totale)s"
|
||||
+msgstr "%(current-memory)s di %(total-memory)s"
|
||||
|
||||
#: ../virtManager/details.py:2645
|
||||
msgid "Absolute Movement"
|
||||
23
c5ce0ab5-connection-fix-transport-detection.patch
Normal file
23
c5ce0ab5-connection-fix-transport-detection.patch
Normal file
@ -0,0 +1,23 @@
|
||||
Subject: connection: Fix transport detection for qemu://$HOST/system
|
||||
From: Cole Robinson crobinso@redhat.com Tue Jun 21 11:31:26 2016 -0400
|
||||
Date: Tue Jun 21 11:31:26 2016 -0400:
|
||||
Git: c5ce0ab512b0d8a3045b9d09329648559f825b86
|
||||
|
||||
In this case, when a host is specified but not a transport, libvirt
|
||||
defaults to transport=tls
|
||||
|
||||
diff --git a/virtinst/connection.py b/virtinst/connection.py
|
||||
index a09f4df..2efc3eb 100644
|
||||
--- a/virtinst/connection.py
|
||||
+++ b/virtinst/connection.py
|
||||
@@ -355,6 +355,10 @@ class VirtualConnection(object):
|
||||
def get_uri_username(self):
|
||||
return self._uriobj.username
|
||||
def get_uri_transport(self):
|
||||
+ if self.get_uri_hostname() and not self._uriobj.transport:
|
||||
+ # Libvirt defaults to transport=tls if hostname specified but
|
||||
+ # no transport is specified
|
||||
+ return "tls"
|
||||
return self._uriobj.transport
|
||||
def get_uri_path(self):
|
||||
return self._uriobj.path
|
||||
48
e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch
Normal file
48
e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch
Normal file
@ -0,0 +1,48 @@
|
||||
Subject: viewers: spice: Catch failure to setup usbdev manager
|
||||
From: Cole Robinson crobinso@redhat.com Tue Jun 21 09:01:32 2016 -0400
|
||||
Date: Tue Jun 21 09:01:32 2016 -0400:
|
||||
Git: e69cc002b10b49a77f1cd5170931e5e9209ab240
|
||||
|
||||
Since some distros like openbsd don't compile support for
|
||||
usb redirection, which makes this fail
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1348479
|
||||
|
||||
diff --git a/virtManager/viewers.py b/virtManager/viewers.py
|
||||
index 403c316..2f7d2e9 100644
|
||||
--- a/virtManager/viewers.py
|
||||
+++ b/virtManager/viewers.py
|
||||
@@ -538,16 +538,23 @@ class SpiceViewer(Viewer):
|
||||
GObject.GObject.connect(self._spice_session, "channel-new",
|
||||
self._channel_new_cb)
|
||||
|
||||
- self._usbdev_manager = SpiceClientGLib.UsbDeviceManager.get(
|
||||
- self._spice_session)
|
||||
- self._usbdev_manager.connect("auto-connect-failed",
|
||||
- self._usbdev_redirect_error)
|
||||
- self._usbdev_manager.connect("device-error",
|
||||
- self._usbdev_redirect_error)
|
||||
-
|
||||
- autoredir = self.config.get_auto_redirection()
|
||||
- if autoredir:
|
||||
- gtk_session.set_property("auto-usbredir", True)
|
||||
+ # Distros might have usb redirection compiled out, like OpenBSD
|
||||
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1348479
|
||||
+ try:
|
||||
+ self._usbdev_manager = SpiceClientGLib.UsbDeviceManager.get(
|
||||
+ self._spice_session)
|
||||
+ self._usbdev_manager.connect("auto-connect-failed",
|
||||
+ self._usbdev_redirect_error)
|
||||
+ self._usbdev_manager.connect("device-error",
|
||||
+ self._usbdev_redirect_error)
|
||||
+
|
||||
+ autoredir = self.config.get_auto_redirection()
|
||||
+ if autoredir:
|
||||
+ gtk_session.set_property("auto-usbredir", True)
|
||||
+ except:
|
||||
+ self._usbdev_manager = None
|
||||
+ logging.debug("Error initializing spice usb device manager",
|
||||
+ exc_info=True)
|
||||
|
||||
|
||||
#####################
|
||||
@ -3,6 +3,9 @@ Mon Jun 20 15:21:20 MDT 2016 - carnold@suse.com
|
||||
|
||||
- Update to virt-manager version 1.4.0 (fate#319990)
|
||||
virt-manager-1.4.0.tar.bz2
|
||||
e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch
|
||||
c5ce0ab5-connection-fix-transport-detection.patch
|
||||
6daff68a-fix-italian-lang-file.patch
|
||||
virtman-dont-specify-vte-version.patch
|
||||
* virt-manager: spice GL console support (Marc-André Lureau, Cole Robinson)
|
||||
* Bump gtk and pygobject deps to 3.14
|
||||
|
||||
@ -37,6 +37,9 @@ Source0: %{name}-%{version}.tar.bz2
|
||||
Source1: virt-install.rb
|
||||
Source2: virt-install.desktop
|
||||
# Upstream Patches
|
||||
Patch1: e69cc002-spice-catch-failure-to-setup-usbdev-manager.patch
|
||||
Patch2: c5ce0ab5-connection-fix-transport-detection.patch
|
||||
Patch3: 6daff68a-fix-italian-lang-file.patch
|
||||
# SUSE Only
|
||||
Patch70: virtman-desktop.patch
|
||||
Patch71: virtman-kvm.patch
|
||||
@ -153,6 +156,9 @@ machine).
|
||||
%prep
|
||||
%setup -q
|
||||
# Upstream Patches
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
# SUSE Only
|
||||
%patch70 -p1
|
||||
%patch71 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user