Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
Synopsis: [PATCH] x11/kdebase3: Unbreak on -CURRENT State-Changed-From-To: open->closed State-Changed-By: miwi State-Changed-When: Mon Jul 6 08:54:15 UTC 2009 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=135860 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS. From: "Jeremy Messenger" To: "Daniel M. Eischen" Cc: u...@spoerlein.net, bug-follo...@freebsd.org Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT Date: Sun, 05 Jul 2009 23:17:42 -0500 On Sun, 05 Jul 2009 21:28:45 -0500, Daniel M. Eischen 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 -- me...@cox.net - m...@freebsd.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gn...@freebsd.org ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS.
From: "Daniel M. Eischen"
To: bug-follo...@freebsd.org
Cc: u...@spoerlein.net, me...@cox.net
Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
Date: Sun, 05 Jul 2009 22:28:45 -0400
This is a multi-part message in MIME format.
--000209070400030200080102
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
This patch seems to work for me on -current. Note that some of the constants
have changed names under libusb20.
--
DE
--000209070400030200080102
Content-Type: text/plain;
name="kdebase3.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="kdebase3.patch"
Index: Makefile
===
RCS file: /opt/FreeBSD/cvs/ports/x11/kdebase3/Makefile,v
retrieving revision 1.213
diff -u -r1.213 Makefile
--- Makefile 9 Mar 2009 17:15:42 - 1.213
+++ Makefile 6 Jul 2009 05:19:34 -
@@ -60,6 +60,8 @@
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb-0.1:${PORTSDIR}/devel/libusb
+.else
+EXTRA_PATCHES+= ${FILESDIR}/extrapatch-libusb20
.endif
.if !defined(WITHOUT_ARTSWRAPPER)
@@ -71,7 +73,7 @@
.endif
.if !defined(WITHOUT_HAL)
-EXTRA_PATCHES=
${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \
+EXTRA_PATCHES+=
${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.cpp \
${FILESDIR}/extrapatch-kioslave_media_mediamanager-halbackend.h
LIB_DEPENDS+= dbus-qt-1.1:${PORTSDIR}/devel/dbus-qt3 \
hal.1:${PORTSDIR}/sysutils/hal
Index: files/extrapatch-libusb20
===
RCS file: files/extrapatch-libusb20
diff -N files/extrapatch-libusb20
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/extrapatch-libusb20 6 Jul 2009 15:52:27 -
@@ -0,0 +1,169 @@
+--- kcontrol/usbview/usbdevices.h.orig2006-07-22 10:15:22.0
+0200
kcontrol/usbview/usbdevices.h 2009-06-20 13:19:42.0 +0200
+@@ -17,7 +17,9 @@
+ #include
+
+ #ifdef Q_OS_FREEBSD
+-#include
++#include
++#include
++/*#include */
+ #endif
+
+ class USBDB;
+@@ -66,7 +68,7 @@
+ unsigned int _vendorID, _prodID, _revMajor, _revMinor;
+
+ #ifdef Q_OS_FREEBSD
+- void collectData( int fd, int level, usb_device_info &di, int parent );
++ void collectData(struct libusb20_backend *, struct libusb20_device *);
+ QStringList _devnodes;
+ #endif
+ };
+--- kcontrol/usbview/usbdevices.cpp.orig 2006-07-22 04:15:22.0
-0400
kcontrol/usbview/usbdevices.cpp 2009-07-06 11:47:28.0 -0400
+@@ -318,17 +318,25 @@
+
+ /*
+ * FreeBSD support by Markus Brueffer
++ * libusb20 support by Hans Petter Selasky
+ *
+ * Basic idea and some code fragments were taken from FreeBSD's usbdevs(8),
+ * originally developed for NetBSD, so this code should work with no or
+ * only little modification on NetBSD.
+ */
+
+-void USBDevice::collectData( int fd, int level, usb_device_info &di, int
parent)
++void USBDevice::collectData(struct libusb20_backend *pbe,
++struct libusb20_device *pdev)
+ {
++ char tempbuf[32];
++ struct usb_device_info di;
++
++ if (libusb20_dev_get_info(pdev, &di))
++ memset(&di, 0, sizeof(di));
++
+ // determine data for this device
+- _level= level;
+- _parent = parent;
++ _level= 0;
++ _parent = 0;
+
+ _bus = di.udi_bus;
+ _device = di.udi_addr;
+@@ -345,87 +353,49 @@
+ _channels = di.udi_nports;
+
+ // determine the speed
+-#if __FreeBSD_version > 490102
+ switch (di.udi_speed) {
+- case USB_SPEED_LOW: _speed = 1.5; break;
+- case USB_SPEED_FULL: _speed = 12.0; break;
+- case USB_SPEED_HIGH: _speed = 480.0; break;
++ case LIBUSB20_SPEED_LOW: _speed = 1.5; break;
++ case LIBUSB20_SPEED_FULL: _speed = 12.0; break;
++ case LIBUSB20_SPEED_HIGH: _speed = 480.0; break;
++ case LIBUSB20_SPEED_VARIABLE: _speed = 480.0; break;
++ case LIBUSB20_SPEED_SUPER: _speed = 4800.0; break;
++ default: _speed = 480.0; break;
+ }
+-#else
+- _speed = di.udi_lowspeed ? 1.5 : 12.0;
+-#endif
+
+ // Get all attached devicenodes
+- for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
+- if ( di.udi_devnames[i][0] )
+- _devnodes << di.udi_devnames[i];
++ for (int i = 0; i < 32; ++i) {
++ if (libusb20_dev_get_iface_desc(pdev, i, tempbuf, sizeof(tempbuf))
== 0) {
++ _devnodes << tempbuf;
++ } else {
++ break;
++ }
++ }
+
+ // For compatibility, split the revision number
+ ss
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS. From: Daniel Eischen To: Jeremy Messenger Cc: bug-follo...@freebsd.org Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT Date: Sun, 5 Jul 2009 23:37:37 -0400 (EDT) On Sun, 5 Jul 2009, Jeremy Messenger wrote: > On Sun, 05 Jul 2009 20:01:59 -0500, Daniel Eischen > wrote: > >> On Sun, 5 Jul 2009, Jeremy Messenger wrote: >> >>> On Sun, 05 Jul 2009 11:09:04 -0500, Daniel M. Eischen >>> 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 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS. From: "Jeremy Messenger" To: "Daniel Eischen" Cc: bug-follo...@freebsd.org Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT Date: Sun, 05 Jul 2009 21:26:45 -0500 On Sun, 05 Jul 2009 20:01:59 -0500, Daniel Eischen wrote: > On Sun, 5 Jul 2009, Jeremy Messenger wrote: > >> On Sun, 05 Jul 2009 11:09:04 -0500, Daniel M. Eischen >> 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 -- me...@cox.net - m...@freebsd.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gn...@freebsd.org ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS. From: Daniel Eischen To: Jeremy Messenger Cc: bug-follo...@freebsd.org Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT Date: Sun, 5 Jul 2009 21:01:59 -0400 (EDT) On Sun, 5 Jul 2009, Jeremy Messenger wrote: > On Sun, 05 Jul 2009 11:09:04 -0500, Daniel M. Eischen > 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 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS. From: "Jeremy Messenger" To: "Daniel M. Eischen" Cc: bug-follo...@freebsd.org Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT Date: Sun, 05 Jul 2009 14:47:29 -0500 On Sun, 05 Jul 2009 11:09:04 -0500, Daniel M. Eischen 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 -- me...@cox.net - m...@freebsd.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gn...@freebsd.org ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS. From: "Daniel M. Eischen" To: bug-follo...@freebsd.org, m...@freebsd.org Cc: Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT Date: Sun, 05 Jul 2009 12:09:04 -0400 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 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS. From: "Jeremy Messenger" To: bug-follo...@freebsd.org, u...@spoerlein.net Cc: Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT Date: Thu, 02 Jul 2009 15:25:24 -0500 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 -- me...@cox.net - m...@freebsd.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gn...@freebsd.org ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
The following reply was made to PR ports/135860; it has been noted by GNATS. From: "Jeremy Messenger" To: bug-follo...@freebsd.org, u...@spoerlein.net Cc: Subject: Re: ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT Date: Thu, 02 Jul 2009 10:26:27 -0500 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.0 +0200 +++ usbdevices.h 2009-06-20 13:19:42.0 +0200 It should be: --- kcontrol/usbview/usbdevices.h.orig 2006-07-22 10:15:22.0 +0200 +++ kcontrol/usbview/usbdevices.h 2009-06-20 13:19:42.0 +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 -- me...@cox.net - m...@freebsd.org FreeBSD GNOME Team http://www.FreeBSD.org/gnome/ - gn...@freebsd.org ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
Re: [kde-freebsd] ports/135860: [PATCH] x11/kdebase3: Unbreak on -CURRENT
Synopsis: [PATCH] x11/kdebase3: Unbreak on -CURRENT Responsible-Changed-From-To: freebsd-ports-bugs->kde Responsible-Changed-By: edwin Responsible-Changed-When: Sat Jun 20 12:00:28 UTC 2009 Responsible-Changed-Why: Over to maintainer (via the GNATS Auto Assign Tool) http://www.freebsd.org/cgi/query-pr.cgi?pr=135860 ___ kde-freebsd mailing list kde-freebsd@kde.org https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
