diff options
Diffstat (limited to 'x11/kde4-workspace/files')
23 files changed, 0 insertions, 564 deletions
diff --git a/x11/kde4-workspace/files/kdm.in b/x11/kde4-workspace/files/kdm.in deleted file mode 100644 index 06181ce3bbeb..000000000000 --- a/x11/kde4-workspace/files/kdm.in +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -# some defs -GENKDMCONF=%%PREFIX%%/bin/genkdmconf -KDMCONFDIR=%%PREFIX%%/share/config/kdm - -#Configure kdm if needed -if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; - ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; -else - echo "Updating KDM configuration"; - ${GENKDMCONF} --in ${KDMCONFDIR}; - -fi - -#run kdm -exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kde4-workspace/files/kdm4.in b/x11/kde4-workspace/files/kdm4.in deleted file mode 100644 index c7d71dc4767f..000000000000 --- a/x11/kde4-workspace/files/kdm4.in +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -# -# PROVIDE: kdm4 -# REQUIRE: LOGIN cleanvar moused syscons dbus hald -# -# Add the following to /etc/rc.conf to start kdm at boot time: -# -# kdm4_enable="YES" -# - -. /etc/rc.subr - -kdm4_enable=${kdm4_enable-"NO"} - -export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/local/kde4/bin:/usr/local/kde4/sbin - -GENKDMCONF=%%PREFIX%%/bin/genkdmconf -KDMCONFDIR=%%PREFIX%%/share/config/kdm - -name=kdm4 -rcvar=`set_rcvar` -command="%%PREFIX%%/bin/kdm-bin" -pidfile="/var/run/kdm.pid" -procname="%%PREFIX%%/bin/kdm-bin" -start_cmd="kdm_start" - -kdm_start() -{ - if ! checkyesno kdm4_enable ; then - return 0 - fi - echo "Starting ${name}." - - #Configure kdm if needed - if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; - ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; - else - echo "Updating KDM configuration"; - ${GENKDMCONF} --in ${KDMCONFDIR}; - fi - - ( iter=0 - while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do - if [ ${iter} -eq 60 ]; then - break - fi - sleep 10 - iter=$(expr ${iter} + 1) - done - ${command} ${kdm4_flags} ) & -} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/x11/kde4-workspace/files/layout.js.in b/x11/kde4-workspace/files/layout.js.in deleted file mode 100644 index 6373257213ef..000000000000 --- a/x11/kde4-workspace/files/layout.js.in +++ /dev/null @@ -1,7 +0,0 @@ -for (var i = 0; i < activityIds.length; ++i) { - var desktop = activityById(activityIds[i]); - desktop.wallpaperPlugin = "image"; - desktop.wallpaperMode = "SingleImage"; - desktop.currentConfigGroup = new Array("Wallpaper", "image"); - desktop.writeConfig("wallpaper", "%%PREFIX%%/share/wallpapers/stripes-freebsd-blue/"); -} diff --git a/x11/kde4-workspace/files/metadata.desktop b/x11/kde4-workspace/files/metadata.desktop deleted file mode 100644 index 80ab4a657791..000000000000 --- a/x11/kde4-workspace/files/metadata.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Default Panel - -Type=Service -ServiceTypes=Plasma/LayoutTemplate -X-KDE-PluginInfo-Author=Alberto Villa -X-KDE-PluginInfo-Email=kde@FreeBSD.org -X-KDE-PluginInfo-Name=org.kde.freebsd.defaultWallpaper -X-KDE-PluginInfo-Version=1.0 -X-KDE-PluginInfo-Website=http://FreeBSD.kde.org/ -X-KDE-PluginInfo-Category= -X-KDE-PluginInfo-Depends= -X-KDE-PluginInfo-License=BSD -X-KDE-PluginInfo-EnabledByDefault=true diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt deleted file mode 100644 index 69647cafd4f2..000000000000 --- a/x11/kde4-workspace/files/patch-CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ ---- ./CMakeLists.txt.orig 2010-07-29 01:04:56.000000000 +0400 -+++ ./CMakeLists.txt 2010-08-03 14:45:37.785806201 +0400 -@@ -79,7 +79,7 @@ - configure_file(config-unix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-unix.h ) - configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h ) - if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") -- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") -+ set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/local/lib/X11/icons\"; export XCURSOR_PATH") - endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") - configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) - endif(NOT WIN32) -@@ -231,7 +231,7 @@ - macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake - ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH}) - --set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake) -+set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake) - # places where find_package() looks for FooConfig.cmake files: - # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in - # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR diff --git a/x11/kde4-workspace/files/patch-ConfigureChecks.cmake b/x11/kde4-workspace/files/patch-ConfigureChecks.cmake deleted file mode 100644 index ed8b60fb95c2..000000000000 --- a/x11/kde4-workspace/files/patch-ConfigureChecks.cmake +++ /dev/null @@ -1,20 +0,0 @@ ---- ./ConfigureChecks.cmake.orig 2009-11-21 12:44:36.000000000 +0300 -+++ ./ConfigureChecks.cmake 2010-01-27 00:04:40.445046695 +0300 -@@ -16,16 +16,7 @@ - endmacro(define_pam_service) - - macro(install_pam_service APP) -- string(TOUPPER KDE4_${APP}_PAM_SERVICE cvar) -- install(CODE " -- set(DESTDIR_VALUE \"\$ENV{DESTDIR}\") -- if (NOT DESTDIR_VALUE) -- exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS ${${cvar}} RETURN_VALUE ret) -- if (NOT ret) -- exec_program(\"${KDEBASE_WORKSPACE_SOURCE_DIR}/mkpamserv\" ARGS -P ${${cvar}}-np) -- endif (NOT ret) -- endif (NOT DESTDIR_VALUE) -- ") -+ message("Ignore installing pam service, FreeBSD has it already.") - endmacro(install_pam_service) - - define_pam_service(KDM) diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt b/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt deleted file mode 100644 index a4102a8029dd..000000000000 --- a/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- ./kdm/kfrontend/CMakeLists.txt.orig 2008-07-30 17:02:54.000000000 +0300 -+++ ./kdm/kfrontend/CMakeLists.txt 2008-07-30 17:03:26.000000000 +0300 -@@ -113,6 +113,6 @@ - - - # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h) --install(CODE " --exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) --") -+#install(CODE " -+#exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) -+#") diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c deleted file mode 100644 index ef0cea949b21..000000000000 --- a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c +++ /dev/null @@ -1,30 +0,0 @@ ---- ./kdm/kfrontend/genkdmconf.c.orig 2010-07-06 10:54:31.000000000 +0400 -+++ ./kdm/kfrontend/genkdmconf.c 2010-07-30 22:23:28.920432715 +0400 -@@ -45,9 +45,6 @@ - #include <sys/stat.h> - #include <sys/wait.h> - #include <sys/param.h> --#ifdef BSD --# include <utmp.h> --#endif - - #define WANT_CONF_GEN - #include <config.ci> -@@ -1857,7 +1854,7 @@ - #else - # ifdef BSD - delstr(file, "\n" --"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") | -+"exec sessreg -a -l $DISPLAY -x */Xservers $USER\n" ) | - # endif - #endif /* _AIX */ - delstr(file, "\n" -@@ -1906,7 +1903,7 @@ - #else - # ifdef BSD - delstr(file, "\n" --"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n") | -+"exec sessreg -d -l $DISPLAY -x */Xservers $USER\n" ) | - # endif - #endif /* _AIX */ - delstr(file, "\n" diff --git a/x11/kde4-workspace/files/patch-kdm__backend__client.c b/x11/kde4-workspace/files/patch-kdm__backend__client.c deleted file mode 100644 index ddc34a7504ae..000000000000 --- a/x11/kde4-workspace/files/patch-kdm__backend__client.c +++ /dev/null @@ -1,26 +0,0 @@ ---- ./kdm/backend/client.c.orig 2010-07-06 10:54:30.000000000 +0400 -+++ ./kdm/backend/client.c 2010-07-30 22:23:48.264408318 +0400 -@@ -1309,6 +1309,9 @@ - char ckDeviceBuf[20] = ""; - const char *ckDevice = ckDeviceBuf; - dbus_bool_t isLocal; -+# ifdef BSD -+ FILE *proc; -+# endif - #endif - char *failsafeArgv[2]; - char *buf, *buf2; -@@ -1340,6 +1343,13 @@ - # ifdef HAVE_VTS - if (td->serverVT > 0) - sprintf(ckDeviceBuf, "/dev/tty%d", td->serverVT); -+# elif defined(BSD) -+ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) { -+ fscanf( proc, "%s", ckDeviceBuf ); -+ pclose(proc); -+ if (strcmp( ckDeviceBuf, "usage" ) == 0 || strcmp( ckDeviceBuf, "ERROR:" ) == 0) -+ ckDeviceBuf[0] = '\0'; -+ } - # endif - isLocal = ((td->displayType & d_location) == dLocal); - # ifdef XDMCP diff --git a/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt deleted file mode 100644 index c119c41f92ee..000000000000 --- a/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- ./kinfocenter/Modules/base/CMakeLists.txt.orig 2008-04-18 11:21:39.000000000 +0400 -+++ ./kinfocenter/Modules/base/CMakeLists.txt 2009-09-04 00:32:17.000000000 +0400 -@@ -2,7 +2,7 @@ - # TODO: HAVE_LIBDEVINFO_H (for Solaris 7 and later) - # to be set if both -ldevinfo and libdevinfo.h exist - --check_include_files(devinfo.h HAVE_DEVINFO_H) # info_fbsd.cpp -+check_include_files("sys/types.h;devinfo.h" HAVE_DEVINFO_H) # info_fbsd.cpp - check_include_files(fstab.h HAVE_FSTAB_H) # info_linux.cpp - check_include_files(linux/raw.h HAVE_LINUX_RAW_H) # info_linux.cpp - check_include_files(mntent.h HAVE_MNTENT_H) # info_linux.cpp diff --git a/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp b/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp deleted file mode 100644 index c6bd05dfd898..000000000000 --- a/x11/kde4-workspace/files/patch-kinfocenter__Modules__base__info_fbsd.cpp +++ /dev/null @@ -1,57 +0,0 @@ ---- ./kinfocenter/Modules/base/info_fbsd.cpp.orig 2009-04-15 14:25:24.000000000 +0400 -+++ ./kinfocenter/Modules/base/info_fbsd.cpp 2009-09-22 21:33:38.000000000 +0400 -@@ -211,28 +211,17 @@ - FILE *pipe; - QFile *pcicontrol; - QString s, cmd; -+ QTextStream *t; - QTreeWidgetItem *olditem= NULL; - - pcicontrol = new QFile("/usr/sbin/pciconf"); - - if (!pcicontrol->exists()) { -+ QStringList list; -+ list << i18n("Could not find any programs with which to query your system's PCI information"); -+ new QTreeWidgetItem(tree, list); - delete pcicontrol; -- pcicontrol = new QFile("/usr/X11R6/bin/scanpci"); -- if (!pcicontrol->exists()) { -- delete pcicontrol; -- pcicontrol = new QFile("/usr/X11R6/bin/pcitweak"); -- if (!pcicontrol->exists()) { -- QStringList list; -- list << i18n("Could not find any programs with which to query your system's PCI information"); -- new QTreeWidgetItem(tree, list); -- delete pcicontrol; -- return true; -- } else { -- cmd = "/usr/X11R6/bin/pcitweak -l 2>&1"; -- } -- } else { -- cmd = "/usr/X11R6/bin/scanpci"; -- } -+ return true; - } else { - cmd = "/usr/sbin/pciconf -l -v 2>&1"; - } -@@ -247,8 +236,19 @@ - /* This prints out a list of all the pci devies, perhaps eventually we could - parse it as opposed to schlepping it into a listbox */ - -+ t = new QTextStream(pipe, QIODevice::ReadOnly); -+ -+ while (true) { -+ s = t->readLine(); -+ if (s.isEmpty() ) -+ break; -+ QStringList list; -+ list << s; -+ new QTreeWidgetItem(tree, list); -+ } -+ -+ delete t; - pclose(pipe); -- GetInfo_ReadfromPipe(tree, cmd.toLatin1(), true); - } - - if (!tree->topLevelItemCount()) { diff --git a/x11/kde4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt b/x11/kde4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt deleted file mode 100644 index ba31e9b254d3..000000000000 --- a/x11/kde4-workspace/files/patch-kinfocenter__Modules__info__CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- ./kinfocenter/Modules/info/CMakeLists.txt.orig 2008-04-23 19:51:22.000000000 +0400 -+++ ./kinfocenter/Modules/info/CMakeLists.txt 2009-09-04 00:42:28.000000000 +0400 -@@ -1,4 +1,4 @@ -- -+set(CMAKE_BACKWARDS_COMPATIBILITY 2.2) - # OS Base includes - include(../base/CMakeLists.txt) - -@@ -12,7 +12,7 @@ - - kde4_add_plugin(kcm_info ${kcm_info_PART_SRCS}) - --target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB}) -+target_link_libraries(kcm_info ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} /usr/lib/libdevinfo.so) - - install(TARGETS kcm_info DESTINATION ${PLUGIN_INSTALL_DIR} ) - diff --git a/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp b/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp deleted file mode 100644 index b08046ff9014..000000000000 --- a/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./ksmserver/fadeeffect.cpp.ori 2008-07-22 00:15:47.000000000 +0200 -+++ ./ksmserver/fadeeffect.cpp 2008-07-22 00:16:13.000000000 +0200 -@@ -58,7 +58,7 @@ - #include "fadeeffect.moc" - - --#ifndef HAVE_SSE2 -+#if !defined(HAVE_SSE2) || __GNUC__ < 4 - static inline void *_mm_malloc(size_t size, int) - { - return malloc(size); diff --git a/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd b/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd deleted file mode 100644 index 1b7b451570db..000000000000 --- a/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd +++ /dev/null @@ -1,11 +0,0 @@ ---- ./ksysguard/gui/SystemLoad2.sgrd.orig 2009-06-09 18:07:55.000000000 +0200 -+++ ./ksysguard/gui/SystemLoad2.sgrd 2009-07-03 09:35:29.000000000 +0200 -@@ -3,7 +3,7 @@ - <WorkSheet title="System Load" interval="0.5" locked="1" rows="3" columns="1" > - <host port="-1" command="ksysguardd" shell="" name="localhost" /> - <display title="CPU History" svgBackground="widgets/plot-background" autoRange="0" class="FancyPlotter" column="0" row="0" version="1"> -- <beam sensorType="float" hostName="localhost" regexpSensorName="cpu/cpu.*/TotalLoad" color="0xffff8000,0xffe20800" /> -+ <beam sensorType="float" hostName="localhost" regexpSensorName="cpu/.*/TotalLoad" color="0xffff8000,0xffe20800" /> - </display> - <display title="Memory and Swap History" svgBackground="widgets/plot-background" autoRange="0" class="FancyPlotter" column="0" row="1" version="1" > - <beam summationName="Memory" sensorName="mem/physical/application" sensorType="integer" hostName="localhost" color="0xffc000c0" /> diff --git a/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc b/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc deleted file mode 100644 index 951988f978b5..000000000000 --- a/x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- ./ksysguard/gui/ksgrd/SensorManager.cc.orgi 2009-01-22 23:54:35.000000000 +0100 -+++ ./ksysguard/gui/ksgrd/SensorManager.cc 2009-01-22 23:54:52.000000000 +0100 -@@ -61,6 +61,7 @@ - mDict.insert( QLatin1String( "nice" ), i18n( "Nice Load" ) ); - mDict.insert( QLatin1String( "user" ), i18n( "User Load" ) ); - mDict.insert( QLatin1String( "sys" ), i18nc( "@item sensor description", "System Load" ) ); -+ mDict.insert( QLatin1String( "intr" ), i18n( "Interrupt Load" ) ); - mDict.insert( QLatin1String( "wait" ), i18n( "Waiting" ) ); - mDict.insert( QLatin1String( "TotalLoad" ), i18n( "Total Load" ) ); - mDict.insert( QLatin1String( "mem" ), i18n( "Memory" ) ); diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CMakeLists.txt b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CMakeLists.txt deleted file mode 100644 index 7fda482f5530..000000000000 --- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- ksysguard/ksysguardd/FreeBSD/CMakeLists.txt.orig 2009-08-20 20:01:27.000000000 +0200 -+++ ksysguard/ksysguardd/FreeBSD/CMakeLists.txt 2009-08-20 20:01:45.000000000 +0200 -@@ -8,7 +8,8 @@ - logfile.c - Memory.c - netdev.c -- ProcessList.c) -+ ProcessList.c -+ uptime.c) - - TARGET_LINK_LIBRARIES(libksysguardd kvm) - diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c deleted file mode 100644 index e2aa9fc7591d..000000000000 --- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c +++ /dev/null @@ -1,77 +0,0 @@ ---- ./ksysguard/ksysguardd/FreeBSD/CPU.c.orig 2008-01-05 00:55:46.000000000 +0100 -+++ ./ksysguard/ksysguardd/FreeBSD/CPU.c 2009-02-03 20:54:08.000000000 +0100 -@@ -49,11 +49,12 @@ - struct kinfo_cputime *); - static struct kinfo_cputime cp_time, cp_old; - --#define CPUSTATES 4 -+#define CPUSTATES 5 - #define CP_USER 0 - #define CP_NICE 1 - #define CP_SYS 2 --#define CP_IDLE 3 -+#define CP_INTR 3 -+#define CP_IDLE 4 - - #else - long percentages(int cnt, int *out, long *new, long *old, long *diffs); -@@ -74,6 +75,8 @@ - registerMonitor("cpu/system/user", "integer", printCPUUser, printCPUUserInfo, sm); - registerMonitor("cpu/system/nice", "integer", printCPUNice, printCPUNiceInfo, sm); - registerMonitor("cpu/system/sys", "integer", printCPUSys, printCPUSysInfo, sm); -+ registerMonitor("cpu/system/TotalLoad", "float", printCPUTotalLoad, printCPUTotalLoadInfo, sm); -+ registerMonitor("cpu/system/intr", "integer", printCPUIntr, printCPUIntrInfo, sm); - registerMonitor("cpu/system/idle", "integer", printCPUIdle, printCPUIdleInfo, sm); - - /* Monitor names changed from kde3 => kde4. Remain compatible with legacy requests when possible. */ -@@ -91,6 +94,8 @@ - removeMonitor("cpu/system/user"); - removeMonitor("cpu/system/nice"); - removeMonitor("cpu/system/sys"); -+ removeMonitor("cpu/system/TotalLoad"); -+ removeMonitor("cpu/system/intr"); - removeMonitor("cpu/system/idle"); - - /* These were registered as legacy monitors */ -@@ -151,6 +156,31 @@ - } - - void -+printCPUTotalLoad(const char* cmd) -+{ -+ fprintf(CurrentClient, "%f\n", (cpu_states[CP_SYS] + cpu_states[CP_USER] + -+ cpu_states[CP_NICE] + cpu_states[CP_INTR]) / 10.0); -+} -+ -+void -+printCPUTotalLoadInfo(const char* cmd) -+{ -+ fprintf(CurrentClient, "CPU Total Load\t0\t100\t%%\n"); -+} -+ -+void -+printCPUIntr(const char* cmd) -+{ -+ fprintf(CurrentClient, "%d\n", cpu_states[CP_INTR]/10); -+} -+ -+void -+printCPUIntrInfo(const char* cmd) -+{ -+ fprintf(CurrentClient, "CPU Interrupt Load\t0\t100\t%%\n"); -+} -+ -+void - printCPUIdle(const char* cmd) - { - fprintf(CurrentClient, "%d\n", cpu_states[CP_IDLE]/10); -@@ -216,7 +246,8 @@ - - out[0] = ((diffs.cp_user * 1000LL + half_total) / total_change); - out[1] = ((diffs.cp_nice * 1000LL + half_total) / total_change); -- out[2] = (((diffs.cp_sys + diffs.cp_intr) * 1000LL + half_total) / total_change); -+ out[2] = ((diffs.cp_sys * 1000LL + half_total) / total_change); -+ out[3] = ((diffs.cp_intr * 1000LL + half_total) / total_change); - out[4] = ((diffs.cp_idle * 1000LL + half_total) / total_change); - } - #else diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h deleted file mode 100644 index 87896f1d25eb..000000000000 --- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h +++ /dev/null @@ -1,22 +0,0 @@ ---- ./ksysguard/ksysguardd/FreeBSD/CPU.h.orig 2008-01-05 00:55:46.000000000 +0100 -+++ ./ksysguard/ksysguardd/FreeBSD/CPU.h 2009-02-03 16:26:12.000000000 +0100 -@@ -35,6 +35,10 @@ - void printCPUNiceInfo(const char* cmd); - void printCPUSys(const char* cmd); - void printCPUSysInfo(const char* cmd); -+void printCPUTotalLoad(const char* cmd); -+void printCPUTotalLoadInfo(const char* cmd); -+void printCPUIntr(const char* cmd); -+void printCPUIntrInfo(const char* cmd); - void printCPUIdle(const char* cmd); - void printCPUIdleInfo(const char* cmd); - void printCPUxUser(const char* cmd); -@@ -43,6 +47,8 @@ - void printCPUxNiceInfo(const char* cmd); - void printCPUxSys(const char* cmd); - void printCPUxSysInfo(const char* cmd); -+void printCPUxIntr(const char* cmd); -+void printCPUxIntrInfo(const char* cmd); - void printCPUxIdle(const char* cmd); - void printCPUxIdleInfo(const char* cmd); - diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-modules.h b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-modules.h deleted file mode 100644 index ab5a13656157..000000000000 --- a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-modules.h +++ /dev/null @@ -1,18 +0,0 @@ ---- ksysguard/ksysguardd/modules.h.orig 2009-08-20 20:02:06.000000000 +0200 -+++ ksysguard/ksysguardd/modules.h 2009-08-20 21:53:11.000000000 +0200 -@@ -59,6 +59,7 @@ - #include "Memory.h" - #include "netdev.h" - #include "ProcessList.h" -+#include "uptime.h" - #endif /* OSTYPE_FreeBSD */ - - #ifdef OSTYPE_Irix -@@ -144,6 +145,7 @@ - { "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC, 0, NULLTIME }, - { "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev, 0, NULLTIME }, - { "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC, 0, NULLTIME }, -+ { "Uptime", initUptime, exitUptime, NULLIVFUNC, NULLVVFUNC, 0, NULLTIME }, - #endif /* OSTYPE_FreeBSD */ - - #ifdef OSTYPE_Irix diff --git a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp deleted file mode 100644 index 946eb9395aae..000000000000 --- a/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- ./kwin/kcmkwin/kwinrules/ruleswidget.cpp.orgi 2008-01-30 00:38:06.000000000 +0100 -+++ ./kwin/kcmkwin/kwinrules/ruleswidget.cpp 2008-01-30 00:38:38.000000000 +0100 -@@ -30,6 +30,7 @@ - - #include <assert.h> - #include <kmessagebox.h> -+#include <QWidget> - #include <QTabWidget> - #include <QTimer> - diff --git a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt b/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt deleted file mode 100644 index da0dbd883481..000000000000 --- a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ ---- ./plasma/generic/scriptengines/CMakeLists.txt.orig 2009-09-16 15:41:05.000000000 +0400 -+++ ./plasma/generic/scriptengines/CMakeLists.txt 2010-06-26 19:18:34.136233668 +0400 -@@ -1,11 +1,9 @@ --add_subdirectory(ruby) - - if(QT_QTWEBKIT_FOUND) - add_subdirectory(webkit) - endif(QT_QTWEBKIT_FOUND) - - if (PythonSupport_FOUND) -- macro_optional_add_subdirectory(python) - endif (PythonSupport_FOUND) - - if(GOOGLEGADGETS_FOUND) diff --git a/x11/kde4-workspace/files/uptime.c b/x11/kde4-workspace/files/uptime.c deleted file mode 100644 index 4cc921066323..000000000000 --- a/x11/kde4-workspace/files/uptime.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - KSysGuard, the KDE System Guard - - Copyright (c) 2009 Markus Brueffer <markus@brueffer.de> - - 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 <time.h> - -#include "Command.h" -#include "ksysguardd.h" -#include "uptime.h" - -void -initUptime(struct SensorModul* sm) -{ - registerMonitor("system/uptime", "float", printUptime, printUptimeInfo, sm); -} - -void -exitUptime(void) -{ - removeMonitor("system/uptime"); -} - -void -printUptime(const char* c) -{ - struct timespec tp; - float uptime = 0; - - if (clock_gettime(CLOCK_MONOTONIC, &tp) != -1) - uptime = tp.tv_sec + tp.tv_nsec/1000000000.0; - - output("%f\n", uptime); -} - -void -printUptimeInfo(const char* c) -{ - output("System uptime\t0\t0\ts\n"); -} - - diff --git a/x11/kde4-workspace/files/uptime.h b/x11/kde4-workspace/files/uptime.h deleted file mode 100644 index 336e5db031f2..000000000000 --- a/x11/kde4-workspace/files/uptime.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - KSysGuard, the KDE System Guard - - Copyright (c) 2009 Markus Brueffer <markus@brueffer.de> - - 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 _uptime_h_ -#define _uptime_h_ - -void initUptime(struct SensorModul* sm); -void exitUptime(void); - -void printUptime(const char*); -void printUptimeInfo(const char*); - -#endif |