aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/virt-manager/APKBUILD14
-rw-r--r--main/virt-manager/dont-double-create-spice-display.patch26
2 files changed, 35 insertions, 5 deletions
diff --git a/main/virt-manager/APKBUILD b/main/virt-manager/APKBUILD
index d5e26a67b50..8c68e28211a 100644
--- a/main/virt-manager/APKBUILD
+++ b/main/virt-manager/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=virt-manager
pkgver=0.10.0
-pkgrel=0
+pkgrel=1
pkgdesc="GUI for managing virtual machines"
url="http://virt-manager.et.redhat.com/"
arch="noarch"
@@ -15,7 +15,8 @@ install=
subpackages="$pkgname-doc $pkgname-lang
$pkgname-common
virt-install:virt_install"
-source="http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-$pkgver.tar.gz"
+source="http://virt-manager.et.redhat.com/download/sources/virt-manager/virt-manager-$pkgver.tar.gz
+ dont-double-create-spice-display.patch"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
@@ -58,6 +59,9 @@ virt_install() {
"$subpkgdir"/usr/bin/ || return 1
}
-md5sums="e23b8d2a7623b4e8e256c25735f332c8 virt-manager-0.10.0.tar.gz"
-sha256sums="59bd8f316917228885261a1ecbeb9aadbb0b0e02cdf5fc974c78113c5814346d virt-manager-0.10.0.tar.gz"
-sha512sums="13eaed3645ccee79da6a972e02bb182b5bd24981ff55b6322b8aaf2689fab520f22f1e729bb5f5287d66526252a31a531c6595ee27489a52fb4829ae18cf8204 virt-manager-0.10.0.tar.gz"
+md5sums="e23b8d2a7623b4e8e256c25735f332c8 virt-manager-0.10.0.tar.gz
+5c5eda2c20ae89a64444515a78aefbb9 dont-double-create-spice-display.patch"
+sha256sums="59bd8f316917228885261a1ecbeb9aadbb0b0e02cdf5fc974c78113c5814346d virt-manager-0.10.0.tar.gz
+aae446cecfea9703df3835ebf2bc9c215328738214b13ca625fa6951628e4386 dont-double-create-spice-display.patch"
+sha512sums="13eaed3645ccee79da6a972e02bb182b5bd24981ff55b6322b8aaf2689fab520f22f1e729bb5f5287d66526252a31a531c6595ee27489a52fb4829ae18cf8204 virt-manager-0.10.0.tar.gz
+a0ff9479328ac4845f00454d4fc78c5ffe825de1186c4d09d7d6a06ccbbc98d965a9b281395cc8a285bf16755a1a5519466d3a0c07c25cb726d093de46496864 dont-double-create-spice-display.patch"
diff --git a/main/virt-manager/dont-double-create-spice-display.patch b/main/virt-manager/dont-double-create-spice-display.patch
new file mode 100644
index 00000000000..c9a3a9c0801
--- /dev/null
+++ b/main/virt-manager/dont-double-create-spice-display.patch
@@ -0,0 +1,26 @@
+From 5f497cba41785fc5532633811001958f99573f9b Mon Sep 17 00:00:00 2001
+From: Cole Robinson <crobinso@redhat.com>
+Date: Tue, 09 Jul 2013 21:50:05 +0000
+Subject: console: Don't double create spice display
+
+I can't reproduce, but a couple gentoo users have issues that this
+fixes:
+
+https://bugzilla.redhat.com/show_bug.cgi?id=981975
+---
+diff --git a/virtManager/console.py b/virtManager/console.py
+index 51175c0..553c022 100644
+--- a/virtManager/console.py
++++ b/virtManager/console.py
+@@ -536,7 +536,8 @@ class SpiceViewer(Viewer):
+ channel.connect_after("channel-event", self._main_channel_event_cb)
+ return
+
+- if type(channel) == SpiceClientGLib.DisplayChannel:
++ if (type(channel) == SpiceClientGLib.DisplayChannel and
++ not self.display):
+ channel_id = channel.get_property("channel-id")
+
+ if channel_id != 0:
+--
+cgit v0.9.1