Accepting request 214293 from home:a_faerber:branches:Virtualization

Properly use Gtk3 (bnc#840607, bnc#849587)

OBS-URL: https://build.opensuse.org/request/show/214293
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=176

0001-XXX-dont-dump-core-on-sigabort.patc.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] XXX dont dump core on sigabort
 
 ---
  linux-user/signal.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
 
 diff --git a/linux-user/signal.c b/linux-user/signal.c
 index 7751c47..a9874b1 100644

0002-XXX-work-around-SA_RESTART-race-wit.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)
 
 [AF: CPUState -> CPUArchState, adapt to reindentation]
 ---
- linux-user/main.c    |   25 +++++++++-----
+ linux-user/main.c    | 25 +++++++++------
  linux-user/qemu.h    |  3 ++
- linux-user/signal.c  |   22 ++++++++++++
+ linux-user/signal.c  | 22 +++++++++++++
- linux-user/syscall.c |   90 +++++++++++++++++++++++++++++++++++++++++++++++++-
+ linux-user/syscall.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++-
  4 files changed, 130 insertions(+), 10 deletions(-)
 
 diff --git a/linux-user/main.c b/linux-user/main.c

0003-qemu-0.9.0.cvs-binfmt.patch.patch

@@ -11,7 +11,7 @@ Fixes binfmt_misc setup script:
 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
  scripts/qemu-binfmt-conf.sh | 37 ++++++++++++++++++++-----------------
- 1 files changed, 20 insertions(+), 17 deletions(-)
+ 1 file changed, 20 insertions(+), 17 deletions(-)
 
 diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
 index 0da2618..dc652f0 100644

0004-qemu-cvs-alsa_bitfield.patch.patch

@@ -10,7 +10,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
  include/exec/user/thunk.h |  3 +++
  thunk.c                   | 21 +++++++++++++++++++++
- 2 files changed, 24 insertions(+), 0 deletions(-)
+ 2 files changed, 24 insertions(+)
 
 diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
 index 87025c3..6c35e64 100644

0005-qemu-cvs-alsa_ioctl.patch.patch

@@ -14,7 +14,7 @@ Signed-off-by: Ulrich Hecht <uli@suse.de>
  linux-user/syscall_defs.h        |    2 +
  linux-user/syscall_types.h       |    5 +
  linux-user/syscall_types_alsa.h  | 1336 +++++++++++++++++++++++++++++
- 6 files changed, 3555 insertions(+), 0 deletions(-)
+ 6 files changed, 3555 insertions(+)
  create mode 100644 linux-user/ioctls_alsa.h
  create mode 100644 linux-user/ioctls_alsa_structs.h
  create mode 100644 linux-user/syscall_types_alsa.h

0006-qemu-cvs-alsa_mmap.patch.patch

@@ -9,7 +9,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
  linux-user/mmap.c | 14 ++++++++++++++
- 1 files changed, 14 insertions(+), 0 deletions(-)
+ 1 file changed, 14 insertions(+)
 
 diff --git a/linux-user/mmap.c b/linux-user/mmap.c
 index a249f0c..34a5615 100644

0007-qemu-cvs-gettimeofday.patch.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] qemu-cvs-gettimeofday
 No clue what this is for.
 ---
  linux-user/syscall.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index 6097420..aef4fb6 100644

0008-qemu-cvs-ioctl_debug.patch.patch

@@ -9,7 +9,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
  linux-user/syscall.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
+ 1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index aef4fb6..c8c9e1a 100644

0009-qemu-cvs-ioctl_nodirection.patch.patch

@@ -12,7 +12,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Ulrich Hecht <uli@suse.de>
 ---
  linux-user/syscall.c | 6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 6 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index c8c9e1a..2b4e263 100644

0012-linux-user-Ignore-timer_create-sysc.patch

@@ -9,7 +9,7 @@ about it breaks some %check tests in OBS, so better ignore it silently.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
  linux-user/syscall.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index 2b4e263..e423def 100644

0013-linux-user-be-silent-about-capget-f.patch

@@ -10,7 +10,7 @@ implementation and go on with life :)
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
  linux-user/syscall.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index e423def..d5b3d02 100644

