From 5682a328cd74ebc1cdac8ce289a4322268dce33c Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Mon, 3 Mar 2003 10:41:01 +0000 Subject: Fix Build on CURRENT. Submitted by: Andy Fawcett Reported by: many Tested by: leafy@leafy.idv.tw (CURRENT), Andy Fawcett (4.7 5.0R) --- sysutils/kdf/files/patch-ksimcpu.cpp | 29 +++++++++++++++++++++++++++++ sysutils/kdf/files/patch-ksimdisk.cpp | 24 ++++++++++++++++++++++++ sysutils/kfloppy/files/patch-ksimcpu.cpp | 29 +++++++++++++++++++++++++++++ sysutils/kfloppy/files/patch-ksimdisk.cpp | 24 ++++++++++++++++++++++++ sysutils/sweeper/files/patch-ksimcpu.cpp | 29 +++++++++++++++++++++++++++++ sysutils/sweeper/files/patch-ksimdisk.cpp | 24 ++++++++++++++++++++++++ 6 files changed, 159 insertions(+) create mode 100644 sysutils/kdf/files/patch-ksimcpu.cpp create mode 100644 sysutils/kdf/files/patch-ksimdisk.cpp create mode 100644 sysutils/kfloppy/files/patch-ksimcpu.cpp create mode 100644 sysutils/kfloppy/files/patch-ksimdisk.cpp create mode 100644 sysutils/sweeper/files/patch-ksimcpu.cpp create mode 100644 sysutils/sweeper/files/patch-ksimdisk.cpp (limited to 'sysutils') diff --git a/sysutils/kdf/files/patch-ksimcpu.cpp b/sysutils/kdf/files/patch-ksimcpu.cpp new file mode 100644 index 000000000000..0dbf177de206 --- /dev/null +++ b/sysutils/kdf/files/patch-ksimcpu.cpp @@ -0,0 +1,29 @@ +Index: ksim/monitors/cpu/ksimcpu.cpp +=================================================================== +RCS file: /home/kde/kdeutils/ksim/monitors/cpu/ksimcpu.cpp,v +retrieving revision 1.21 +diff -u -5 -p -d -r1.21 ksimcpu.cpp +--- ksim/monitors/cpu/ksimcpu.cpp 13 May 2002 14:47:51 -0000 1.21 ++++ ksim/monitors/cpu/ksimcpu.cpp 3 Mar 2003 07:38:33 -0000 +@@ -40,12 +40,20 @@ + #include + #include + #include + + #ifdef Q_OS_BSD4 +-#include + #include ++#ifdef Q_OS_FREEBSD ++#if __FreeBSD_version < 500101 ++#include ++#else ++#include ++#endif ++#else ++#include ++#endif + #include + #include + #include + #ifdef Q_OS_NETBSD + #include diff --git a/sysutils/kdf/files/patch-ksimdisk.cpp b/sysutils/kdf/files/patch-ksimdisk.cpp new file mode 100644 index 000000000000..be1790d8ec21 --- /dev/null +++ b/sysutils/kdf/files/patch-ksimdisk.cpp @@ -0,0 +1,24 @@ +Index: ksimdisk.cpp +=================================================================== +RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v +retrieving revision 1.13 +diff -u -5 -p -d -r1.13 ksimdisk.cpp +--- ksimdisk.cpp 2 Nov 2002 14:34:08 -0000 1.13 ++++ ksim/monitors/disk/ksimdisk.cpp 3 Mar 2003 08:48:34 -0000 +@@ -39,11 +39,16 @@ + #include + #include + #include + + #ifdef Q_OS_FREEBSD ++#include ++#if __FreeBSD_version < 500101 + #include ++#else ++#include ++#endif + #include + #include + #endif + + #ifdef Q_OS_LINUX diff --git a/sysutils/kfloppy/files/patch-ksimcpu.cpp b/sysutils/kfloppy/files/patch-ksimcpu.cpp new file mode 100644 index 000000000000..0dbf177de206 --- /dev/null +++ b/sysutils/kfloppy/files/patch-ksimcpu.cpp @@ -0,0 +1,29 @@ +Index: ksim/monitors/cpu/ksimcpu.cpp +=================================================================== +RCS file: /home/kde/kdeutils/ksim/monitors/cpu/ksimcpu.cpp,v +retrieving revision 1.21 +diff -u -5 -p -d -r1.21 ksimcpu.cpp +--- ksim/monitors/cpu/ksimcpu.cpp 13 May 2002 14:47:51 -0000 1.21 ++++ ksim/monitors/cpu/ksimcpu.cpp 3 Mar 2003 07:38:33 -0000 +@@ -40,12 +40,20 @@ + #include + #include + #include + + #ifdef Q_OS_BSD4 +-#include + #include ++#ifdef Q_OS_FREEBSD ++#if __FreeBSD_version < 500101 ++#include ++#else ++#include ++#endif ++#else ++#include ++#endif + #include + #include + #include + #ifdef Q_OS_NETBSD + #include diff --git a/sysutils/kfloppy/files/patch-ksimdisk.cpp b/sysutils/kfloppy/files/patch-ksimdisk.cpp new file mode 100644 index 000000000000..be1790d8ec21 --- /dev/null +++ b/sysutils/kfloppy/files/patch-ksimdisk.cpp @@ -0,0 +1,24 @@ +Index: ksimdisk.cpp +=================================================================== +RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v +retrieving revision 1.13 +diff -u -5 -p -d -r1.13 ksimdisk.cpp +--- ksimdisk.cpp 2 Nov 2002 14:34:08 -0000 1.13 ++++ ksim/monitors/disk/ksimdisk.cpp 3 Mar 2003 08:48:34 -0000 +@@ -39,11 +39,16 @@ + #include + #include + #include + + #ifdef Q_OS_FREEBSD ++#include ++#if __FreeBSD_version < 500101 + #include ++#else ++#include ++#endif + #include + #include + #endif + + #ifdef Q_OS_LINUX diff --git a/sysutils/sweeper/files/patch-ksimcpu.cpp b/sysutils/sweeper/files/patch-ksimcpu.cpp new file mode 100644 index 000000000000..0dbf177de206 --- /dev/null +++ b/sysutils/sweeper/files/patch-ksimcpu.cpp @@ -0,0 +1,29 @@ +Index: ksim/monitors/cpu/ksimcpu.cpp +=================================================================== +RCS file: /home/kde/kdeutils/ksim/monitors/cpu/ksimcpu.cpp,v +retrieving revision 1.21 +diff -u -5 -p -d -r1.21 ksimcpu.cpp +--- ksim/monitors/cpu/ksimcpu.cpp 13 May 2002 14:47:51 -0000 1.21 ++++ ksim/monitors/cpu/ksimcpu.cpp 3 Mar 2003 07:38:33 -0000 +@@ -40,12 +40,20 @@ + #include + #include + #include + + #ifdef Q_OS_BSD4 +-#include + #include ++#ifdef Q_OS_FREEBSD ++#if __FreeBSD_version < 500101 ++#include ++#else ++#include ++#endif ++#else ++#include ++#endif + #include + #include + #include + #ifdef Q_OS_NETBSD + #include diff --git a/sysutils/sweeper/files/patch-ksimdisk.cpp b/sysutils/sweeper/files/patch-ksimdisk.cpp new file mode 100644 index 000000000000..be1790d8ec21 --- /dev/null +++ b/sysutils/sweeper/files/patch-ksimdisk.cpp @@ -0,0 +1,24 @@ +Index: ksimdisk.cpp +=================================================================== +RCS file: /home/kde/kdeutils/ksim/monitors/disk/ksimdisk.cpp,v +retrieving revision 1.13 +diff -u -5 -p -d -r1.13 ksimdisk.cpp +--- ksimdisk.cpp 2 Nov 2002 14:34:08 -0000 1.13 ++++ ksim/monitors/disk/ksimdisk.cpp 3 Mar 2003 08:48:34 -0000 +@@ -39,11 +39,16 @@ + #include + #include + #include + + #ifdef Q_OS_FREEBSD ++#include ++#if __FreeBSD_version < 500101 + #include ++#else ++#include ++#endif + #include + #include + #endif + + #ifdef Q_OS_LINUX -- cgit v1.2.3