diff options
-rw-r--r-- | archivers/ark/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | comms/kremotecontrol/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | deskutils/kcharselect/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | math/kcalc/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | misc/kdeutils3/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | misc/kdeutils4/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | security/kgpg-kde4/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | security/kwallet/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | sysutils/kdf/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | sysutils/kfloppy/files/patch-ksimcpu.cpp | 26 | ||||
-rw-r--r-- | sysutils/sweeper/files/patch-ksimcpu.cpp | 26 |
11 files changed, 154 insertions, 132 deletions
diff --git a/archivers/ark/files/patch-ksimcpu.cpp b/archivers/ark/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/archivers/ark/files/patch-ksimcpu.cpp +++ b/archivers/ark/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/comms/kremotecontrol/files/patch-ksimcpu.cpp b/comms/kremotecontrol/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/comms/kremotecontrol/files/patch-ksimcpu.cpp +++ b/comms/kremotecontrol/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/deskutils/kcharselect/files/patch-ksimcpu.cpp b/deskutils/kcharselect/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/deskutils/kcharselect/files/patch-ksimcpu.cpp +++ b/deskutils/kcharselect/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/math/kcalc/files/patch-ksimcpu.cpp b/math/kcalc/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/math/kcalc/files/patch-ksimcpu.cpp +++ b/math/kcalc/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/misc/kdeutils3/files/patch-ksimcpu.cpp b/misc/kdeutils3/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/misc/kdeutils3/files/patch-ksimcpu.cpp +++ b/misc/kdeutils3/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/misc/kdeutils4/files/patch-ksimcpu.cpp b/misc/kdeutils4/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/misc/kdeutils4/files/patch-ksimcpu.cpp +++ b/misc/kdeutils4/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/security/kgpg-kde4/files/patch-ksimcpu.cpp b/security/kgpg-kde4/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/security/kgpg-kde4/files/patch-ksimcpu.cpp +++ b/security/kgpg-kde4/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/security/kwallet/files/patch-ksimcpu.cpp b/security/kwallet/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/security/kwallet/files/patch-ksimcpu.cpp +++ b/security/kwallet/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/sysutils/kdf/files/patch-ksimcpu.cpp b/sysutils/kdf/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/sysutils/kdf/files/patch-ksimcpu.cpp +++ b/sysutils/kdf/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/sysutils/kfloppy/files/patch-ksimcpu.cpp b/sysutils/kfloppy/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/sysutils/kfloppy/files/patch-ksimcpu.cpp +++ b/sysutils/kfloppy/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { diff --git a/sysutils/sweeper/files/patch-ksimcpu.cpp b/sysutils/sweeper/files/patch-ksimcpu.cpp index 0dbf177de206..38fa88cabeec 100644 --- a/sysutils/sweeper/files/patch-ksimcpu.cpp +++ b/sysutils/sweeper/files/patch-ksimcpu.cpp @@ -1,13 +1,6 @@ -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 <chart.h> - #include <progress.h> +--- ksim/monitors/cpu/ksimcpu.cpp.orig Mon May 13 10:47:51 2002 ++++ ksim/monitors/cpu/ksimcpu.cpp Mon Mar 17 13:26:46 2003 +@@ -42,8 +42,16 @@ #include <themetypes.h> #ifdef Q_OS_BSD4 @@ -25,5 +18,14 @@ diff -u -5 -p -d -r1.21 ksimcpu.cpp #include <sys/sysctl.h> #include <string.h> #include <kvm.h> - #ifdef Q_OS_NETBSD - #include <sys/sched.h> +@@ -246,8 +254,8 @@ + static int oidCpuTime[CTL_MAXNAME + 2]; + static size_t oidCpuTimeLen = sizeof(oidCpuTime); + long cpuTime[CPUSTATES]; +- unsigned int cpuTimeLen = sizeof(cpuTime); +- static char *name = "kern.cp_time"; ++ size_t cpuTimeLen = sizeof(cpuTime); ++ static const char *name = "kern.cp_time"; + static int initialized = 0; + + if (!initialized) { |