0014-PPC-KVM-Disable-mmu-notifier-check..patch

@@ -10,7 +10,7 @@ So disable the check for mmu notifiers on PowerPC guests, making
 KVM guests work there, even if possibly racy in some odd circumstances.
 ---
  exec.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 diff --git a/exec.c b/exec.c
 index 95c4356..58b0647 100644

0015-linux-user-fix-segfault-deadlock.pa.patch

@@ -23,7 +23,7 @@ Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  include/exec/spinlock.h | 10 ++++++++++
  user-exec.c             |  4 ++++
- 2 files changed, 14 insertions(+), 0 deletions(-)
+ 2 files changed, 14 insertions(+)
 
 diff --git a/include/exec/spinlock.h b/include/exec/spinlock.h
 index a72edda..e460e12 100644

0016-linux-user-binfmt-support-host-bina.patch

@@ -9,7 +9,7 @@ trying to run, let's just use that instead as it will be a lot faster.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
  linux-user/binfmt.c | 25 +++++++++++++++++++++++++
- 1 files changed, 25 insertions(+), 0 deletions(-)
+ 1 file changed, 25 insertions(+)
 
 diff --git a/linux-user/binfmt.c b/linux-user/binfmt.c
 index cd1f513..87dc4c6 100644

0017-linux-user-arm-no-tb_flush-on-reset.patch

@@ -11,7 +11,7 @@ So something in our thread creation is broken. But for now, let's revert the
 change to at least get a working build again.
 ---
  target-arm/cpu.c | 4 ++++
- 1 files changed, 4 insertions(+), 0 deletions(-)
+ 1 file changed, 4 insertions(+)
 
 diff --git a/target-arm/cpu.c b/target-arm/cpu.c
 index d40f2a7..3113456 100644

0018-linux-user-Ignore-broken-loop-ioctl.patch

@@ -15,7 +15,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  linux-user/linux_loop.h   | 1 +
  linux-user/syscall.c      | 7 +++++++
  linux-user/syscall_defs.h | 1 +
- 4 files changed, 10 insertions(+), 0 deletions(-)
+ 4 files changed, 10 insertions(+)
 
 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
 index 1c9d67f..b743309 100644

0020-linux-user-Run-multi-threaded-code-.patch

@@ -16,7 +16,7 @@ This gets Java 1.7 working for me again on my test box.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
  linux-user/syscall.c | 9 +++++++++
- 1 files changed, 9 insertions(+), 0 deletions(-)
+ 1 file changed, 9 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index 5113d22..7be6873 100644

0021-linux-user-lock-tb-flushing-too.pat.patch

@@ -11,7 +11,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  translate-all.c | 20 ++++++++++++++++++--
- 1 files changed, 18 insertions(+), 2 deletions(-)
+ 1 file changed, 18 insertions(+), 2 deletions(-)
 
 diff --git a/translate-all.c b/translate-all.c
 index aeda54d..6cfba5a 100644

0022-linux-user-Fake-proc-cpuinfo.patch.patch

@@ -19,7 +19,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  linux-user/syscall.c | 20 ++++++++++++++++++++
- 1 files changed, 20 insertions(+), 0 deletions(-)
+ 1 file changed, 20 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index 7be6873..e678f9b 100644

0023-linux-user-implement-FS_IOC_GETFLAG.patch

@@ -13,7 +13,7 @@ v1 -> v2:
 ---
  linux-user/ioctls.h       | 1 +
  linux-user/syscall_defs.h | 2 ++
- 2 files changed, 3 insertions(+), 0 deletions(-)
+ 2 files changed, 3 insertions(+)
 
 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
 index b743309..f273ccb 100644

0024-linux-user-implement-FS_IOC_SETFLAG.patch

@@ -13,7 +13,7 @@ v1 -> v2
 ---
  linux-user/ioctls.h       | 1 +
  linux-user/syscall_defs.h | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ 2 files changed, 2 insertions(+)
 
 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
 index f273ccb..a5f3514 100644

0025-linux-user-XXX-disable-fiemap.patch.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] linux-user: XXX disable fiemap
 agraf: fiemap breaks in libarchive. Disable it for now.
 ---
  linux-user/syscall.c | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
