From mel@smoochies.rachie.is-a-geek.net  Mon Mar  2 07:05:18 2009
Return-Path: <mel@smoochies.rachie.is-a-geek.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EEF15106568B;
	Mon,  2 Mar 2009 07:05:18 +0000 (UTC)
	(envelope-from mel@smoochies.rachie.is-a-geek.net)
Received: from mail.rachie.is-a-geek.net (rachie.is-a-geek.net [66.230.99.27])
	by mx1.freebsd.org (Postfix) with ESMTP id C004B8FC1C;
	Mon,  2 Mar 2009 07:05:18 +0000 (UTC)
	(envelope-from mel@smoochies.rachie.is-a-geek.net)
Received: from smoochies.rachie.is-a-geek.net (smoochies.rachie.is-a-geek.net [192.168.1.50])
	by mail.rachie.is-a-geek.net (Postfix) with ESMTP id 86D44AFC1FE;
	Sun,  1 Mar 2009 21:46:59 -0900 (AKST)
Received: by smoochies.rachie.is-a-geek.net (Postfix, from userid 1003)
	id 79E4384443; Sun,  1 Mar 2009 21:46:59 -0900 (AKST)
Message-Id: <20090302064659.79E4384443@smoochies.rachie.is-a-geek.net>
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: [PATCH] make kdebase4 compile on -CURRENT
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         132244
>Category:       ports
>Synopsis:       [PATCH] make x11/kdebase4 compile on -CURRENT
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    kde
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 02 07:10:03 UTC 2009
>Closed-Date:    Mon Mar 16 19:02:17 UTC 2009
>Last-Modified:  Mon Mar 16 19:02:17 UTC 2009
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->kde 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Mon Mar 2 15:59:11 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132244 
 
Date: Mon, 2 Mar 2009 08:59:30 -0600
From: Matt <datahead4@gmail.com>
To: Mel Flynn <mel@rachie.is-a-geek.net>
Subject: Re: [kde-freebsd] [PATCH] make kdebase4 compile on -CURRENT

 Recent posting on -ports indicates that the version number associated
 with usb2 import is 80064
 
 http://lists.freebsd.org/pipermail/freebsd-ports/2009-February/053303.html
 
 Matt

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/132244: commit references a PR
Date: Mon, 16 Mar 2009 18:59:40 +0000 (UTC)

 miwi        2009-03-16 18:59:27 UTC
 
   FreeBSD ports repository
 
   Added files:
     x11/kdebase4/files   
                          patch-apps_kinfocenter_usbview_usbdevices.h 
   Log:
   - Add a workaround to fix the build on HEAD with new usb2 stack
   
   PR:             132244
   Submitted by:   Mel Flynn <mel@rachie.is-a-geek.net>
   
   Revision  Changes    Path
   1.1       +15 -0     ports/x11/kdebase4/files/patch-apps_kinfocenter_usbview_usbdevices.h (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon Mar 16 19:02:16 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132244 
>Unformatted:
