mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-27 05:10:36 +00:00
Fix build on 4.9
Reported and tested by: Emilio <contiemilio@virgilio.it>
This commit is contained in:
parent
3c845eec8a
commit
ded5e38b2e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=134708
@ -0,0 +1,26 @@
|
||||
--- kcontrol/usbview/usbdevices.cpp.orig Thu May 5 17:21:17 2005
|
||||
+++ kcontrol/usbview/usbdevices.cpp Thu May 5 17:43:04 2005
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
QPtrList<USBDevice> USBDevice::_devices;
|
||||
@@ -260,11 +261,15 @@
|
||||
_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;
|
||||
}
|
||||
+#else
|
||||
+ _speed = di.udi_lowspeed ? 1.5 : 12.0;
|
||||
+#endif
|
||||
|
||||
// Get all attached devicenodes
|
||||
for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
|
26
x11/kde4-runtime/files/patch-kcontrol-usbview-usbdevices.cpp
Normal file
26
x11/kde4-runtime/files/patch-kcontrol-usbview-usbdevices.cpp
Normal file
@ -0,0 +1,26 @@
|
||||
--- kcontrol/usbview/usbdevices.cpp.orig Thu May 5 17:21:17 2005
|
||||
+++ kcontrol/usbview/usbdevices.cpp Thu May 5 17:43:04 2005
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
QPtrList<USBDevice> USBDevice::_devices;
|
||||
@@ -260,11 +261,15 @@
|
||||
_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;
|
||||
}
|
||||
+#else
|
||||
+ _speed = di.udi_lowspeed ? 1.5 : 12.0;
|
||||
+#endif
|
||||
|
||||
// Get all attached devicenodes
|
||||
for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
|
@ -0,0 +1,26 @@
|
||||
--- kcontrol/usbview/usbdevices.cpp.orig Thu May 5 17:21:17 2005
|
||||
+++ kcontrol/usbview/usbdevices.cpp Thu May 5 17:43:04 2005
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
QPtrList<USBDevice> USBDevice::_devices;
|
||||
@@ -260,11 +261,15 @@
|
||||
_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;
|
||||
}
|
||||
+#else
|
||||
+ _speed = di.udi_lowspeed ? 1.5 : 12.0;
|
||||
+#endif
|
||||
|
||||
// Get all attached devicenodes
|
||||
for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
|
26
x11/kdebase3/files/patch-kcontrol-usbview-usbdevices.cpp
Normal file
26
x11/kdebase3/files/patch-kcontrol-usbview-usbdevices.cpp
Normal file
@ -0,0 +1,26 @@
|
||||
--- kcontrol/usbview/usbdevices.cpp.orig Thu May 5 17:21:17 2005
|
||||
+++ kcontrol/usbview/usbdevices.cpp Thu May 5 17:43:04 2005
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
QPtrList<USBDevice> USBDevice::_devices;
|
||||
@@ -260,11 +261,15 @@
|
||||
_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;
|
||||
}
|
||||
+#else
|
||||
+ _speed = di.udi_lowspeed ? 1.5 : 12.0;
|
||||
+#endif
|
||||
|
||||
// Get all attached devicenodes
|
||||
for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
|
@ -0,0 +1,26 @@
|
||||
--- kcontrol/usbview/usbdevices.cpp.orig Thu May 5 17:21:17 2005
|
||||
+++ kcontrol/usbview/usbdevices.cpp Thu May 5 17:43:04 2005
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
QPtrList<USBDevice> USBDevice::_devices;
|
||||
@@ -260,11 +261,15 @@
|
||||
_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;
|
||||
}
|
||||
+#else
|
||||
+ _speed = di.udi_lowspeed ? 1.5 : 12.0;
|
||||
+#endif
|
||||
|
||||
// Get all attached devicenodes
|
||||
for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
|
@ -0,0 +1,26 @@
|
||||
--- kcontrol/usbview/usbdevices.cpp.orig Thu May 5 17:21:17 2005
|
||||
+++ kcontrol/usbview/usbdevices.cpp Thu May 5 17:43:04 2005
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
QPtrList<USBDevice> USBDevice::_devices;
|
||||
@@ -260,11 +261,15 @@
|
||||
_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;
|
||||
}
|
||||
+#else
|
||||
+ _speed = di.udi_lowspeed ? 1.5 : 12.0;
|
||||
+#endif
|
||||
|
||||
// Get all attached devicenodes
|
||||
for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
|
26
x11/kdebase4/files/patch-kcontrol-usbview-usbdevices.cpp
Normal file
26
x11/kdebase4/files/patch-kcontrol-usbview-usbdevices.cpp
Normal file
@ -0,0 +1,26 @@
|
||||
--- kcontrol/usbview/usbdevices.cpp.orig Thu May 5 17:21:17 2005
|
||||
+++ kcontrol/usbview/usbdevices.cpp Thu May 5 17:43:04 2005
|
||||
@@ -26,6 +26,7 @@
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
QPtrList<USBDevice> USBDevice::_devices;
|
||||
@@ -260,11 +261,15 @@
|
||||
_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;
|
||||
}
|
||||
+#else
|
||||
+ _speed = di.udi_lowspeed ? 1.5 : 12.0;
|
||||
+#endif
|
||||
|
||||
// Get all attached devicenodes
|
||||
for ( int i = 0; i < USB_MAX_DEVNAMES; ++i )
|
Loading…
Reference in New Issue
Block a user