Date: Sun, 1 Mar 2009 21:46:59 -0900 (AKST) From: Mel Flynn <mel@rachie.is-a-geek.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: MAINTAINER <kde@FreeBSD.org> Subject: ports/132244: [PATCH] make kdebase4 compile on -CURRENT Message-ID: <20090302064659.79E4384443@smoochies.rachie.is-a-geek.net> Resent-Message-ID: <200903020710.n227A4LT044573@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 132244 >Category: ports >Synopsis: [PATCH] make kdebase4 compile on -CURRENT >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Mar 02 07:10:03 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Mel Flynn >Release: FreeBSD 8.0-CURRENT i386 >Organization: >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@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 --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090302064659.79E4384443>