From a3dcf5ffc764ca90d1b9952faa94487cadc3feba Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Thu, 12 May 2016 12:31:10 +0200
Subject: [PATCH] - up to 2.6.0

---
 libjpeg-boolean.patch |  9 ++++-----
 qemu-xattr.patch      | 13 +++++++------
 qemu.spec             |  6 ++----
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/libjpeg-boolean.patch b/libjpeg-boolean.patch
index c321830..cd1da49 100644
--- a/libjpeg-boolean.patch
+++ b/libjpeg-boolean.patch
@@ -1,10 +1,9 @@
-diff -dur qemu-1.7.1.orig/ui/vnc-enc-tight.c qemu-1.7.1/ui/vnc-enc-tight.c
---- qemu-1.7.1.orig/ui/vnc-enc-tight.c	2014-03-25 15:01:10.000000000 +0100
-+++ qemu-1.7.1/ui/vnc-enc-tight.c	2014-04-09 11:36:05.000000000 +0200
-@@ -41,6 +41,8 @@
+--- qemu-2.6.0/ui/vnc-enc-tight.c~	2016-05-11 17:56:18.000000000 +0200
++++ qemu-2.6.0/ui/vnc-enc-tight.c	2016-05-12 12:15:06.418186314 +0200
+@@ -40,6 +40,8 @@
+ #include <png.h>
  #endif
  #ifdef CONFIG_VNC_JPEG
- #include <stdio.h>
 +#define HAVE_BOOLEAN
 +#define boolean int
  #include <jpeglib.h>
diff --git a/qemu-xattr.patch b/qemu-xattr.patch
index 4d89cb2..c137485 100644
--- a/qemu-xattr.patch
+++ b/qemu-xattr.patch
@@ -5,19 +5,20 @@ before <sys/capability.h> (which includes <linux/xattr.h>.
 
 --- qemu-1.7.1/fsdev/virtfs-proxy-helper.c.orig	2014-03-25 15:01:10.000000000 +0100
 +++ qemu-1.7.1/fsdev/virtfs-proxy-helper.c	2014-04-03 02:55:41.115547990 +0200
-@@ -9,6 +9,7 @@
-  * the COPYING file in the top-level directory.
+@@ -10,6 +10,7 @@
   */
  
+ #include "qemu/osdep.h"
 +#include "qemu/xattr.h"
  #include <sys/resource.h>
  #include <getopt.h>
  #include <syslog.h>
-@@ -22,7 +23,6 @@
+@@ -23,7 +24,6 @@
  #endif
  #include "qemu-common.h"
  #include "qemu/sockets.h"
 -#include "qemu/xattr.h"
- #include "virtio-9p-marshal.h"
- #include "hw/9pfs/virtio-9p-proxy.h"
- #include "fsdev/virtio-9p-marshal.h"
+ #include "9p-iov-marshal.h"
+ #include "hw/9pfs/9p-proxy.h"
+ #include "fsdev/9p-iov-marshal.h"
+
diff --git a/qemu.spec b/qemu.spec
index 577b75e..7bbbcae 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -36,12 +36,12 @@
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
-Version:	2.5.1.1
+Version:	2.6.0
 Release:	1
 License:	GPL v2
 Group:		Applications/Emulators
 Source0:	http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	f5ff0e71398b9e428b4f177001ba4285
+# Source0-md5:	ca3f70b43f093e33e9e014f144067f13
 Source2:	%{name}.binfmt
 # Loads kvm kernel modules at boot
 Source3:	kvm-modules-load.conf
@@ -1004,7 +1004,6 @@ fi
 %{_datadir}/%{name}/pxe-virtio.rom
 %{_datadir}/%{name}/qemu_logo_no_text.svg
 %{_datadir}/%{name}/s390-ccw.img
-%{_datadir}/%{name}/s390-zipl.rom
 %{_datadir}/%{name}/sgabios.bin
 %{_datadir}/%{name}/slof.bin
 %{_datadir}/%{name}/spapr-rtas.bin
@@ -1144,7 +1143,6 @@ fi
 %{_datadir}/%{name}/bios.bin
 %{_datadir}/%{name}/bios-256k.bin
 %{_datadir}/%{name}/acpi-dsdt.aml
-%{_datadir}/%{name}/q35-acpi-dsdt.aml
 
 %files system-xtensa
 %defattr(644,root,root,755)
-- 
2.43.0