+ 1 file changed, 5 insertions(+)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index e678f9b..7fc61fe 100644

0026-slirp-nooutgoing.patch.patch

@@ -9,7 +9,7 @@ TBD (from SUSE Studio team)
  slirp/socket.c   |  8 ++++++++
  slirp/tcp_subr.c | 13 +++++++++++++
  vl.c             |  9 +++++++++
- 4 files changed, 40 insertions(+), 0 deletions(-)
+ 4 files changed, 40 insertions(+)
 
 diff --git a/qemu-options.hx b/qemu-options.hx
 index 8b94264..179cf72 100644

0027-vnc-password-file-and-incoming-conn.patch

@@ -5,8 +5,8 @@ Subject: [PATCH] vnc: password-file= and incoming-connections=
 
 TBD (from SUSE Studio team)
 ---
- ui/vnc.c |   71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ui/vnc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 71 insertions(+), 0 deletions(-)
+ 1 file changed, 71 insertions(+)
 
 diff --git a/ui/vnc.c b/ui/vnc.c
 index 5601cc3..d5796e6 100644

0028-linux-user-add-more-blk-ioctls.patc.patch

@@ -10,7 +10,7 @@ Signed-off-by: Alexander Graf <agraf@suse.de>
  linux-user/ioctls.h        | 18 ++++++++++++++++++
  linux-user/syscall_defs.h  |  6 ++++++
  linux-user/syscall_types.h |  3 +++
- 3 files changed, 27 insertions(+), 0 deletions(-)
+ 3 files changed, 27 insertions(+)
 
 diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
 index a5f3514..a96a419 100644

0030-block-Add-support-for-DictZip-enabl.patch

@@ -29,8 +29,8 @@ Signed-off-by: Tim Hardeck <thardeck@suse.de>
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  block/Makefile.objs |   1 +
- block/dictzip.c     |  596 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ block/dictzip.c     | 596 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 597 insertions(+), 0 deletions(-)
+ 2 files changed, 597 insertions(+)
  create mode 100644 block/dictzip.c
 
 diff --git a/block/Makefile.objs b/block/Makefile.objs

0031-block-Add-tar-container-format.patc.patch

@@ -30,8 +30,8 @@ Signed-off-by: Tim Hardeck <thardeck@suse.de>
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  block/Makefile.objs |   1 +
- block/tar.c         |  386 +++++++++++++++++++++++++++++++++++++++++++++++++++
+ block/tar.c         | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 387 insertions(+), 0 deletions(-)
+ 2 files changed, 387 insertions(+)
  create mode 100644 block/tar.c
 
 diff --git a/block/Makefile.objs b/block/Makefile.objs

0032-Legacy-Patch-kvm-qemu-preXX-dictzip.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch
 
 ---
  block/tar.c | 13 +++++++++++--
- 1 files changed, 11 insertions(+), 2 deletions(-)
+ 1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/block/tar.c b/block/tar.c
 index 24ed37b..c324240 100644

0033-Legacy-Patch-kvm-qemu-preXX-report-.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch
 
 ---
  net/net.c | 22 ++++++++++++++++++++++
- 1 files changed, 22 insertions(+), 0 deletions(-)
+ 1 file changed, 22 insertions(+)
 
 diff --git a/net/net.c b/net/net.c
 index 0a88e68..0716a72 100644

0034-console-add-question-mark-escape-op.patch

@@ -13,7 +13,7 @@ outputting guest serial consoles to the graphical console emulator.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
  ui/console.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/ui/console.c b/ui/console.c
 index 199ba69..f7894f8 100644

0035-Make-char-muxer-more-robust-wrt-sma.patch

@@ -19,7 +19,7 @@ it polls again after a while to check if the guest is now receiving input.
 This patch fixes input when using -nographic on s390 for me.
 ---
  qemu-char.c | 16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
+ 1 file changed, 16 insertions(+)
 
 diff --git a/qemu-char.c b/qemu-char.c
 index e00f84c..60faa71 100644

0036-linux-user-lseek-explicitly-cast-no.patch

@@ -13,7 +13,7 @@ absolute positioned which we need to maintain as unsigned.
 Signed-off-by: Alexander Graf <agraf@suse.de>
 ---
  linux-user/syscall.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/linux-user/syscall.c b/linux-user/syscall.c
 index b794666..4f7327a 100644

