Bug#465932: qemu: FTBFS on GNU/kFreeBSD

[Petr Salinger]

Package: qemu
Severity: important
Version: 0.9.1-1
Tags: patch
User: [EMAIL PROTECTED]
Usertags: kfreebsd

Hi,

the current version fails to build on GNU/kFreeBSD.

It needs small fixup in 65_kfreebsd.patch and 80_ui_curses.patch.
Please find attached patch with changes to those patches.

Thanks in advance

                        Petr
diff -u qemu-0.9.1/debian/patches/65_kfreebsd.patch 
qemu-0.9.1/debian/patches/65_kfreebsd.patch
--- qemu-0.9.1/debian/patches/65_kfreebsd.patch
+++ qemu-0.9.1/debian/patches/65_kfreebsd.patch
@@ -5,13 +5,8 @@
-@@ -129,6 +129,12 @@
-     kqemu="yes"
- fi
+@@ -125,6 +125,7 @@
  ;;
-+GNU/kFreeBSD)
-+oss="yes"
-+if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
-+    kqemu="yes"
-+fi
-+;;
- FreeBSD)
- bsd="yes"
+ GNU/kFreeBSD)
  oss="yes"
++VL_OS_LDFLAGS="-lfreebsd"
+ if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
+     kqemu="yes"
+ fi
diff -u qemu-0.9.1/debian/patches/80_ui_curses.patch 
qemu-0.9.1/debian/patches/80_ui_curses.patch
--- qemu-0.9.1/debian/patches/80_ui_curses.patch
+++ qemu-0.9.1/debian/patches/80_ui_curses.patch
@@ -15,19 +15,6 @@
 ===================================================================
 --- qemu-0.9.1.orig/configure  2008-01-28 08:08:47.000000000 +0100
 +++ qemu-0.9.1/configure       2008-01-28 08:08:47.000000000 +0100
-@@ -135,6 +135,12 @@
-     kqemu="yes"
- fi
- ;;
-+GNU/kFreeBSD)
-+oss="yes"
-+if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
-+    kqemu="yes"
-+fi
-+;;
- FreeBSD)
- bsd="yes"
- oss="yes"
 @@ -324,6 +330,8 @@
    ;;
    *) echo "ERROR: unknown option $opt"; show_help="yes"