Bug 135860
| Summary: | [PATCH] x11/kdebase3: Unbreak on -CURRENT | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Ulrich Spoerlein <uqs> | ||||||
| Component: | Individual Port(s) | Assignee: | freebsd-kde (group) <kde> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Only Me | CC: | kde | ||||||
| Priority: | Normal | ||||||||
| Version: | Latest | ||||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
|
Description
Ulrich Spoerlein
2009-06-20 13:00:16 UTC
Responsible Changed From-To: freebsd-ports-bugs->kde Over to maintainer (via the GNATS Auto Assign Tool) Your extrapatch-libusb20 does not apply clean. You didn't test the 'make patch' before you submit it. The fix is pretty very simple by correct the path of like this: --- usbdevices.h.orig 2006-07-22 10:15:22.000000000 +0200 +++ usbdevices.h 2009-06-20 13:19:42.000000000 +0200 It should be: --- kcontrol/usbview/usbdevices.h.orig 2006-07-22 10:15:22.000000000 +0200 +++ kcontrol/usbview/usbdevices.h 2009-06-20 13:19:42.000000000 +0200 But I also update the patch to make work with -CURRENT again by disable the usb_revision.h. Here is update: http://people.freebsd.org/~mezz/diff/extrapatch-libusb20 Keep in mind, I haven't test it in the runtime but I will later. Cheers, Mezz -- mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org FYI: I have tested it in runtime by insert a USB flash drive and it appears fine in file browser. Not sure if it uses KDE's usb or HAL. Cheers, Mezz -- mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org I'm not sure why you disabled usb_revision.h. It will not build on -current without including this. kde3 has been borken on -current for a while now. Can we please get this incorporated? -- DE On Sun, 05 Jul 2009 11:09:04 -0500, Daniel M. Eischen <eischen@vigrid.com> wrote: > I'm not sure why you disabled usb_revision.h. It will not build on > -current without including this. How old -CURRENT do you have? Have you ran 'make delete-old' when you update -CURRENT? It does not exist in today -CURRENT, see here: http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/Attic/usb_revision.h (attic, removed) http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/ (no usb_revision.h) > kde3 has been borken on -current for a while now. Can we please get this > incorporated? Use my patch works great. Cheers, Mezz -- mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org On Sun, 5 Jul 2009, Jeremy Messenger wrote: > On Sun, 05 Jul 2009 11:09:04 -0500, Daniel M. Eischen <eischen@vigrid.com> > wrote: > >> I'm not sure why you disabled usb_revision.h. It will not build on >> -current without including this. > > How old -CURRENT do you have? Have you ran 'make delete-old' when you update > -CURRENT? It does not exist in today -CURRENT, see here: My -current was a fresh install from June 2009 8.0 snapshot on amd64. I updated to -current sources from July 1, 2009, or thereabouts. I did not run 'make delete-old'. > http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/Attic/usb_revision.h > (attic, removed) > http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/ (no usb_revision.h) > >> kde3 has been borken on -current for a while now. Can we please get this >> incorporated? > > Use my patch works great. I am rebuilding to see if works now. I'm not sure where those defines are going to come from though. They don't appear to be anywhere else. Are you going to commit this? -- DE On Sun, 05 Jul 2009 20:01:59 -0500, Daniel Eischen <deischen@freebsd.org> wrote: > On Sun, 5 Jul 2009, Jeremy Messenger wrote: > >> On Sun, 05 Jul 2009 11:09:04 -0500, Daniel M. Eischen >> <eischen@vigrid.com> wrote: >> >>> I'm not sure why you disabled usb_revision.h. It will not build on >>> -current without including this. >> >> How old -CURRENT do you have? Have you ran 'make delete-old' when you >> update -CURRENT? It does not exist in today -CURRENT, see here: > > My -current was a fresh install from June 2009 8.0 snapshot on amd64. > I updated to -current sources from July 1, 2009, or thereabouts. > I did not run 'make delete-old'. > >> http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/Attic/usb_revision.h >> (attic, removed) >> http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/ (no >> usb_revision.h) >> >>> kde3 has been borken on -current for a while now. Can we please get >>> this >>> incorporated? >> >> Use my patch works great. > > I am rebuilding to see if works now. I'm not sure where those defines > are going to come from though. They don't appear to be anywhere else. > > Are you going to commit this? No. I am not a KDE user and maintainer. :-) When I tested stuff with USB devices, I have no idea which it was works from HAL or KDE's USB stuff.. Mostly of stuff look like was from HAL, but I can't say for sure since I have no idea. Cheers, Mezz -- mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org This patch seems to work for me on -current. Note that some of the constants have changed names under libusb20. -- DE On Sun, 5 Jul 2009, Jeremy Messenger wrote: > On Sun, 05 Jul 2009 20:01:59 -0500, Daniel Eischen <deischen@freebsd.org> > wrote: > >> On Sun, 5 Jul 2009, Jeremy Messenger wrote: >> >>> On Sun, 05 Jul 2009 11:09:04 -0500, Daniel M. Eischen <eischen@vigrid.com> >>> wrote: >>> >>>> I'm not sure why you disabled usb_revision.h. It will not build on >>>> -current without including this. >>> >>> How old -CURRENT do you have? Have you ran 'make delete-old' when you >>> update -CURRENT? It does not exist in today -CURRENT, see here: >> >> My -current was a fresh install from June 2009 8.0 snapshot on amd64. >> I updated to -current sources from July 1, 2009, or thereabouts. >> I did not run 'make delete-old'. >> >>> http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/Attic/usb_revision.h >>> (attic, removed) >>> http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/usb/ (no usb_revision.h) >>> >>>> kde3 has been borken on -current for a while now. Can we please get this >>>> incorporated? >>> >>> Use my patch works great. >> >> I am rebuilding to see if works now. I'm not sure where those defines >> are going to come from though. They don't appear to be anywhere else. >> >> Are you going to commit this? > > No. I am not a KDE user and maintainer. :-) When I tested stuff with USB > devices, I have no idea which it was works from HAL or KDE's USB stuff.. > Mostly of stuff look like was from HAL, but I can't say for sure since I have > no idea. Oh, okay. BTW, it does not work with your patch: /bin/sh /usr/local/bin/libtool --silent --tag=CXX --mode=compile c++ -DHAVE_CONFIG_H -I. -I../.. -I/usr/local/include -I/usr/local/include -D_THREAD_SAFE -pthread -DQT_THREAD_SUPPORT -I/usr/local/include -I/usr/local/include -I/usr/local/include -D_GETOPT_H -D_THREAD_SAFE -D_LARGE_FILES=1 -Wno-long-long -Wundef -Wall -W -Wpointer-arith -DNDEBUG -DNO_DEBUG -O2 -O2 -pipe -DLDAP_DEPRECATED -fno-strict-aliasing -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -D_GNU_SOURCE -MT usbdevices.lo -MD -MP -MF .deps/usbdevices.Tpo -c -o usbdevices.lo usbdevices.cpp usbdevices.cpp: In member function 'void USBDevice::collectData(libusb20_backend*, libusb20_device*)': usbdevices.cpp:357: error: 'USB_SPEED_LOW' was not declared in this scope usbdevices.cpp:358: error: 'USB_SPEED_FULL' was not declared in this scope usbdevices.cpp:359: error: 'USB_SPEED_HIGH' was not declared in this scope usbdevices.cpp:360: error: 'USB_SPEED_VARIABLE' was not declared in this scope usbdevices.cpp:361: error: 'USB_SPEED_SUPER' was not declared in this scope usbdevices.cpp: At global scope: usbdevices.cpp:329: warning: unused parameter 'pbe' usbdevices.cpp:379: warning: unused parameter 'fname' gmake[3]: *** [usbdevices.lo] Error 1 gmake[3]: Leaving directory `/opt/FreeBSD/ports/x11/kdebase3/work/kdebase-3.5.10/kcontrol/usbview' gmake[2]: *** [all-recursive] Error 1 gmake[2]: Leaving directory `/opt/FreeBSD/ports/x11/kdebase3/work/kdebase-3.5.10/kcontrol' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/opt/FreeBSD/ports/x11/kdebase3/work/kdebase-3.5.10' gmake: *** [all] Error 2 *** Error code 1 Those defines do not exist anywhere (after 'make delete-old') that I can find in /usr/include on -current. -- DE On Sun, 05 Jul 2009 21:28:45 -0500, Daniel M. Eischen <eischen@vigrid.com> wrote: > This patch seems to work for me on -current. Note that some of the > constants have changed names under libusb20. Let's hope this is no more break again in -CURRENT. It was pain to keep chase with USB stuff in -CURRENT. It looks like I have stale or not update correct in -CURRENT too, so will update it later. :-) Thanks for fix it. Cheers, Mezz -- mezz7@cox.net - mezz@FreeBSD.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gnome@FreeBSD.org State Changed From-To: open->closed Committed. Thanks! miwi 2009-07-06 08:54:01 UTC
FreeBSD ports repository
Modified files:
x11/kdebase3 Makefile
Added files:
x11/kdebase3/files extrapatch-libusb20
Removed files:
x11/kdebase3/files patch-kcontrol-usbview-usbdevices.h
Log:
- Fix build with USB 2.0
PR: 135860 (based on)
Submitted by: Ulrich Spoerlein <uqs@spoerlein.net>
mezz@, deischen@
Revision Changes Path
1.214 +3 -1 ports/x11/kdebase3/Makefile
1.1 +169 -0 ports/x11/kdebase3/files/extrapatch-libusb20 (new)
1.2 +0 -18 ports/x11/kdebase3/files/patch-kcontrol-usbview-usbdevices.h (dead)
_______________________________________________
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"
|
