--- kdebase-workspace-3.94.0/ConfigureChecks.cmake 2007-10-03 07:13:15.000000000 -0400 +++ kdebase-workspace-3.94.0-new/ConfigureChecks.cmake 2007-10-15 23:01:40.000000000 -0400 @@ -1,6 +1,8 @@ include(UnixAuth) +include(CheckTypeSize) macro_optional_find_package(XKB) # kxkb, kdm +macro_optional_find_package(Fontconfig) if (PAM_FOUND) set(KDE4_COMMON_PAM_SERVICE "kde" CACHE STRING "The PAM service to use unless overridden for a particular app.") --- kdebase-workspace-3.94.0/kcontrol/CMakeLists.txt 2007-10-03 07:13:04.000000000 -0400 +++ kdebase-workspace-3.94.0-new/kcontrol/CMakeLists.txt 2007-10-15 23:01:40.000000000 -0400 @@ -1,5 +1,3 @@ - - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/background/ ) macro_optional_find_package(Freetype) --- kdebase-workspace-3.94.0/kcontrol/infocenter/info/info_osx.cpp 2007-08-29 05:53:36.000000000 -0400 +++ kdebase-workspace-3.94.0-new/kcontrol/infocenter/info/info_osx.cpp 2007-10-15 23:01:40.000000000 -0400 @@ -45,7 +45,7 @@ #include -#include +#include #include #include #include @@ -63,7 +63,7 @@ #include -bool GetInfo_CPU (QListView *lBox) +bool GetInfo_CPU (Q3ListView *lBox) { QString cpustring; @@ -81,37 +81,37 @@ kDebug() << "got Host Info: (" << basic_info.avail_cpus << ") CPUs available"; const NXArchInfo *archinfo; archinfo=NXGetArchInfoFromCpuType(basic_info.cpu_type, basic_info.cpu_subtype); - new QListViewItem(lBox, i18n("Kernel is configured for %1 CPUs", basic_info.max_cpus)); + new Q3ListViewItem(lBox, i18n("Kernel is configured for %1 CPUs", basic_info.max_cpus)); for (int i = 1; i <= basic_info.avail_cpus; i++) { cpustring = i18n("CPU %1: %2", i, archinfo->description); - new QListViewItem(lBox, cpustring); + new Q3ListViewItem(lBox, cpustring); } return true; } return false; } -bool GetInfo_IRQ (QListView *) +bool GetInfo_IRQ (Q3ListView *) { return false; } -bool GetInfo_DMA (QListView *) +bool GetInfo_DMA (Q3ListView *) { return false; } -bool GetInfo_PCI (QListView *) +bool GetInfo_PCI (Q3ListView *) { return false; } -bool GetInfo_IO_Ports (QListView *) +bool GetInfo_IO_Ports (Q3ListView *) { return false; } -bool GetInfo_Sound (QListView *lBox) +bool GetInfo_Sound (Q3ListView *lBox) { #ifdef HAVE_COREAUDIO #define qMaxStringSize 1024 @@ -137,7 +137,7 @@ kDebug() << "get device name failed, status = " << (int)status; return false; } - new QListViewItem(lBox, i18n("Device Name: %1", deviceName)); + new Q3ListViewItem(lBox, i18n("Device Name: %1", deviceName)); /* Manufacturer */ status = AudioDeviceGetProperty(gOutputDeviceID, 1, 0, kAudioDevicePropertyDeviceManufacturer, &propertySize, manufacturer); @@ -145,7 +145,7 @@ kDebug() << "get manufacturer failed, status = " << (int)status; return false; } - new QListViewItem(lBox, i18n("Manufacturer: %1", manufacturer)); + new Q3ListViewItem(lBox, i18n("Manufacturer: %1", manufacturer)); return true; } else { return false; @@ -155,22 +155,22 @@ #endif } -bool GetInfo_SCSI (QListView *lbox) +bool GetInfo_SCSI (Q3ListView *lbox) { return false; } -bool GetInfo_Partitions (QListView *lbox) +bool GetInfo_Partitions (Q3ListView *lbox) { return false; } -bool GetInfo_XServer_and_Video (QListView *lBox) +bool GetInfo_XServer_and_Video (Q3ListView *lBox) { return GetInfo_XServer_Generic( lBox ); } -bool GetInfo_Devices (QListView *lbox) +bool GetInfo_Devices (Q3ListView *lbox) { return false; } --- kdebase-workspace-3.94.0/kcontrol/input/xcursor/thememodel.cpp 2007-10-08 03:17:56.000000000 -0400 +++ kdebase-workspace-3.94.0-new/kcontrol/input/xcursor/thememodel.cpp 2007-10-15 23:01:40.000000000 -0400 @@ -164,7 +164,7 @@ QString path("~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons"); // If XCURSOR_PATH is set, use that instead of the default path - char *xcursorPath = std::getenv("XCURSOR_PATH"); + char *xcursorPath = ::getenv("XCURSOR_PATH"); if (xcursorPath) path = xcursorPath; #else --- kdebase-workspace-3.94.0/ksplash/ksplashx/CMakeLists.txt 2007-07-26 06:37:08.000000000 -0400 +++ kdebase-workspace-3.94.0-new/ksplash/ksplashx/CMakeLists.txt 2007-10-15 23:01:40.000000000 -0400 @@ -6,6 +6,8 @@ include( FindPNG ) +include_directories(${PNG_PNG_INCLUDE_DIR}) + include (CheckCXXSourceCompiles) CHECK_CXX_SOURCE_COMPILES(" int main() { __asm__(\"pxor %mm0, %mm0\") ; }" X86_MMX_FOUND) --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/CMakeLists.txt 2007-06-27 06:46:09.000000000 -0400 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/CMakeLists.txt 2007-10-15 23:01:40.000000000 -0400 @@ -19,18 +19,23 @@ configure_file(config-ksysguardd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguardd.h) if( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ) - add_subdirectory( "FreeBSD" ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/FreeBSD ) + set( SYSTEM_SUBDIR "FreeBSD" ) else( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ) if( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) - add_subdirectory( "Solaris" ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/Solaris ) + set( SYSTEM_SUBDIR "Solaris" ) else( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) - add_subdirectory( ${CMAKE_SYSTEM_NAME} ) - include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_SYSTEM_NAME} ) + set( SYSTEM_SUBDIR ${CMAKE_SYSTEM_NAME} ) endif( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" ) endif( ${CMAKE_SYSTEM_NAME} MATCHES "DragonFly" ) +if( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEM_SUBDIR} ) + add_subdirectory( ${SYSTEM_SUBDIR} ) + include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEM_SUBDIR} ) +else( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEM_SUBDIR} ) + add_subdirectory( "Stub" ) + include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/"Stub" ) +endif( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${SYSTEM_SUBDIR} ) + ########### next target ############### set(libccont_SRCS --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/CMakeLists.txt 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/CMakeLists.txt 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,14 @@ +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../CContLib ${CMAKE_CURRENT_SOURCE_DIR}/../ ) + +KDE4_ADD_LIBRARY(libksysguardd STATIC + apm.c + CPU.c + diskstat.c + loadavg.c + logfile.c + Memory.c + netdev.c + ProcessList.c) + +TARGET_LINK_LIBRARIES(libksysguardd kvm) + --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/CPU.c 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/CPU.c 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,80 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 1999 Chris Schlaeger + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#include "CPU.h" +#include "Command.h" +#include "ksysguardd.h" + +void +initCpuInfo(struct SensorModul* sm) +{ +} + +void +exitCpuInfo(void) +{ +} + +int +updateCpuInfo(void) +{ + return 0; +} + +void +printCPUUser(const char* cmd) +{ +} + +void +printCPUUserInfo(const char* cmd) +{ +} + +void +printCPUNice(const char* cmd) +{ +} + +void +printCPUNiceInfo(const char* cmd) +{ +} + +void +printCPUSys(const char* cmd) +{ +} + +void +printCPUSysInfo(const char* cmd) +{ +} + +void +printCPUIdle(const char* cmd) +{ +} + +void +printCPUIdleInfo(const char* cmd) +{ +} --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/CPU.h 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/CPU.h 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,49 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 1999 Chris Schlaeger + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#ifndef _cpuinfo_h_ +#define _cpuinfo_h_ + +struct SensorModul; + +void initCpuInfo(struct SensorModul* sm); +void exitCpuInfo(void); + +int updateCpuInfo(void); + +void printCPUUser(const char* cmd); +void printCPUUserInfo(const char* cmd); +void printCPUNice(const char* cmd); +void printCPUNiceInfo(const char* cmd); +void printCPUSys(const char* cmd); +void printCPUSysInfo(const char* cmd); +void printCPUIdle(const char* cmd); +void printCPUIdleInfo(const char* cmd); +void printCPUxUser(const char* cmd); +void printCPUxUserInfo(const char* cmd); +void printCPUxNice(const char* cmd); +void printCPUxNiceInfo(const char* cmd); +void printCPUxSys(const char* cmd); +void printCPUxSysInfo(const char* cmd); +void printCPUxIdle(const char* cmd); +void printCPUxIdleInfo(const char* cmd); + +#endif --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/Memory.c 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/Memory.c 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,111 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 1999-2000 Hans Petter Bieker + Copyright (c) 1999 Chris Schlaeger + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#include "Command.h" +#include "Memory.h" +#include "ksysguardd.h" + +void +initMemory(struct SensorModul* sm) +{ +} + +void +exitMemory(void) +{ +} + +int +updateMemory(void) +{ + return 0; +} + +void +printMFree(const char* cmd) +{ +} + +void +printMFreeInfo(const char* cmd) +{ +} + +void +printUsed(const char* cmd) +{ +} + +void +printUsedInfo(const char* cmd) +{ +} + +void +printBuffers(const char* cmd) +{ +} + +void +printBuffersInfo(const char* cmd) +{ +} + +void +printCached(const char* cmd) +{ +} + +void +printCachedInfo(const char* cmd) +{ +} + +void +printApplication(const char* cmd) +{ +} + +void +printApplicationInfo(const char* cmd) +{ +} + +void +printSwapUsed(const char* cmd) +{ +} + +void +printSwapUsedInfo(const char* cmd) +{ +} + +void +printSwapFree(const char* cmd) +{ +} + +void +printSwapFreeInfo(const char* cmd) +{ +} --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/Memory.h 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/Memory.h 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,45 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 1999 Chris Schlaeger + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#ifndef _memory_h_ +#define _memory_h_ + +void initMemory(struct SensorModul* sm); +void exitMemory(void); + +int updateMemory(void); + +void printMFree(const char* cmd); +void printMFreeInfo(const char* cmd); +void printUsed(const char* cmd); +void printUsedInfo(const char* cmd); +void printBuffers(const char* cmd); +void printBuffersInfo(const char* cmd); +void printCached(const char* cmd); +void printCachedInfo(const char* cmd); +void printApplication(const char* cmd); +void printApplicationInfo(const char* cmd); +void printSwapUsed(const char* cmd); +void printSwapUsedInfo(const char* cmd); +void printSwapFree(const char* cmd); +void printSwapFreeInfo(const char* cmd); + +#endif --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/ProcessList.c 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/ProcessList.c 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,73 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 1999-2000 Hans Petter Bieker + Copyright (c) 1999 Chris Schlaeger + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#include "../../gui/SignalIDs.h" +#include "Command.h" +#include "ProcessList.h" +#include "ccont.h" +#include "ksysguardd.h" + +void +initProcessList(struct SensorModul* sm) +{ +} + +void +exitProcessList(void) +{ +} + +int +updateProcessList(void) +{ + return 0; +} + +void +printProcessListInfo(const char* cmd) +{ +} + +void +printProcessList(const char* cmd) +{ +} + +void +printProcessCount(const char* cmd) +{ +} + +void +printProcessCountInfo(const char* cmd) +{ +} + +void +killProcess(const char* cmd) +{ +} + +void +setPriority(const char* cmd) +{ +} --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/ProcessList.h 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/ProcessList.h 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,38 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 1999 Chris Schlaeger + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#ifndef _process_list_h_ +#define _process_list_h_ + +void initProcessList(struct SensorModul* sm); +void exitProcessList(void); + +int updateProcessList(void); + +void printProcessList(const char*); +void printProcessListInfo(const char*); +void printProcessCount(const char* cmd); +void printProcessCountInfo(const char* cmd); + +void killProcess(const char* cmd); +void setPriority(const char* cmd); + +#endif --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/apm.c 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/apm.c 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,58 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#include "Command.h" +#include "apm.h" +#include "ksysguardd.h" + +void +initApm(struct SensorModul* sm) +{ +} + +void +exitApm(void) +{ +} + +int +updateApm(void) +{ +} + +void +printApmBatFill(const char* c) +{ +} + +void +printApmBatFillInfo(const char* c) +{ +} + +void +printApmBatTime(const char* c) +{ +} + +void +printApmBatTimeInfo(const char* c) +{ +} --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/apm.h 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/apm.h 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,34 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#ifndef _apm_h_ +#define _apm_h_ + +void initApm(struct SensorModul* sm); +void exitApm(void); + +int updateApm(void); + +void printApmBatFill(const char*); +void printApmBatFillInfo(const char*); +void printApmBatTime(const char*); +void printApmBatTimeInfo(const char*); + +#endif --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/diskstat.c 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/diskstat.c 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,73 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#include "Command.h" +#include "ccont.h" +#include "diskstat.h" +#include "ksysguardd.h" + +void initDiskStat(struct SensorModul* sm) +{ +} + +void checkDiskStat(void) +{ +} + +void exitDiskStat(void) +{ +} + +int updateDiskStat(void) +{ + return 0; +} + +void printDiskStat(const char* cmd) +{ +} + +void printDiskStatInfo(const char* cmd) +{ +} + +void printDiskStatUsed(const char* cmd) +{ +} + +void printDiskStatUsedInfo(const char* cmd) +{ +} + +void printDiskStatFree(const char* cmd) +{ +} + +void printDiskStatFreeInfo(const char* cmd) +{ +} + +void printDiskStatPercent(const char* cmd) +{ +} + +void printDiskStatPercentInfo(const char* cmd) +{ +} --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/diskstat.h 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/diskstat.h 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,40 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#ifndef _diskstat_h_ +#define _diskstat_h_ + +void initDiskStat(struct SensorModul* sm); +void exitDiskStat(void); + +int updateDiskStat(void); +void checkDiskStat(void); + +void printDiskStat(const char* cmd); +void printDiskStatInfo(const char* cmd); + +void printDiskStatUsed(const char* cmd); +void printDiskStatUsedInfo(const char* cmd); +void printDiskStatFree(const char* cmd); +void printDiskStatFreeInfo(const char* cmd); +void printDiskStatPercent(const char* cmd); +void printDiskStatPercentInfo(const char* cmd); + +#endif --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/loadavg.c 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/loadavg.c 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,69 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#include "Command.h" +#include "ksysguardd.h" +#include "loadavg.h" + +void +initLoadAvg(struct SensorModul* sm) +{ +} + +void +exitLoadAvg(void) +{ +} + +int +updateLoadAvg(void) +{ + return 0; +} + +void +printLoadAvg1(const char* c) +{ +} + +void +printLoadAvg1Info(const char* c) +{ +} + +void +printLoadAvg5(const char* c) +{ +} + +void +printLoadAvg5Info(const char* c) +{ +} + +void +printLoadAvg15(const char* c) +{ +} + +void +printLoadAvg15Info(const char* c) +{ +} --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/loadavg.h 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/loadavg.h 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,36 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#ifndef _loadavg_h_ +#define _loadavg_h_ + +void initLoadAvg(struct SensorModul* sm); +void exitLoadAvg(void); + +int updateLoadAvg(void); + +void printLoadAvg1(const char*); +void printLoadAvg1Info(const char*); +void printLoadAvg5(const char*); +void printLoadAvg5Info(const char*); +void printLoadAvg15(const char*); +void printLoadAvg15Info(const char*); + +#endif --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/logfile.c 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/logfile.c 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,53 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#include "Command.h" +#include "ccont.h" +#include "conf.h" +#include "ksysguardd.h" +#include "logfile.h" + +void initLogFile(struct SensorModul* sm) +{ +} + +void exitLogFile(void) +{ +} + +void printLogFile(const char* cmd) +{ +} + +void printLogFileInfo(const char* cmd) +{ +} + +void registerLogFile(const char* cmd) +{ +} + +void unregisterLogFile(const char* cmd) +{ +} + +void printRegistered(const char* cmd) +{ +} --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/logfile.h 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/logfile.h 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,36 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#ifndef _logfile_h_ +#define _logfile_h_ + +void initLogFile(struct SensorModul* sm); +void exitLogFile(void); + +void printLogFile(const char* cmd); +void printLogFileInfo(const char* cmd); + +void registerLogFile(const char* cmd); +void unregisterLogFile(const char* cmd); + +/* debug command */ +void printRegistered(const char* cmd); + +#endif --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/netdev.c 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/netdev.c 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,56 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#include "Command.h" +#include "ksysguardd.h" +#include "netdev.h" + +void initNetDev(struct SensorModul* sm) +{ +} + +void exitNetDev(void) +{ +} + +int updateNetDev(void) +{ + return 0; +} + +void checkNetDev(void) +{ +} + +void printNetDevRecBytes(const char *cmd) +{ +} + +void printNetDevRecBytesInfo(const char *cmd) +{ +} + +void printNetDevSentBytes(const char *cmd) +{ +} + +void printNetDevSentBytesInfo(const char *cmd) +{ +} --- kdebase-workspace-3.94.0/ksysguard/ksysguardd/Stub/netdev.h 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/ksysguardd/Stub/netdev.h 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,35 @@ +/* + KSysGuard, the KDE System Guard + + Copyright (c) 2001 Tobias Koenig + + This program is free software; you can redistribute it and/or + modify it under the terms of version 2 of the GNU General Public + License as published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +*/ + +#ifndef _netdev_h_ +#define _netdev_h_ + +void initNetDev(struct SensorModul* sm); +void exitNetDev(void); + +int updateNetDev(void); +void checkNetDev(void); + +void printNetDevRecBytes(const char* cmd); +void printNetDevRecBytesInfo(const char* cmd); +void printNetDevSentBytes(const char* cmd); +void printNetDevSentBytesInfo(const char* cmd); + +#endif --- kdebase-workspace-3.94.0/ksysguard/libksysguard/processcore/processes_local_p.cpp 2007-05-03 04:38:31.000000000 -0400 +++ kdebase-workspace-3.94.0-new/ksysguard/libksysguard/processcore/processes_local_p.cpp 2007-10-15 23:01:40.000000000 -0400 @@ -26,5 +26,7 @@ #include "processes_openbsd_p.cpp" #elif defined __NetBSD__ #include "processes_netbsd_p.cpp" +#else +#include "processes_stub_p.cpp" #endif --- kdebase-workspace-3.94.0/ksysguard/libksysguard/processcore/processes_stub_p.cpp 1969-12-31 19:00:00.000000000 -0500 +++ kdebase-workspace-3.94.0-new/ksysguard/libksysguard/processcore/processes_stub_p.cpp 2007-10-15 23:01:40.000000000 -0400 @@ -0,0 +1,133 @@ +/* This file is part of the KDE project + Copyright (C) 2007 Manolo Valdes + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2 as published by the Free Software Foundation. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include "processes_local_p.h" +#include "process.h" + +#include + +#include + +#include +#include +#include +#include +#include +#if defined(__DragonFly__) +#include +#include +#endif +#include +#include + + + + +namespace KSysGuard +{ + + class ProcessesLocal::Private + { + public: + Private() {;} + ~Private() {;} + inline bool readProc(long pid, struct kinfo_proc *p); + inline void readProcStatus(struct kinfo_proc *p, Process *process); + inline void readProcStat(struct kinfo_proc *p, Process *process); + inline void readProcStatm(struct kinfo_proc *p, Process *process); + inline bool readProcCmdline(long pid, Process *process); + }; + +bool ProcessesLocal::Private::readProc(long pid, struct kinfo_proc *p) +{ + return false; +} + +void ProcessesLocal::Private::readProcStatus(struct kinfo_proc *p, Process *process) +{ +} + +void ProcessesLocal::Private::readProcStat(struct kinfo_proc *p, Process *ps) +{ +} + +void ProcessesLocal::Private::readProcStatm(struct kinfo_proc *p, Process *process) +{ +} + +bool ProcessesLocal::Private::readProcCmdline(long pid, Process *process) +{ + return false; +} + +ProcessesLocal::ProcessesLocal() : d(new Private()) +{ +} + +long ProcessesLocal::getParentPid(long pid) { + Q_ASSERT(pid != 0); + long long ppid = 0; + struct kinfo_proc p; + if(d->readProc(pid, &p)) + { +#if defined(__FreeBSD__) && __FreeBSD_version >= 500015 + ppid = p.ki_ppid; +#elif defined(__DragonFly__) && __DragonFly_version >= 190000 + ppid = p.kp_ppid; +#else + ppid = p.kp_eproc.e_ppid; +#endif + } + return ppid; +} + +bool ProcessesLocal::updateProcessInfo( long pid, Process *process) +{ + struct kinfo_proc p; + if(!d->readProc(pid, &p)) return false; + d->readProcStat(&p, process); + d->readProcStatus(&p, process); + d->readProcStatm(&p, process); + if(!d->readProcCmdline(pid, process)) return false; + + return true; +} + +QSet ProcessesLocal::getAllPids( ) +{ + QSet pids; + return pids; +} + +bool ProcessesLocal::sendSignal(long pid, int sig) { + return false; +} + +bool ProcessesLocal::setNiceness(long pid, int priority) { + return false; +} + +long long ProcessesLocal::totalPhysicalMemory() { + return 0; +} + +ProcessesLocal::~ProcessesLocal() +{ +} + +} --- kdebase-workspace-3.94.0/libs/plasma/CMakeLists.txt 2007-10-08 03:17:58.000000000 -0400 +++ kdebase-workspace-3.94.0-new/libs/plasma/CMakeLists.txt 2007-10-15 23:01:40.000000000 -0400 @@ -1,7 +1,7 @@ -include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs) - find_package(OpenGL) +include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs ${OPENGL_INCLUDE_DIR} ) + add_subdirectory( widgets ) ########### next target ############### --- kdebase-workspace-3.94.0/plasma/engines/mouse/CMakeLists.txt 2007-10-08 03:18:02.000000000 -0400 +++ kdebase-workspace-3.94.0-new/plasma/engines/mouse/CMakeLists.txt 2007-10-15 23:01:40.000000000 -0400 @@ -9,8 +9,10 @@ endif (X11_Xfixes_FOUND) kde4_add_plugin(plasma_engine_mouse ${mouse_engine_SRCS}) -target_link_libraries(plasma_engine_mouse ${KDE4_KDEUI_LIBS} ${X11_Xfixes_LIB} -plasma) +target_link_libraries(plasma_engine_mouse ${KDE4_KDEUI_LIBS} plasma) +if (X11_Xfixes_FOUND) + target_link_libraries(plasma_engine_mouse ${X11_Xfixes_LIB}) +endif (X11_Xfixes_FOUND) install(TARGETS plasma_engine_mouse DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES plasma-engine-mouse.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) --- kdebase-workspace-3.94.0/plasma/kickoff/src/CMakeLists.txt 2007-10-09 20:04:57.000000000 -0400 +++ kdebase-workspace-3.94.0-new/plasma/kickoff/src/CMakeLists.txt 2007-10-15 23:01:40.000000000 -0400 @@ -1,6 +1,7 @@ -find_package(Plasma REQUIRED) +#find_package(Plasma REQUIRED) +include_directories( ${STRIGI_INCLUDE_DIR} ) # Kickoff Shared set( Kickoff_SRCS core/applicationmodel.cpp @@ -44,7 +45,7 @@ plasma-applet/applet.cpp ) kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) -target_link_libraries(plasma_applet_launcher ${Kickoff_LIBS} ${PLASMA_LIBS}) +target_link_libraries(plasma_applet_launcher ${Kickoff_LIBS} plasma) install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) install(FILES plasma-applet/plasma-launcher-applet.desktop DESTINATION ${SERVICES_INSTALL_DIR}) --- kdebase-workspace-3.94.0/plasma/kickoff/src/core/itemhandlers.cpp 2007-10-09 20:04:57.000000000 -0400 +++ kdebase-workspace-3.94.0-new/plasma/kickoff/src/core/itemhandlers.cpp 2007-10-15 23:01:40.000000000 -0400 @@ -30,7 +30,7 @@ #include // KDE Base -#include +#include // Local #include "core/recentapplications.h" --- kdebase-workspace-3.94.0/startkde.cmake 2007-08-29 05:53:46.000000000 -0400 +++ kdebase-workspace-3.94.0-new/startkde.cmake 2007-10-15 23:06:13.000000000 -0400 @@ -7,6 +7,8 @@ # because we still need to do some cleanup. trap 'echo GOT SIGHUP' HUP +KDEDIRS="@FINKPREFIX@/lib/kde4-@FINKTYPE@:@FINKPREFIX@/lib/qt4-@FINKTYPE@:@FINKPREFIX@/lib/@FINKTYPE@" + # Check if a KDE session already is running if kcheckrunning >/dev/null 2>&1; then echo "KDE seems to be already running on this display." @@ -38,6 +40,11 @@ esac fi +for DIR in `echo $KDEDIRS | perl -e 'chomp(my $line = ); print join(" ", reverse(split(/:/, $line)))'`; do + PATH="$DIR/bin:$PATH" + export PATH +done + # Boot sequence: # # kdeinit is used to fork off processes which improves memory usage