[kde-freebsd] [PATCH] make kdebase4 compile on -CURRENT

[Mel Flynn]

>Submitter-Id:	current-users
>Originator:	Mel Flynn
>Confidential:	no 
>Synopsis:	[PATCH] make kdebase4 compile on -CURRENT
>Severity:	serious
>Priority:	medium
>Category:	ports
>Class:		sw-bug
>Release:	FreeBSD 8.0-CURRENT i386
>Environment:
System: FreeBSD smoochies.wlan.rachie.is-a-geek.net 8.0-CURRENT FreeBSD 8.0-CURRENT #1: Sat Feb 28 17:05:35 AKST 2009 mel at smoochies.wlan.rachie.is-a-geek.net:/usr/obj/usr/src/sys/SMOOCHIES i386


	
>Description:
kdebase4 fails to compile with new usb stack.
>How-To-Repeat:
Have -CURRENT after libusb20 commit and make -C /usr/ports/x11/kdebase4 build
>Fix:

This uses the legacy headers, proper fix should be upstream.

NOTE: Since /usr/src/UPDATING doesn't mention the FreeBSD_version that marks
usb2 import, I took a guess.

--- patch-apps__kinfocenter__usbview__usbdevices.h begins here ---
--- apps/kinfocenter/usbview/usbdevices.h.orig	2008-10-17 03:00:14.000000000 -0800
+++ apps/kinfocenter/usbview/usbdevices.h	2009-03-01 21:01:18.000000000 -0900
@@ -18,7 +18,12 @@
 #include <bus/usb/usb.h>
 #include <QStringList>
 #elif defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+#include <sys/param.h>
+#if __FreeBSD_version+0 >= 800061
+#include <legacy/dev/usb/usb.h>
+#else
 #include <dev/usb/usb.h>
+#endif
 #include <QStringList>
 #endif
 
--- patch-apps__kinfocenter__usbview__usbdevices.h ends here ---