0037-virtfs-proxy-helper-Provide-__u64-f.patch

@@ -9,7 +9,7 @@ Fixes the build on SLE 11 SP2.
 [AF: Extend to ppc64]
 ---
  fsdev/virtfs-proxy-helper.c | 7 +++++++
- 1 files changed, 7 insertions(+), 0 deletions(-)
+ 1 file changed, 7 insertions(+)
 
 diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c
 index 713a7b2..b8da77d 100644

0038-roms-Build-vgabios.bin.patch.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] roms: Build vgabios.bin
 
 ---
  roms/Makefile | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ 1 file changed, 2 insertions(+)
 
 diff --git a/roms/Makefile b/roms/Makefile
 index 10d5a65..3bb1f48 100644

0039-configure-Enable-PIE-for-ppc-and-pp.patch

@@ -11,7 +11,7 @@ Signed-off-by: Dinar Valeev <dvaleev@suse.com>
 Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure b/configure
 index 0666228..d508d50 100755

qemu-linux-user.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 17 17:40:21 UTC 2014 - afaerber@suse.de
+
+- Bump copyright in qemu-linux-user.spec.in
+
 -------------------------------------------------------------------
 Fri Dec  6 22:21:50 UTC 2013 - afaerber@suse.de
 

qemu-linux-user.spec.in

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu-linux-user
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

qemu.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 17 17:34:57 UTC 2014 - afaerber@suse.de
+
+- Bump copyright in qemu.spec.in
+- Use vte-devel instead of vte2-devel and force using Gtk3,
+  reported by Takashi and Dirk (bnc#840607, bnc#849587).
+
 -------------------------------------------------------------------
 Mon Jan 13 14:24:24 UTC 2014 - coolo@suse.com
 

qemu.spec

@@ -134,8 +134,12 @@ BuildRequires:  python
 BuildRequires:  usbredir-devel
 %endif
 %if 0%{?suse_version} >= 1210
+%if 0%{?suse_version} >= 1220
+BuildRequires:  vte-devel
+%else
 BuildRequires:  vte2-devel
 %endif
+%endif
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
@@ -330,6 +334,9 @@ done
 	--enable-curses \
 %if 0%{?suse_version} >= 1210
 	--enable-gtk \
+%if 0%{?suse_version} >= 1220
+	--with-gtkabi=3.0 \
+%endif
 %endif
 	--enable-linux-aio \
 	--enable-sdl \

qemu.spec.in

@@ -1,7 +1,7 @@
 #
 # spec file for package qemu
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -96,8 +96,12 @@ BuildRequires:  python
 BuildRequires:  usbredir-devel
 %endif
 %if 0%{?suse_version} >= 1210
+%if 0%{?suse_version} >= 1220
+BuildRequires:  vte-devel
+%else
 BuildRequires:  vte2-devel
 %endif
+%endif
 %ifarch x86_64
 BuildRequires:  xen-devel
 %endif
@@ -110,11 +114,11 @@ BuildRequires:  spice-protocol-devel
 %endif
 Requires:       /usr/sbin/groupadd
 Requires:       pwdutils
-Requires:       timezone
 Requires:       qemu-ipxe
 Requires:       qemu-seabios
 Requires:       qemu-sgabios
 Requires:       qemu-vgabios
+Requires:       timezone
 Recommends:     qemu-tools
 
 %define firmware_files {acpi-dsdt.aml bios.bin q35-acpi-dsdt.aml sgabios.bin vgabios.bin vgabios-cirrus.bin vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin optionrom/linuxboot.bin optionrom/multiboot.bin optionrom/kvmvapic.bin pxe-e1000.rom pxe-pcnet.rom pxe-ne2k_pci.rom pxe-rtl8139.rom pxe-eepro100.rom pxe-virtio.rom}
@@ -254,6 +258,9 @@ done
 	--enable-curses \
 %if 0%{?suse_version} >= 1210
 	--enable-gtk \
+%if 0%{?suse_version} >= 1220
+	--with-gtkabi=3.0 \
+%endif
 %endif
 	--enable-linux-aio \
 	--enable-sdl \