workaround for libjpeg/glib boolean conflict

diff --git a/libjpeg-boolean.patch b/libjpeg-boolean.patch
new file mode 100644 (file)
index 0000000..c321830
--- /dev/null
+++ b/libjpeg-boolean.patch
@@ -0,0 +1,12 @@
+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 @@
+ #endif
+ #ifdef CONFIG_VNC_JPEG
+ #include <stdio.h>
++#define HAVE_BOOLEAN
++#define boolean int
+ #include <jpeglib.h>
+ #endif
+ 

diff --git a/qemu.spec b/qemu.spec
index d3cfa3399a68ea16bb57c9e10d8b24ea750d907f..57c511b55a7f36e08f8f55f8d102cde700a4d1b7 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -41,6 +41,7 @@ Patch2:               %{name}-whitelist.patch
 Patch3:                %{name}-system-libcacard.patch
 Patch4:                vmdk3ro.patch
 Patch5:                %{name}-xattr.patch
+Patch6:                libjpeg-boolean.patch
 # Proof of concept, for reference, do not remove
 Patch400:      %{name}-kde_virtual_workspaces_hack.patch
 URL:           http://www.qemu-project.org/
@@ -587,6 +588,7 @@ Ten pakiet nie musi być zainstalowany w systemie hosta.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__mv} libcacard libcacard-use-system-lib