From b05c8c686446ba1e72a46caed3582894c8ac4a86 Mon Sep 17 00:00:00 2001 From: Charles Arnold Date: Tue, 7 Jun 2016 14:51:44 +0000 Subject: [PATCH] Accepting request 400451 from home:jubalh:branches:Virtualization - boo#983482: Virt-Manager 1.3.2 cannot create screenshot. Use upstream patch from revision f454798b337aedb881671f62fe3b25fad703b768 - Add f454798b-virtman-fix-making-screenshot.patch OBS-URL: https://build.opensuse.org/request/show/400451 OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=312 --- f454798b-virtman-fix-making-screenshot.patch | 26 ++++++++++++++++++++ virt-manager.changes | 7 ++++++ virt-manager.spec | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 f454798b-virtman-fix-making-screenshot.patch diff --git a/f454798b-virtman-fix-making-screenshot.patch b/f454798b-virtman-fix-making-screenshot.patch new file mode 100644 index 00000000..422ffbc4 --- /dev/null +++ b/f454798b-virtman-fix-making-screenshot.patch @@ -0,0 +1,26 @@ +From f454798b337aedb881671f62fe3b25fad703b768 Mon Sep 17 00:00:00 2001 +From: Cole Robinson +Date: Fri, 15 Jan 2016 15:07:58 -0500 +Subject: [PATCH] details: Fix screenshot on F24 rawhide (bz 1297988) + +--- + virtManager/details.py | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/virtManager/details.py b/virtManager/details.py +index 0bd2569..3dbd82f 100644 +--- a/virtManager/details.py ++++ b/virtManager/details.py +@@ -1486,6 +1486,9 @@ class vmmDetails(vmmGObjectUI): + # and future proof it a bit + if type(ret) is tuple and len(ret) >= 2: + ret = ret[1] ++ # F24 rawhide, ret[1] is a named tuple with a 'buffer' element... ++ if hasattr(ret, "buffer"): ++ ret = ret.buffer + + import datetime + now = str(datetime.datetime.now()).split(".")[0].replace(" ", "_") +-- +2.8.3 + diff --git a/virt-manager.changes b/virt-manager.changes index a295f593..e9745e83 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 7 12:14:23 UTC 2016 - mvetter@suse.com + +- boo#983482: Virt-Manager 1.3.2 cannot create screenshot. + Use upstream patch from revision f454798b337aedb881671f62fe3b25fad703b768 +- Add f454798b-virtman-fix-making-screenshot.patch + ------------------------------------------------------------------- Tue May 10 11:57:19 MDT 2016 - carnold@suse.com diff --git a/virt-manager.spec b/virt-manager.spec index f70456eb..912ef338 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -43,6 +43,7 @@ Patch3: eae7dc06-fix-URL-installs-when-content-length-header-missing.pat Patch4: 1c221fd0-suse-ovmf-paths.patch Patch5: f11eb00b-virt-convert-decompress-gz-files-before-converting.patch Patch6: 8ba48f52-add-virtio-device-model-and-accel3d-attribute.patch +Patch7: f454798b-virtman-fix-making-screenshot.patch # SUSE Only Patch70: virtman-desktop.patch Patch71: virtman-kvm.patch @@ -168,6 +169,7 @@ machine). %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 # SUSE Only %patch70 -p1 %patch71 -p1