diff --git a/srcpkgs/qemu/patches/0001-Replace-struct-siginfo-with-siginfo_t.patch b/srcpkgs/qemu/patches/0001-Replace-struct-siginfo-with-siginfo_t.patch deleted file mode 100644 index 51a2179a73..0000000000 --- a/srcpkgs/qemu/patches/0001-Replace-struct-siginfo-with-siginfo_t.patch +++ /dev/null @@ -1,70 +0,0 @@ -From baf954154e7c0acda038c01a5c28aea4db7eec67 Mon Sep 17 00:00:00 2001 -From: "Richard W.M. Jones" -Date: Thu, 5 Jul 2012 14:28:03 +0100 -Subject: [PATCH] Replace 'struct siginfo' with 'siginfo_t'. - -glibc 2.16 will remove the undocumented definition of 'struct siginfo' -from . - -This change is already present in glibc 2.15.90, so qemu compilation -of certain targets (eg. cris-user) breaks. - -This struct was always typedef'd to be the same as 'siginfo_t' which -is what POSIX documents, so use that instead. - -Signed-off-by: Richard W.M. Jones ---- - linux-user/signal.c | 8 ++++---- - user-exec.c | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/linux-user/signal.c b/linux-user/signal.c -index 43346dc..108dff9 100644 ---- linux-user/signal.c -+++ linux-user/signal.c -@@ -2849,7 +2849,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, - * Arguments to signal handler: - * - * a0 = signal number -- * a1 = pointer to struct siginfo -+ * a1 = pointer to siginfo_t - * a2 = pointer to struct ucontext - * - * $25 and PC point to the signal handler, $29 points to the -@@ -3255,7 +3255,7 @@ struct target_signal_frame { - }; - - struct rt_signal_frame { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - uint32_t tramp[2]; - }; -@@ -3474,9 +3474,9 @@ struct target_signal_frame { - }; - - struct rt_signal_frame { -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - uint8_t retcode[8]; /* Trampoline code. */ - }; -diff --git a/user-exec.c b/user-exec.c -index b2a4261..1a9c276 100644 ---- user-exec.c -+++ user-exec.c -@@ -588,7 +588,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, - int cpu_signal_handler(int host_signum, void *pinfo, - void *puc) - { -- struct siginfo *info = pinfo; -+ siginfo_t *info = pinfo; - struct ucontext *uc = puc; - unsigned long pc = uc->uc_mcontext.sc_iaoq[0]; - uint32_t insn = *(uint32_t *)pc; --- -1.7.10.4 - diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index da6a4b7d86..a04146bc62 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,13 +1,13 @@ # Template file for 'qemu' pkgname=qemu -version=1.1.1 -revision=2 +version=1.2.0 +revision=1 nostrip=yes build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-spice --enable-kvm --audio-drv-list=alsa,sdl,pa --disable-xen ---enable-vhost-net --enable-vnc-thread --enable-vnc-png ---enable-vnc-tls --enable-virtfs --disable-fdt" +--enable-vhost-net --enable-vnc-png --enable-vnc-tls --enable-virtfs +--disable-fdt" makedepends="perl python attr-devel libpng-devel>=1.5.10 jpeg-devel ncurses-devel libuuid-devel libX11-devel alsa-lib-devel gnutls-devel SDL-devel libbluetooth-devel libsasl-devel spice-devel glib-devel MesaLib-devel pulseaudio-devel nss-devel @@ -17,8 +17,8 @@ short_desc="Open Source Processor Emulator" maintainer="Juan RP " homepage="http://qemu.org" license="GPL-2, LGPL-2.1" -distfiles="http://wiki.qemu.org/download/qemu-${version}-1.tar.bz2" -checksum=6fbaff1fa75aae1a06947cf7cb101c35273712c561b87ef8eaec92aa39734ac8 +distfiles="http://wiki.qemu.org/download/qemu-${version}.tar.bz2" +checksum=c8b84420d9f4869397f84cad2dabd9a475b7723d619a924a873740353e9df936 long_desc=" QEMU is a generic and open source machine emulator and virtualizer.