diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-03-25 10:33:51 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-03-25 10:33:51 +0000 |
| commit | c1f3de0f55e58790d19f686e510418e212aee85c (patch) | |
| tree | 9c83366b7e53439af8a08cb4d55853e9209564e1 /x11/kde4-workspace | |
| parent | ccbd618ebd63ebf72b64b3b6679b6ee11976f839 (diff) | |
Notes
Diffstat (limited to 'x11/kde4-workspace')
23 files changed, 493 insertions, 448 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index a60c0fba5624..e9515702d715 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,28 +8,27 @@ PORTNAME= kdebase-workspace PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde -MASTER_SITES= ${MASTER_SITE_KDE} \ - ${MASTER_SITE_LOCAL:S/$/:stripes/} \ - http://people.FreeBSD.org/~avilla/distfiles/:stripes -MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src \ - avilla:stripes -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - stripes-freebsd-1.0${EXTRACT_SUFX}:stripes +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + ${MASTER_SITE_LOCAL} \ + http://people.FreeBSD.org/~avilla/distfiles/ +MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src/:kde \ + avilla/ +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:kde \ + stripes-freebsd-1.0${EXTRACT_SUFX} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system -BUILD_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml LIB_DEPENDS= qimageblitz.4:${PORTSDIR}/x11/qimageblitz\ dbus-1.3:${PORTSDIR}/devel/dbus \ + pci.3:${PORTSDIR}/devel/libpci \ hal.1:${PORTSDIR}/sysutils/hal \ - polkit-qt-core.0:${PORTSDIR}/sysutils/policykit-qt \ xklavier.12:${PORTSDIR}/x11/libxklavier \ gps.19:${PORTSDIR}/astro/gpsd \ - qalculate.5:${PORTSDIR}/math/libqalculate + qalculate.5:${PORTSDIR}/math/libqalculate \ + dmtx.0:${PORTSDIR}/graphics/libdmtx RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ xprop:${PORTSDIR}/x11/xprop \ @@ -38,7 +37,10 @@ RUN_DEPENDS= ${KDE4_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde4-xdg-env \ xrdb:${PORTSDIR}/x11/xrdb \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ xset:${PORTSDIR}/x11/xset \ - setxkbmap:${PORTSDIR}/x11/setxkbmap + setxkbmap:${PORTSDIR}/x11/setxkbmap \ + ${KDE4_PREFIX}/bin/ksysguardd:${PORTSDIR}/sysutils/ksysguardd \ + ${KDE4_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:${PORTSDIR}/sysutils/polkit-kde \ + ${KDE4_PREFIX}/bin/nepomukcontroller:${PORTSDIR}/misc/nepomukcontroller SUB_FILES= kdm layout.js USE_RC_SUBR= kdm4 @@ -54,11 +56,7 @@ USE_GETTEXT= yes USE_ICONV= yes MAKE_JOBS_SAFE= yes -MAN1= plasmaengineexplorer.1 \ - plasmapkg.1 \ - plasmoidviewer.1 - -CONFLICTS= kde4-windeco-aurorae-* kdebase-runtime-4.4.* +MAN1= plasmaengineexplorer.1 plasmapkg.1 plasmoidviewer.1 CMAKE_ARGS+= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DWITH_BlueZ:BOOL=OFF \ @@ -104,21 +102,17 @@ post-patch: ${PATCH_WRKSRC}/kdm/backend/client.c \ ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \ ${PATCH_WRKSRC}/CMakeLists.txt - ${CP} ${FILESDIR}/uptime.* ${WRKSRC}/ksysguard/ksysguardd/FreeBSD/ + @${REINPLACE_CMD} -e 's,resolv,c,g' \ + ${PATCH_WRKSRC}/cmake/modules/FindPCIUTILS.cmake pre-configure: + ${REINPLACE_CMD} -e '/ksysguardd/ d' \ + ${PATCH_WRKSRC}/ksysguard/CMakeLists.txt \ + ${PATCH_WRKSRC}/ksysguard/example/CMakeLists.txt ${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|' \ ${PATCH_WRKSRC}/kwin/effects/thumbnailaside/thumbnailaside.h -.for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp \ - laptop/laptopclient.cpp modernsystem/modernsys.cpp \ - redmond/redmond.cpp - ${REINPLACE_CMD} -e 's|<qdrawutil.h>|<QtGui/qdrawutil.h>|' \ - ${PATCH_WRKSRC}/kwin/clients/${item} -.endfor post-install: - ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ - ${CHMOD} g+s ${PREFIX}/bin/ksysguardd ${LN} -sf ${PREFIX}/bin/startkde ${PREFIX}/bin/startkde4 ${MV} ${PREFIX}/bin/kdm ${PREFIX}/bin/kdm-bin ${MV} ${PREFIX}/lib/kde4/libexec/kdm_config ${PREFIX}/lib/kde4/libexec/kdm-bin_config diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo index b6a9ea5c332c..7174a99a15c5 100644 --- a/x11/kde4-workspace/distinfo +++ b/x11/kde4-workspace/distinfo @@ -1,4 +1,4 @@ -SHA256 (KDE/kdebase-workspace-4.5.5.tar.bz2) = 4d9090fe3b261debfce7b1db4799d7884097960464709866f6da840557d98091 -SIZE (KDE/kdebase-workspace-4.5.5.tar.bz2) = 65688854 +SHA256 (KDE/kdebase-workspace-4.6.1.tar.bz2) = b2c113aec1e5c79b31f2dcac718ba94d142fe39e8e9640d13d19c2dcbf5fae98 +SIZE (KDE/kdebase-workspace-4.6.1.tar.bz2) = 69489744 SHA256 (KDE/stripes-freebsd-1.0.tar.bz2) = 6ac543c0be09df2ef89061740f4e6f8d5b807462d030dbbc3bcfd58056431127 SIZE (KDE/stripes-freebsd-1.0.tar.bz2) = 4258348 diff --git a/x11/kde4-workspace/files/kdm.in b/x11/kde4-workspace/files/kdm.in index 06181ce3bbeb..69162f32924d 100644 --- a/x11/kde4-workspace/files/kdm.in +++ b/x11/kde4-workspace/files/kdm.in @@ -2,19 +2,18 @@ # # $FreeBSD$ -# some defs +# Some definitions. GENKDMCONF=%%PREFIX%%/bin/genkdmconf KDMCONFDIR=%%PREFIX%%/share/config/kdm -#Configure kdm if needed +# Configure KDM if needed. if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; + echo "Generating KDM configuration."; ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; else - echo "Updating KDM configuration"; + echo "Updating KDM configuration."; ${GENKDMCONF} --in ${KDMCONFDIR}; - fi -#run kdm +# Run KDM. exec "%%PREFIX%%/bin/kdm-bin" "$@" diff --git a/x11/kde4-workspace/files/kdm4.in b/x11/kde4-workspace/files/kdm4.in index c7d71dc4767f..483aacc1d4c2 100644 --- a/x11/kde4-workspace/files/kdm4.in +++ b/x11/kde4-workspace/files/kdm4.in @@ -3,7 +3,7 @@ # PROVIDE: kdm4 # REQUIRE: LOGIN cleanvar moused syscons dbus hald # -# Add the following to /etc/rc.conf to start kdm at boot time: +# Add the following to /etc/rc.conf to start KDM at boot time: # # kdm4_enable="YES" # @@ -12,8 +12,6 @@ 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 @@ -21,33 +19,40 @@ 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 + if ! checkyesno kdm4_enable; then + return 0 fi echo "Starting ${name}." - #Configure kdm if needed + # Configure KDM if needed. if [ ! -r ${KDMCONFDIR}/kdmrc ]; then - echo "Generating KDM configuration"; - ${GENKDMCONF} --no-old --in ${KDMCONFDIR}; + echo "Generating KDM configuration." + ${GENKDMCONF} --no-old --in ${KDMCONFDIR} else - echo "Updating KDM configuration"; - ${GENKDMCONF} --in ${KDMCONFDIR}; + 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) + while ! pgrep -fq "^/usr/libexec/getty " > /dev/null 2>&1; do + if [ ${iter} -ge 600 ]; then + return 1 + fi + sleep 1 + iter=$(expr ${iter} + 1) done + if checkyesno hald_enable; then + iter=0 + while [ ${iter} -lt 60 ] && + ! %%LOCALBASE%%/bin/lshal > /dev/null 2>&1; do + sleep 1 + iter=$(expr ${iter} + 1) + done + fi ${command} ${kdm4_flags} ) & } diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt index 69647cafd4f2..6fea1f815c21 100644 --- a/x11/kde4-workspace/files/patch-CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ --- ./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 @@ +@@ -84,7 +84,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") @@ -9,7 +9,7 @@ endif(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) endif(NOT WIN32) -@@ -231,7 +231,7 @@ +@@ -223,13 +223,13 @@ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH}) @@ -18,3 +18,10 @@ # 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 + # option to have kdepimlibs install its Config file there. Alex + if(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) +- set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace-${KDE4WORKSPACE_VERSION} ) ++ set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/KDE4Workspace ) + endif(KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) + + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfig.cmake diff --git a/x11/kde4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt b/x11/kde4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt new file mode 100644 index 000000000000..72261776035d --- /dev/null +++ b/x11/kde4-workspace/files/patch-khotkeys__libkhotkeysprivate__CMakeLists.txt @@ -0,0 +1,9 @@ +--- ./khotkeys/libkhotkeysprivate/CMakeLists.txt.orig 2010-12-02 10:16:38.017500408 +1000 ++++ ./khotkeys/libkhotkeysprivate/CMakeLists.txt 2010-12-02 10:16:45.839492868 +1000 +@@ -75,5 +75,5 @@ + target_link_libraries(khotkeysprivate ${X11_XTest_LIB}) + endif(X11_XTest_FOUND) + set_target_properties(khotkeysprivate PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) +-install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) ++install(TARGETS khotkeysprivate ${INSTALL_TARGETS_DEFAULT_ARGS}) + 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-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-ksysguard__gui__SensorDisplayLib__ListView.cc b/x11/kde4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.cc new file mode 100644 index 000000000000..c2e8520d7182 --- /dev/null +++ b/x11/kde4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.cc @@ -0,0 +1,55 @@ +--- ksysguard~/gui/SensorDisplayLib/ListView.cc 2009-12-14 12:43:42.000000000 +0200 ++++ ksysguard/gui/SensorDisplayLib/ListView.cc 2011-02-18 12:49:41.000000000 +0200 +@@ -108,6 +108,8 @@ + return Time; + else if ( type == "M" ) + return DiskStat; ++ else if ( type == "KB" || type == "KByte" ) ++ return KByte; + else + return Text; + } +@@ -115,6 +117,8 @@ + void + ListView::answerReceived(int id, const QList<QByteArray>& answer) + { ++ unsigned long kbytes; ++ float sbytes; + /* We received something, so the sensor is probably ok. */ + sensorError(id, false); + +@@ -139,7 +143,12 @@ + } + + for(uint i =0 ; i < colTypes.count(); i++) { +- mColumnTypes.append(convertColumnType(colTypes[i])); ++ ColumnType type = convertColumnType(colTypes[i]); ++ mColumnTypes.append(type); ++ if (type == Text || type == DiskStat) ++ mModel.addColumnAlignment(Qt::AlignLeft); ++ else ++ mModel.addColumnAlignment(Qt::AlignRight); + } + + mModel.setHorizontalHeaderLabels(translatedHeaders); +@@ -166,6 +175,20 @@ + case Time: + item->setData(QTime::fromString(records[j]), Qt::DisplayRole); + break; ++ case KByte: ++ kbytes = records[j].toInt(); ++ if(kbytes >= 1024*1024*1024*0.7) { //If it's over 0.7TiB, then set the scale to terabytes ++ sbytes = kbytes / float(1024*1024*1024); ++ item->setText(i18nc("units", "%1 TiB", KGlobal::locale()->formatNumber(sbytes, sbytes < 9.9 ? 1 : 0))); ++ } else if(kbytes >= 1024*1024*0.7) { //If it's over 0.7GiB, then set the scale to gigabytes ++ sbytes = kbytes / float(1024*1024); ++ item->setText(i18nc("units", "%1 GiB", KGlobal::locale()->formatNumber(sbytes, sbytes < 9.9 ? 1 : 0))); ++ } else if(kbytes > 1024) { ++ sbytes = kbytes / float(1024); ++ item->setText(i18nc("units", "%1 MiB", KGlobal::locale()->formatNumber(sbytes, sbytes < 9.9 ? 1 : 0))); ++ } else ++ item->setText(i18nc("units", "%1 KiB", kbytes)); ++ break; + case DiskStat: + case Text: + default: diff --git a/x11/kde4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.h b/x11/kde4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.h new file mode 100644 index 000000000000..b416634067e3 --- /dev/null +++ b/x11/kde4-workspace/files/patch-ksysguard__gui__SensorDisplayLib__ListView.h @@ -0,0 +1,56 @@ +--- ksysguard~/gui/SensorDisplayLib/ListView.h 2011-02-18 12:44:19.000000000 +0200 ++++ ksysguard/gui/SensorDisplayLib/ListView.h 2011-02-18 12:47:59.000000000 +0200 +@@ -29,6 +29,41 @@ + class ListViewSettings; + class QTreeView; + ++class ListViewModel : public QStandardItemModel { ++public: ++ ListViewModel(QObject * parent = 0 ) : QStandardItemModel(parent) ++ { ++ } ++ ++ ListViewModel(int rows, int columns, QObject * parent = 0) : QStandardItemModel(rows, columns, parent) ++ { ++ } ++ ++ void addColumnAlignment( Qt::AlignmentFlag align ) ++ { ++ mAlignment.append(align); ++ } ++ ++ void clear() ++ { ++ QStandardItemModel::clear(); ++ mAlignment.clear(); ++ } ++ ++ QVariant data(const QModelIndex &index, int role) const ++ { ++ int column = index.column(); ++ ++ if ( role == Qt::TextAlignmentRole && column >= 0 && column < mAlignment.size() ) ++ return mAlignment[column]; ++ else ++ return QStandardItemModel::data(index, role); ++ } ++ ++private: ++ QList<Qt::AlignmentFlag> mAlignment; ++}; ++ + class ListView : public KSGRD::SensorDisplay + { + Q_OBJECT +@@ -61,9 +96,9 @@ + + private: + +- typedef enum { Text, Int, Float, Time, DiskStat } ColumnType; ++ typedef enum { Text, Int, Float, Time, DiskStat, KByte } ColumnType; + +- QStandardItemModel mModel; ++ ListViewModel mModel; + QTreeView *mView; + ListViewSettings* lvs; + QByteArray mHeaderSettings; diff --git a/x11/kde4-workspace/files/patch-ksysguard__gui__SystemLoad2.sgrd b/x11/kde4-workspace/files/patch-ksysguard__gui__SystemLoad2.sgrd new file mode 100644 index 000000000000..c3c6b96bae0a --- /dev/null +++ b/x11/kde4-workspace/files/patch-ksysguard__gui__SystemLoad2.sgrd @@ -0,0 +1,12 @@ +--- ksysguard~/gui/SystemLoad2.sgrd 2009-08-28 18:01:43.000000000 +0200 ++++ ksysguard/gui/SystemLoad2.sgrd 2011-01-03 19:18:24.000000000 +0200 +@@ -10,7 +10,7 @@ + <beam summationName="Swap" sensorName="mem/swap/used" sensorType="integer" hostName="localhost" color="0xff00c000" /> + </display> + <display title="Network History" svgBackground="widgets/plot-background" autoRange="1" class="FancyPlotter" column="0" row="2" version="1" min="0" max="20" manualRange="1"> +- <beam sensorType="float" hostName="localhost" summationName="Receiving" regexpSensorName="network/interfaces/(?!lo).*/receiver/data" color="0xB3A52D" /> +- <beam sensorType="float" hostName="localhost" summationName="Sending" regexpSensorName="network/interfaces/(?!lo).*/transmitter/data" color="0x844798" /> ++ <beam sensorType="float" hostName="localhost" summationName="Receiving" regexpSensorName="network/interfaces/(?!lo|bridge|usbus).*/receiver/data" color="0xB3A52D" /> ++ <beam sensorType="float" hostName="localhost" summationName="Sending" regexpSensorName="network/interfaces/(?!lo|bridge|usbus).*/transmitter/data" color="0x844798" /> + </display> + </WorkSheet> diff --git a/x11/kde4-workspace/files/patch-ksysguard__gui__ksgrd__SensorManager.cc b/x11/kde4-workspace/files/patch-ksysguard__gui__ksgrd__SensorManager.cc new file mode 100644 index 000000000000..20c9adcc41d9 --- /dev/null +++ b/x11/kde4-workspace/files/patch-ksysguard__gui__ksgrd__SensorManager.cc @@ -0,0 +1,92 @@ +--- ksysguard~/gui/ksgrd/SensorManager.cc 2009-10-15 18:33:36.000000000 +0200 ++++ ksysguard/gui/ksgrd/SensorManager.cc 2011-02-19 23:22:35.000000000 +0200 +@@ -66,6 +66,7 @@ + mDict.insert( QLatin1String( "user" ), i18n( "User Load" ) ); + mDict.insert( QLatin1String( "sys" ), i18nc( "@item sensor description", "System Load" ) ); + mDict.insert( QLatin1String( "wait" ), i18n( "Waiting" ) ); ++ mDict.insert( QLatin1String( "intr" ), i18n( "Interrupt Load" ) ); + mDict.insert( QLatin1String( "TotalLoad" ), i18n( "Total Load" ) ); + mDict.insert( QLatin1String( "mem" ), i18n( "Memory" ) ); + mDict.insert( QLatin1String( "physical" ), i18n( "Physical Memory" ) ); +@@ -82,6 +83,7 @@ + mDict.insert( QLatin1String( "filepages" ), i18n( "File Pages" ) ); + mDict.insert( QLatin1String( "pscount" ), i18n( "Process Count" ) ); + mDict.insert( QLatin1String( "ps" ), i18n( "Process Controller" ) ); ++ mDict.insert( QLatin1String( "lastpid" ), i18n( "Last Process ID" ) ); + mDict.insert( QLatin1String( "disk" ), i18n( "Disk Throughput" ) ); + mDict.insert( QLatin1String( "load" ), i18nc( "CPU Load", "Load" ) ); + mDict.insert( QLatin1String( "totalio" ), i18n( "Total Accesses" ) ); +@@ -95,6 +97,8 @@ + mDict.insert( QLatin1String( "pageIn" ), i18n( "Pages In" ) ); + mDict.insert( QLatin1String( "pageOut" ), i18n( "Pages Out" ) ); + mDict.insert( QLatin1String( "context" ), i18n( "Context Switches" ) ); ++ mDict.insert( QLatin1String( "trap" ), i18n( "Traps" ) ); ++ mDict.insert( QLatin1String( "syscall" ), i18n( "System Calls" ) ); + mDict.insert( QLatin1String( "network" ), i18n( "Network" ) ); + mDict.insert( QLatin1String( "interfaces" ), i18n( "Interfaces" ) ); + mDict.insert( QLatin1String( "receiver" ), i18n( "Receiver" ) ); +@@ -129,22 +133,30 @@ + mDict.insert( QLatin1String( "acpi" ), i18n( "ACPI" ) ); + mDict.insert( QLatin1String( "thermal_zone" ), i18n( "Thermal Zone" ) ); + mDict.insert( QLatin1String( "temperature" ), i18n( "Temperature" ) ); ++ mDict.insert( QLatin1String( "AverageTemperature" ), i18n( "Average CPU Temperature" ) ); + mDict.insert( QLatin1String( "fan" ), i18n( "Fan" ) ); + mDict.insert( QLatin1String( "state" ), i18n( "State" ) ); + mDict.insert( QLatin1String( "battery" ), i18n( "Battery" ) ); ++ mDict.insert( QLatin1String( "batterycapacity" ), i18n( "Battery Capacity" ) ); + mDict.insert( QLatin1String( "batterycharge" ), i18n( "Battery Charge" ) ); + mDict.insert( QLatin1String( "batteryusage" ), i18n( "Battery Usage" ) ); ++ mDict.insert( QLatin1String( "batteryvoltage" ), i18n( "Battery Voltage" ) ); ++ mDict.insert( QLatin1String( "batteryrate" ), i18n( "Battery Discharge Rate" ) ); + mDict.insert( QLatin1String( "remainingtime" ), i18n( "Remaining Time" ) ); + mDict.insert( QLatin1String( "interrupts" ), i18n( "Interrupts" ) ); + mDict.insert( QLatin1String( "loadavg1" ), i18n( "Load Average (1 min)" ) ); + mDict.insert( QLatin1String( "loadavg5" ), i18n( "Load Average (5 min)" ) ); + mDict.insert( QLatin1String( "loadavg15" ), i18n( "Load Average (15 min)" ) ); + mDict.insert( QLatin1String( "clock" ), i18n( "Clock Frequency" ) ); ++ mDict.insert( QLatin1String( "AverageClock" ), i18n( "Average Clock Frequency" ) ); + mDict.insert( QLatin1String( "lmsensors" ), i18n( "Hardware Sensors" ) ); + mDict.insert( QLatin1String( "partitions" ), i18n( "Partition Usage" ) ); + mDict.insert( QLatin1String( "usedspace" ), i18n( "Used Space" ) ); + mDict.insert( QLatin1String( "freespace" ), i18n( "Free Space" ) ); + mDict.insert( QLatin1String( "filllevel" ), i18n( "Fill Level" ) ); ++ mDict.insert( QLatin1String( "usedinode" ), i18n( "Used Inodes" ) ); ++ mDict.insert( QLatin1String( "freeinode" ), i18n( "Free Inodes" ) ); ++ mDict.insert( QLatin1String( "inodelevel" ), i18n( "Inode Level" ) ); + mDict.insert( QLatin1String( "system" ), i18n( "System" ) ); + mDict.insert( QLatin1String( "uptime" ), i18n( "Uptime" ) ); + mDict.insert( QLatin1String( "SoftRaid" ), i18n( "Linux Soft Raid (md)" ) ); +@@ -167,16 +179,21 @@ + } + + for ( int i = 1; i < 6; i++) { ++ mDict.insert( QLatin1String( "batt" ) + QString::number( i ), i18n( "Battery %1", i ) ); + mDict.insert( QLatin1String( "fan" ) + QString::number( i ), i18n( "Fan %1", i ) ); + mDict.insert( QLatin1String( "temp" ) + QString::number( i ), i18n( "Temperature %1", i ) ); + } + + mDict.insert( QLatin1String( "int00" ), i18n( "Total" ) ); ++ mDict.insert( QLatin1String( "softint" ), i18n( "Software Interrupts" ) ); ++ mDict.insert( QLatin1String( "hardint" ), i18n( "Hardware Interrupts" ) ); + + QString num; + for ( int i = 1; i < 25; i++ ) { + num.sprintf( "%.2d", i ); + mDict.insert( QLatin1String( "int" ) + num, ki18n( "Int %1" ).subs( i - 1, 3 ).toString() ); ++ num.sprintf( "%.3d", i + 255); ++ mDict.insert( QLatin1String( "int" ) + num, ki18n( "Int %1" ).subs( i + 255, 4 ).toString() ); + } + + // TODO: translated descriptions not yet implemented. +@@ -186,6 +203,11 @@ + mUnits.insert( QLatin1String( "min" ), i18nc( "the unit minutes", "min" ) ); + mUnits.insert( QLatin1String( "MHz" ), i18nc( "the frequency unit", "MHz" ) ); + mUnits.insert( QLatin1String( "%" ), i18nc( "a percentage", "%" ) ); ++ mUnits.insert( QLatin1String( "mA" ), i18nc( "the unit milliamperes", "mA" ) ); ++ mUnits.insert( QLatin1String( "mAh" ), i18nc( "the unit milliampere hours", "mAh" ) ); ++ mUnits.insert( QLatin1String( "mW" ), i18nc( "the unit milliwatts", "mW" ) ); ++ mUnits.insert( QLatin1String( "mWh" ), i18nc( "the unit milliwatt hours", "mWh" ) ); ++ mUnits.insert( QLatin1String( "mV" ), i18nc( "the unit millivolts", "mV" ) ); + + mTypes.clear(); + mTypes.insert( QLatin1String( "integer" ), i18n( "Integer Value" ) ); diff --git a/x11/kde4-workspace/files/patch-kwin__CMakeLists.txt b/x11/kde4-workspace/files/patch-kwin__CMakeLists.txt new file mode 100644 index 000000000000..6bf9d34088c0 --- /dev/null +++ b/x11/kde4-workspace/files/patch-kwin__CMakeLists.txt @@ -0,0 +1,11 @@ +--- ./kwin/CMakeLists.txt.orig 2010-12-02 10:14:06.151501238 +1000 ++++ ./kwin/CMakeLists.txt 2010-12-02 10:14:30.909493105 +1000 +@@ -189,7 +189,7 @@ + kde4_add_library(kwinnvidiahack SHARED ${kwinnvidiahack_LIB_SRCS}) + + set_target_properties(kwinnvidiahack PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) +-install(TARGETS kwinnvidiahack ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) ++install(TARGETS kwinnvidiahack ${INSTALL_TARGETS_DEFAULT_ARGS}) + + ########### install files ############### + diff --git a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt b/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt index da0dbd883481..70cbed35b559 100644 --- a/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt +++ b/x11/kde4-workspace/files/patch-plasma__generic__scriptengines__CMakeLists.txt @@ -1,14 +1,14 @@ --- ./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) +-macro_optional_add_subdirectory(ruby) if(QT_QTWEBKIT_FOUND) - add_subdirectory(webkit) + macro_optional_add_subdirectory(webkit) endif(QT_QTWEBKIT_FOUND) - if (PythonSupport_FOUND) + if (PythonSupport_FOUND AND NOT WIN32) - macro_optional_add_subdirectory(python) - endif (PythonSupport_FOUND) + endif (PythonSupport_FOUND AND NOT WIN32) if(GOOGLEGADGETS_FOUND) diff --git a/x11/kde4-workspace/files/patch-startkde.cmake b/x11/kde4-workspace/files/patch-startkde.cmake new file mode 100644 index 000000000000..38cfee602f9f --- /dev/null +++ b/x11/kde4-workspace/files/patch-startkde.cmake @@ -0,0 +1,12 @@ +--- startkde.cmake.orig 2009-10-07 08:37:24.000000000 +1100 ++++ startkde.cmake 2009-12-28 10:02:07.133352180 +1000 +@@ -337,7 +337,8 @@ + fi + # D-Bus autolaunch is broken + if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then +- eval `dbus-launch --sh-syntax --exit-with-session` ++ uuid="`dbus-uuidgen --get`" ++ eval `dbus-launch --sh-syntax --exit-with-session --autolaunch $uuid` + fi + if qdbus >/dev/null 2>/dev/null; then + : # ok 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 diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist index 5d337cb0bed6..2db2b33fdd50 100644 --- a/x11/kde4-workspace/pkg-plist +++ b/x11/kde4-workspace/pkg-plist @@ -15,6 +15,7 @@ bin/kinfocenter bin/klipper bin/kmenuedit bin/krandom.kss +bin/krandrstartup bin/krandrtray bin/krdb bin/krunner @@ -24,7 +25,6 @@ bin/ksplashx bin/ksplashx_scale bin/kstartupconfig4 bin/ksysguard -bin/ksysguardd bin/ksystraycmd bin/kwin bin/oxygen-demo @@ -36,7 +36,6 @@ bin/plasma-windowed bin/plasmaengineexplorer bin/plasmawallpaperviewer bin/plasmoidviewer -bin/polkit-kde-authorization bin/solid-action-desktop-gen bin/startkde bin/startkde4 @@ -45,9 +44,8 @@ etc/dbus-1/system.d/org.kde.fontinst.conf etc/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf etc/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf etc/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf -etc/ksysguarddrc +etc/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf include/KDE/Plasma/Weather/Ion -include/KDE/Plasma/Weather/WeatherUtils include/kcommondecoration.h include/kdecoration.h include/kdecorationbridge.h @@ -85,31 +83,41 @@ include/plasma/geolocation/geolocation_export.h include/plasma/geolocation/geolocationprovider.h include/plasma/weather/ion.h include/plasma/weather/ion_export.h -include/plasma/weather/weatherutils.h include/plasmaclock/calendar.h include/plasmaclock/calendartable.h include/plasmaclock/clockapplet.h include/plasmaclock/plasmaclock_export.h -include/solid/control/bluetoothinputdevice.h -include/solid/control/bluetoothinterface.h -include/solid/control/bluetoothmanager.h -include/solid/control/bluetoothremotedevice.h -include/solid/control/bluetoothsecurity.h -include/solid/control/ifaces/bluetoothinputdevice.h -include/solid/control/ifaces/bluetoothinterface.h -include/solid/control/ifaces/bluetoothmanager.h -include/solid/control/ifaces/bluetoothremotedevice.h +include/solid/control/ifaces/modemcdmainterface.h +include/solid/control/ifaces/modemgsmcardinterface.h +include/solid/control/ifaces/modemgsmcontactsinterface.h +include/solid/control/ifaces/modemgsmhsointerface.h +include/solid/control/ifaces/modemgsmnetworkinterface.h +include/solid/control/ifaces/modemgsmsmsinterface.h +include/solid/control/ifaces/modemgsmussdinterface.h +include/solid/control/ifaces/modeminterface.h +include/solid/control/ifaces/modemlocationinterface.h +include/solid/control/ifaces/modemmanager.h include/solid/control/ifaces/networkcdmainterface.h include/solid/control/ifaces/networkgsminterface.h include/solid/control/ifaces/networkinterface.h include/solid/control/ifaces/networkmanager.h include/solid/control/ifaces/networkserialinterface.h -include/solid/control/ifaces/powermanager.h include/solid/control/ifaces/remotecontrol.h include/solid/control/ifaces/remotecontrolmanager.h include/solid/control/ifaces/wirednetworkinterface.h include/solid/control/ifaces/wirelessaccesspoint.h include/solid/control/ifaces/wirelessnetworkinterface.h +include/solid/control/modemcdmainterface.h +include/solid/control/modemgsmcardinterface.h +include/solid/control/modemgsmcontactsinterface.h +include/solid/control/modemgsmhsointerface.h +include/solid/control/modemgsmnetworkinterface.h +include/solid/control/modemgsmsmsinterface.h +include/solid/control/modemgsmussdinterface.h +include/solid/control/modeminterface.h +include/solid/control/modemlocationinterface.h +include/solid/control/modemmanager.h +include/solid/control/modemmanagerinterface.h include/solid/control/networkcdmainterface.h include/solid/control/networkgsminterface.h include/solid/control/networking.h @@ -117,7 +125,6 @@ include/solid/control/networkinterface.h include/solid/control/networkipv4config.h include/solid/control/networkmanager.h include/solid/control/networkserialinterface.h -include/solid/control/powermanager.h include/solid/control/remotecontrol.h include/solid/control/remotecontrolbutton.h include/solid/control/remotecontrolmanager.h @@ -137,6 +144,7 @@ include/taskmanager/abstractgroupableitem.h include/taskmanager/abstractgroupingstrategy.h include/taskmanager/abstractsortingstrategy.h include/taskmanager/groupmanager.h +include/taskmanager/launcheritem.h include/taskmanager/startup.h include/taskmanager/task.h include/taskmanager/taskactions.h @@ -144,10 +152,10 @@ include/taskmanager/taskgroup.h include/taskmanager/taskitem.h include/taskmanager/taskmanager.h include/taskmanager/taskmanager_export.h -lib/KDE4Workspace/cmake/KDE4WorkspaceConfig.cmake -lib/KDE4Workspace/cmake/KDE4WorkspaceConfigVersion.cmake -lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets-%%KDE4_BUILD_TYPE%%.cmake -lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets.cmake +lib/cmake/KDE4Workspace/KDE4WorkspaceConfig.cmake +lib/cmake/KDE4Workspace/KDE4WorkspaceConfigVersion.cmake +lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets-%%KDE4_BUILD_TYPE%%.cmake +lib/cmake/KDE4Workspace/KDE4WorkspaceLibraryTargets.cmake lib/kconf_update_bin/krdb_clearlibrarypath lib/kconf_update_bin/kwin_update_default_rules lib/kconf_update_bin/kwin_update_tabbox_settings @@ -167,6 +175,7 @@ lib/kde4/kcm_autostart.so lib/kde4/kcm_bell.so lib/kde4/kcm_clock.so lib/kde4/kcm_colors.so +lib/kde4/kcm_cursortheme.so lib/kde4/kcm_desktoppaths.so lib/kde4/kcm_desktoptheme.so lib/kde4/kcm_display.so @@ -194,8 +203,8 @@ lib/kde4/kcm_memory.so lib/kde4/kcm_nic.so lib/kde4/kcm_opengl.so lib/kde4/kcm_pci.so -lib/kde4/kcm_pkk_authorization.so -lib/kde4/kcm_powerdevilconfig.so +lib/kde4/kcm_powerdevilglobalconfig.so +lib/kde4/kcm_powerdevilprofilesconfig.so lib/kde4/kcm_randr.so lib/kde4/kcm_samba.so lib/kde4/kcm_screensaver.so @@ -237,29 +246,19 @@ lib/kde4/krunner_solid.so lib/kde4/krunner_webshortcuts.so lib/kde4/krunner_windowedwidgets.so lib/kde4/krunner_windows.so -lib/kde4/kstyle_keramik_config.so lib/kde4/kstyle_oxygen_config.so lib/kde4/kwin3_aurorae.so lib/kde4/kwin3_b2.so -lib/kde4/kwin3_kde2.so -lib/kde4/kwin3_keramik.so lib/kde4/kwin3_laptop.so -lib/kde4/kwin3_modernsys.so lib/kde4/kwin3_oxygen.so lib/kde4/kwin3_plastik.so -lib/kde4/kwin3_quartz.so -lib/kde4/kwin3_redmond.so lib/kde4/kwin3_tabstrip.so -lib/kde4/kwin3_web.so lib/kde4/kwin4_effect_builtins.so lib/kde4/kwin_b2_config.so -lib/kde4/kwin_kde2_config.so -lib/kde4/kwin_keramik_config.so -lib/kde4/kwin_modernsys_config.so lib/kde4/kwin_oxygen_config.so lib/kde4/kwin_plastik_config.so -lib/kde4/kwin_quartz_config.so lib/kde4/kwin_tabstrip_config.so +lib/kde4/libexec/backlighthelper lib/kde4/libexec/fontinst lib/kde4/libexec/fontinst_helper lib/kde4/libexec/fontinst_x11 @@ -275,7 +274,6 @@ lib/kde4/libexec/ksysguardprocesslist_helper lib/kde4/libexec/kwin_killer_helper lib/kde4/libexec/kwin_opengl_test lib/kde4/libexec/kwin_rules_dialog -lib/kde4/libexec/polkit-kde-manager lib/kde4/libexec/test_kcm_xinerama lib/kde4/plasma-geolocation-gps.so lib/kde4/plasma-geolocation-ip.so @@ -313,7 +311,6 @@ lib/kde4/plasma_appletscriptengine_dashboard.so lib/kde4/plasma_appletscriptengine_webapplet.so lib/kde4/plasma_containment_desktop.so lib/kde4/plasma_containment_netpanel.so -lib/kde4/plasma_containment_newspaper.so lib/kde4/plasma_containment_panel.so lib/kde4/plasma_containment_sal.so lib/kde4/plasma_containment_saverdesktop.so @@ -324,6 +321,7 @@ lib/kde4/plasma_containmentactions_paste.so lib/kde4/plasma_containmentactions_switchactivity.so lib/kde4/plasma_containmentactions_switchdesktop.so lib/kde4/plasma_containmentactions_switchwindow.so +lib/kde4/plasma_engine_activities.so lib/kde4/plasma_engine_akonadi.so lib/kde4/plasma_engine_applicationjobs.so lib/kde4/plasma_engine_apps.so @@ -345,6 +343,7 @@ lib/kde4/plasma_engine_places.so lib/kde4/plasma_engine_powermanagement.so lib/kde4/plasma_engine_rss.so lib/kde4/plasma_engine_searchlaunch.so +lib/kde4/plasma_engine_share.so lib/kde4/plasma_engine_soliddevice.so lib/kde4/plasma_engine_statusnotifieritem.so lib/kde4/plasma_engine_systemmonitor.so @@ -352,7 +351,11 @@ lib/kde4/plasma_engine_tasks.so lib/kde4/plasma_engine_time.so lib/kde4/plasma_engine_weather.so lib/kde4/plasma_packagestructure_dashboard.so +lib/kde4/plasma_packagestructure_share.so lib/kde4/plasma_packagestructure_web.so +lib/kde4/plasma_toolbox_desktoptoolbox.so +lib/kde4/plasma_toolbox_nettoolbox.so +lib/kde4/plasma_toolbox_paneltoolbox.so lib/kde4/plasma_wallpaper_color.so lib/kde4/plasma_wallpaper_image.so lib/kde4/plugins/designer/ksignalplotterwidgets.so @@ -360,8 +363,15 @@ lib/kde4/plugins/designer/ksysguardlsofwidgets.so lib/kde4/plugins/designer/ksysguardwidgets.so lib/kde4/plugins/gui_platform/libkde.so lib/kde4/plugins/styles/oxygen.so +lib/kde4/powerdevilbrightnesscontrolaction_config.so +lib/kde4/powerdevildimdisplayaction_config.so +lib/kde4/powerdevildisabledesktopeffectsaction_config.so +lib/kde4/powerdevildpmsaction.so +lib/kde4/powerdevildpmsaction_config.so +lib/kde4/powerdevilhandlebuttoneventsaction_config.so +lib/kde4/powerdevilrunscriptaction_config.so +lib/kde4/powerdevilsuspendsessionaction_config.so lib/kde4/solid_fakenet.so -lib/kde4/solid_hal_power.so lib/kde4/solid_lirc.so lib/kde4/solid_wicd.so lib/libkdecorations.so @@ -389,6 +399,7 @@ lib/libkfontinst.so.5.0.1 lib/libkfontinstui.so lib/libkfontinstui.so.5 lib/libkfontinstui.so.5.0.1 +lib/libkhotkeysprivate.so lib/libkhotkeysprivate.so.5 lib/libkhotkeysprivate.so.5.0.1 lib/libkickoff.so @@ -428,9 +439,10 @@ lib/libplasmaclock.so.5.0.1 lib/libplasmagenericshell.so lib/libplasmagenericshell.so.5 lib/libplasmagenericshell.so.5.0.1 -lib/libpolkitkdeprivate.so -lib/libpolkitkdeprivate.so.5 -lib/libpolkitkdeprivate.so.5.0.1 +lib/libpowerdevilcore.so +lib/libpowerdevilcore.so.0 +lib/libpowerdevilcore.so.0.1.0 +lib/libpowerdevilui.so lib/libprocesscore.so lib/libprocesscore.so.5 lib/libprocesscore.so.5.0.1 @@ -449,13 +461,9 @@ lib/libtaskmanager.so lib/libtaskmanager.so.5 lib/libtaskmanager.so.5.0.1 lib/libweather_ion.so -lib/libweather_ion.so.5 -lib/libweather_ion.so.5.0.0 +lib/libweather_ion.so.6 +lib/libweather_ion.so.6.0.0 lib/strigi/strigita_font.so -share/PolicyKit/policy/org.kde.fontinst.policy -share/PolicyKit/policy/org.kde.kcontrol.kcmclock.policy -share/PolicyKit/policy/org.kde.kcontrol.kcmkdm.policy -share/PolicyKit/policy/org.kde.ksysguard.processlisthelper.policy share/applications/kde4/kfontview.desktop share/applications/kde4/kinfocenter.desktop share/applications/kde4/klipper.desktop @@ -469,7 +477,6 @@ share/apps/cmake/modules/FindGooglegadgets.cmake share/apps/cmake/modules/FindKephal.cmake share/apps/cmake/modules/FindLibXKlavier.cmake share/apps/cmake/modules/FindPAM.cmake -share/apps/cmake/modules/FindQEdje.cmake share/apps/cmake/modules/FindSensors.cmake share/apps/cmake/modules/PkgConfigGetVar.cmake share/apps/cmake/modules/UnixAuth.cmake @@ -510,7 +517,7 @@ share/apps/kconf_update/convertShortcuts.pl share/apps/kconf_update/kaccel.upd share/apps/kconf_update/kcmdisplayrc.upd share/apps/kconf_update/klipper-kconfigxt.upd -share/apps/kconf_update/krdb.upd +share/apps/kconf_update/krdb_libpathwipe.upd share/apps/kconf_update/ksmserver.upd share/apps/kconf_update/ksmserver_shortcuts.upd share/apps/kconf_update/kwin.upd @@ -606,8 +613,8 @@ share/apps/kdm/sessions/gnome.desktop share/apps/kdm/sessions/golem.desktop share/apps/kdm/sessions/icewm.desktop share/apps/kdm/sessions/ion.desktop -share/apps/kdm/sessions/kde-safe.desktop -share/apps/kdm/sessions/kde.desktop +share/apps/kdm/sessions/kde-plasma-safe.desktop +share/apps/kdm/sessions/kde-plasma.desktop share/apps/kdm/sessions/larswm.desktop share/apps/kdm/sessions/lwm.desktop share/apps/kdm/sessions/matchbox.desktop @@ -653,6 +660,20 @@ share/apps/kdm/themes/ethais/screenshot.png share/apps/kdm/themes/ethais/session_normal.png share/apps/kdm/themes/ethais/system_normal.png share/apps/kdm/themes/ethais/user_icon.png +share/apps/kdm/themes/horos/KdmGreeterTheme.desktop +share/apps/kdm/themes/horos/horos.xml +share/apps/kdm/themes/horos/lineedit_active.png +share/apps/kdm/themes/horos/lineedit_normal.png +share/apps/kdm/themes/horos/lock.png +share/apps/kdm/themes/horos/login_active.png +share/apps/kdm/themes/horos/login_normal.png +share/apps/kdm/themes/horos/pw_icon.png +share/apps/kdm/themes/horos/rectangle.png +share/apps/kdm/themes/horos/rectangle_overlay.png +share/apps/kdm/themes/horos/screenshot.png +share/apps/kdm/themes/horos/session_normal.png +share/apps/kdm/themes/horos/system_normal.png +share/apps/kdm/themes/horos/user_icon.png share/apps/kdm/themes/oxygen-air/KdmGreeterTheme.desktop share/apps/kdm/themes/oxygen-air/caps.png share/apps/kdm/themes/oxygen-air/icon-kde.png @@ -715,6 +736,7 @@ share/apps/ksplash/Themes/Default/1600x1200/icon4_anim.png share/apps/ksplash/Themes/Default/1600x1200/icon5.png share/apps/ksplash/Themes/Default/1600x1200/icon5_anim.png share/apps/ksplash/Themes/Default/1600x1200/rectangle.png +share/apps/ksplash/Themes/Default/1920x1080/background.png share/apps/ksplash/Themes/Default/1920x1200/background.png share/apps/ksplash/Themes/Default/600x400/background.png share/apps/ksplash/Themes/Default/800x600/background.png @@ -783,17 +805,12 @@ share/apps/kwin/explosion.frag share/apps/kwin/explosion.vert share/apps/kwin/invert.frag share/apps/kwin/invert.vert -share/apps/kwin/kde2.desktop -share/apps/kwin/keramik.desktop share/apps/kwin/kwin.notifyrc share/apps/kwin/laptop.desktop share/apps/kwin/lookingglass.frag share/apps/kwin/lookingglass.vert -share/apps/kwin/modernsystem.desktop share/apps/kwin/oxygenclient.desktop share/apps/kwin/plastik.desktop -share/apps/kwin/quartz.desktop -share/apps/kwin/redmond.desktop share/apps/kwin/shadow-texture.png share/apps/kwin/sharpen.frag share/apps/kwin/sharpen.vert @@ -803,7 +820,6 @@ share/apps/kwin/snowflake.png share/apps/kwin/sphere.vert share/apps/kwin/tabstrip.desktop share/apps/kwin/trackmouse.png -share/apps/kwin/web.desktop share/apps/kwrited/kwrited.notifyrc share/apps/plasma-desktop/init/00-defaultLayout.js share/apps/plasma-desktop/plasma-desktop.notifyrc @@ -820,21 +836,43 @@ share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents/lay share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/metadata.desktop share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents/layout.js share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/metadata.desktop +share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/contents/layout.js +share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/metadata.desktop +share/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity/contents/layout.js +share/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity/metadata.desktop share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents/layout.js share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/metadata.desktop share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents/layout.js share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/metadata.desktop share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents/layout.js share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/metadata.desktop +share/apps/plasma/services/activities.operations share/apps/plasma/services/applicationjobs.operations share/apps/plasma/services/apps.operations share/apps/plasma/services/modifierkeystate.operations share/apps/plasma/services/notifications.operations share/apps/plasma/services/nowplaying.operations +share/apps/plasma/services/org.kde.places.operations share/apps/plasma/services/searchlaunch.operations +share/apps/plasma/services/share.operations share/apps/plasma/services/statusnotifieritem.operations share/apps/plasma/services/tasks.operations -share/apps/powerdevil/default.powerdevilprofiles +share/apps/plasma/shareprovider/imgur/contents/code/main.js +share/apps/plasma/shareprovider/imgur/metadata.desktop +share/apps/plasma/shareprovider/pastebincom/contents/code/main.js +share/apps/plasma/shareprovider/pastebincom/metadata.desktop +share/apps/plasma/shareprovider/pasteopensuseorg/contents/code/main.js +share/apps/plasma/shareprovider/pasteopensuseorg/metadata.desktop +share/apps/plasma/shareprovider/pasteubuntucom/contents/code/main.js +share/apps/plasma/shareprovider/pasteubuntucom/metadata.desktop +share/apps/plasma/shareprovider/privatepastecom/contents/code/main.js +share/apps/plasma/shareprovider/privatepastecom/metadata.desktop +share/apps/plasma/shareprovider/simplestimagehosting/contents/code/main.js +share/apps/plasma/shareprovider/simplestimagehosting/metadata.desktop +share/apps/plasma/shareprovider/wklej/contents/code/main.js +share/apps/plasma/shareprovider/wklej/metadata.desktop +share/apps/plasma/shareprovider/wstaw/contents/code/main.js +share/apps/plasma/shareprovider/wstaw/metadata.desktop share/apps/powerdevil/powerdevil.notifyrc share/apps/solid/actions/test-predicate-openinwindow.desktop share/apps/solid/devices/solid-device-AcAdapter.desktop @@ -869,6 +907,7 @@ share/config.kcfg/klaunch.kcfg share/config.kcfg/kscreensaversettings.kcfg share/config.kcfg/kwin.kcfg share/config.kcfg/plasma-shell-desktop.kcfg +share/config/activities.knsrc share/config/aurorae.knsrc share/config/background.knsrc share/config/colorschemes.knsrc @@ -881,33 +920,16 @@ share/config/wallpaper.knsrc share/dbus-1/interfaces/org.freedesktop.ScreenSaver.xml share/dbus-1/interfaces/org.kde.KSMServerInterface.xml share/dbus-1/interfaces/org.kde.KWin.xml -share/dbus-1/interfaces/org.kde.PowerDevil.xml share/dbus-1/interfaces/org.kde.khotkeys.xml share/dbus-1/interfaces/org.kde.krunner.App.xml share/dbus-1/interfaces/org.kde.screensaver.xml -share/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service -share/dbus-1/services/org.kde.PolicyKit.service share/dbus-1/services/org.kde.fontinst.service share/dbus-1/services/org.kde.krunner.service share/dbus-1/system-services/org.kde.fontinst.service share/dbus-1/system-services/org.kde.kcontrol.kcmclock.service share/dbus-1/system-services/org.kde.kcontrol.kcmkdm.service share/dbus-1/system-services/org.kde.ksysguard.processlisthelper.service -share/doc/HTML/en/PolicyKit-kde/authdialog_1.png -share/doc/HTML/en/PolicyKit-kde/authdialog_2.png -share/doc/HTML/en/PolicyKit-kde/authdialog_3.png -share/doc/HTML/en/PolicyKit-kde/authdialog_4.png -share/doc/HTML/en/PolicyKit-kde/authdialog_5.png -share/doc/HTML/en/PolicyKit-kde/authdialog_6.png -share/doc/HTML/en/PolicyKit-kde/authorization.docbook -share/doc/HTML/en/PolicyKit-kde/authorization_1.png -share/doc/HTML/en/PolicyKit-kde/authorization_2.png -share/doc/HTML/en/PolicyKit-kde/authorizationagent.docbook -share/doc/HTML/en/PolicyKit-kde/common -share/doc/HTML/en/PolicyKit-kde/howitworks.docbook -share/doc/HTML/en/PolicyKit-kde/index.cache.bz2 -share/doc/HTML/en/PolicyKit-kde/index.docbook -share/doc/HTML/en/PolicyKit-kde/introduction.docbook +share/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service share/doc/HTML/en/kcontrol/autostart/common share/doc/HTML/en/kcontrol/autostart/index.cache.bz2 share/doc/HTML/en/kcontrol/autostart/index.docbook @@ -920,6 +942,9 @@ share/doc/HTML/en/kcontrol/clock/index.docbook share/doc/HTML/en/kcontrol/colors/common share/doc/HTML/en/kcontrol/colors/index.cache.bz2 share/doc/HTML/en/kcontrol/colors/index.docbook +share/doc/HTML/en/kcontrol/cursortheme/common +share/doc/HTML/en/kcontrol/cursortheme/index.cache.bz2 +share/doc/HTML/en/kcontrol/cursortheme/index.docbook share/doc/HTML/en/kcontrol/desktop/common share/doc/HTML/en/kcontrol/desktop/index.cache.bz2 share/doc/HTML/en/kcontrol/desktop/index.docbook @@ -1849,6 +1874,7 @@ share/kde4/services/autostart.desktop share/kde4/services/bell.desktop share/kde4/services/clock.desktop share/kde4/services/colors.desktop +share/kde4/services/cursortheme.desktop share/kde4/services/desktop.desktop share/kde4/services/desktoppath.desktop share/kde4/services/desktoptheme.desktop @@ -1872,7 +1898,6 @@ share/kde4/services/kcm_infosummary.desktop share/kde4/services/kcm_keyboard.desktop share/kde4/services/kcm_memory.desktop share/kde4/services/kcm_pci.desktop -share/kde4/services/kcm_pkk_authorization.desktop share/kde4/services/kcm_solid.desktop share/kde4/services/kcmaccess.desktop share/kde4/services/kcmlaunch.desktop @@ -1901,6 +1926,8 @@ share/kde4/services/kwin/cube.desktop share/kde4/services/kwin/cube_config.desktop share/kde4/services/kwin/cubeslide.desktop share/kde4/services/kwin/cubeslide_config.desktop +share/kde4/services/kwin/dashboard.desktop +share/kde4/services/kwin/dashboard_config.desktop share/kde4/services/kwin/desktopgrid.desktop share/kde4/services/kwin/desktopgrid_config.desktop share/kde4/services/kwin/dialogparent.desktop @@ -1932,7 +1959,9 @@ share/kde4/services/kwin/mousemark_config.desktop share/kde4/services/kwin/presentwindows.desktop share/kde4/services/kwin/presentwindows_config.desktop share/kde4/services/kwin/resize.desktop +share/kde4/services/kwin/resize_config.desktop share/kde4/services/kwin/scalein.desktop +share/kde4/services/kwin/screenshot.desktop share/kde4/services/kwin/shadow.desktop share/kde4/services/kwin/shadow_config.desktop share/kde4/services/kwin/sharpen.desktop @@ -1947,6 +1976,7 @@ share/kde4/services/kwin/slidingpopups.desktop share/kde4/services/kwin/snaphelper.desktop share/kde4/services/kwin/snow.desktop share/kde4/services/kwin/snow_config.desktop +share/kde4/services/kwin/startupfeedback.desktop share/kde4/services/kwin/taskbarthumbnail.desktop share/kde4/services/kwin/thumbnailaside.desktop share/kde4/services/kwin/thumbnailaside_config.desktop @@ -1954,6 +1984,8 @@ share/kde4/services/kwin/trackmouse.desktop share/kde4/services/kwin/trackmouse_config.desktop share/kde4/services/kwin/translucency.desktop share/kde4/services/kwin/translucency_config.desktop +share/kde4/services/kwin/windowgeometry.desktop +share/kde4/services/kwin/windowgeometry_config.desktop share/kde4/services/kwin/wobblywindows.desktop share/kde4/services/kwin/wobblywindows_config.desktop share/kde4/services/kwin/zoom.desktop @@ -2003,7 +2035,6 @@ share/kde4/services/plasma-battery-default.desktop share/kde4/services/plasma-containment-desktop.desktop share/kde4/services/plasma-containment-desktopdashboard.desktop share/kde4/services/plasma-containment-netpanel.desktop -share/kde4/services/plasma-containment-newspaper.desktop share/kde4/services/plasma-containment-panel.desktop share/kde4/services/plasma-containment-sal.desktop share/kde4/services/plasma-containment-saverdesktop.desktop @@ -2032,21 +2063,34 @@ share/kde4/services/plasma-dataengine-nowplaying.desktop share/kde4/services/plasma-dataengine-places.desktop share/kde4/services/plasma-dataengine-powermanagement.desktop share/kde4/services/plasma-dataengine-rss.desktop +share/kde4/services/plasma-dataengine-share-addon-imgur.desktop +share/kde4/services/plasma-dataengine-share-addon-pastebincom.desktop +share/kde4/services/plasma-dataengine-share-addon-pasteopensuseorg.desktop +share/kde4/services/plasma-dataengine-share-addon-pasteubuntucom.desktop +share/kde4/services/plasma-dataengine-share-addon-privatepastecom.desktop +share/kde4/services/plasma-dataengine-share-addon-simplestimagehosting.desktop +share/kde4/services/plasma-dataengine-share-addon-wklej.desktop +share/kde4/services/plasma-dataengine-share-addon-wstaw.desktop +share/kde4/services/plasma-dataengine-share.desktop share/kde4/services/plasma-dataengine-soliddevice.desktop share/kde4/services/plasma-dataengine-systemmonitor.desktop share/kde4/services/plasma-dataengine-tasks.desktop share/kde4/services/plasma-dataengine-time.desktop share/kde4/services/plasma-dataengine-weather.desktop +share/kde4/services/plasma-engine-activities.desktop share/kde4/services/plasma-engine-akonadi.desktop share/kde4/services/plasma-engine-metadata.desktop share/kde4/services/plasma-engine-searchlaunch.desktop share/kde4/services/plasma-geolocation-gps.desktop share/kde4/services/plasma-geolocation-ip.desktop share/kde4/services/plasma-layout-org.kde.plasma-desktop.defaultPanel.desktop +share/kde4/services/plasma-layout-org.kde.plasma-desktop.findWidgets.desktop +share/kde4/services/plasma-layout-org.kde.plasma-desktop.photoActivity.desktop share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultPage.desktop share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultPanel.desktop share/kde4/services/plasma-layout-org.kde.plasma-netbook.defaultSal.desktop share/kde4/services/plasma-packagestructure-dashboard.desktop +share/kde4/services/plasma-packagestructure-share.desktop share/kde4/services/plasma-packagestructure-web.desktop share/kde4/services/plasma-pager-default.desktop share/kde4/services/plasma-runner-bookmarks.desktop @@ -2079,11 +2123,22 @@ share/kde4/services/plasma-sal-utility.desktop share/kde4/services/plasma-scriptengine-applet-dashboard.desktop share/kde4/services/plasma-scriptengine-applet-web.desktop share/kde4/services/plasma-tasks-default.desktop +share/kde4/services/plasma-toolbox-desktoptoolbox.desktop +share/kde4/services/plasma-toolbox-nettoolbox.desktop +share/kde4/services/plasma-toolbox-paneltoolbox.desktop share/kde4/services/plasma-wallpaper-color.desktop share/kde4/services/plasma-wallpaper-image.desktop share/kde4/services/plasma_applet_keyboard.desktop share/kde4/services/plasma_engine_statusnotifieritem.desktop -share/kde4/services/powerdevilconfig.desktop +share/kde4/services/powerdevilbrightnesscontrolaction.desktop +share/kde4/services/powerdevildimdisplayaction.desktop +share/kde4/services/powerdevildisabledesktopeffectsaction.desktop +share/kde4/services/powerdevildpmsaction.desktop +share/kde4/services/powerdevilglobalconfig.desktop +share/kde4/services/powerdevilhandlebuttoneventsaction.desktop +share/kde4/services/powerdevilprofilesconfig.desktop +share/kde4/services/powerdevilrunscriptaction.desktop +share/kde4/services/powerdevilsuspendsessionaction.desktop share/kde4/services/randr.desktop share/kde4/services/recentdocuments.desktop share/kde4/services/screensaver.desktop @@ -2107,6 +2162,7 @@ share/kde4/services/settings-network-and-connectivity.desktop share/kde4/services/settings-network-settings.desktop share/kde4/services/settings-permissions.desktop share/kde4/services/settings-personal-information.desktop +share/kde4/services/settings-power-management.desktop share/kde4/services/settings-removable-devices.desktop share/kde4/services/settings-sharing.desktop share/kde4/services/settings-shortcuts-and-gestures.desktop @@ -2114,10 +2170,10 @@ share/kde4/services/settings-startup-and-shutdown.desktop share/kde4/services/settings-system-administration.desktop share/kde4/services/settings-window-behaviour.desktop share/kde4/services/settings-workspace-appearance-and-behavior.desktop +share/kde4/services/settings-workspace-behavior.desktop share/kde4/services/smbstatus.desktop share/kde4/services/solid-actions.desktop share/kde4/services/solidbackends/solid_fakenet.desktop -share/kde4/services/solidbackends/solid_hal_power.desktop share/kde4/services/solidbackends/solid_lirc.desktop share/kde4/services/solidbackends/solid_wicd.desktop share/kde4/services/standard_actions.desktop @@ -2130,15 +2186,21 @@ share/kde4/servicetypes/kwineffect.desktop share/kde4/servicetypes/plasma-geolocationprovider.desktop share/kde4/servicetypes/plasma-layout-template.desktop share/kde4/servicetypes/plasma-sal-menu.desktop +share/kde4/servicetypes/plasma_shareprovider.desktop +share/kde4/servicetypes/powerdevilaction.desktop share/kde4/servicetypes/screensaver.desktop share/kde4/servicetypes/solid-device-type.desktop -share/kde4/servicetypes/solidbluetoothmanager.desktop +share/kde4/servicetypes/solidmodemmanager.desktop share/kde4/servicetypes/solidnetworkmanager.desktop -share/kde4/servicetypes/solidpowermanager.desktop share/kde4/servicetypes/solidremotecontrolmanager.desktop share/kde4/servicetypes/systemsettingscategory.desktop share/kde4/servicetypes/systemsettingsexternalapp.desktop share/kde4/servicetypes/systemsettingsview.desktop +share/polkit-1/actions/org.kde.fontinst.policy +share/polkit-1/actions/org.kde.kcontrol.kcmclock.policy +share/polkit-1/actions/org.kde.kcontrol.kcmkdm.policy +share/polkit-1/actions/org.kde.ksysguard.processlisthelper.policy +share/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy share/sounds/pop.wav share/wallpapers/Aghi/contents/images/1024x768.jpg share/wallpapers/Aghi/contents/images/1280x1024.jpg @@ -2168,15 +2230,6 @@ share/wallpapers/Blue_Wood/contents/images/1920x1080.jpg share/wallpapers/Blue_Wood/contents/images/1920x1200.jpg share/wallpapers/Blue_Wood/contents/screenshot.png share/wallpapers/Blue_Wood/metadata.desktop -share/wallpapers/Ethais/contents/images/1280x1024.png -share/wallpapers/Ethais/contents/images/1280x800.png -share/wallpapers/Ethais/contents/images/1366x768.png -share/wallpapers/Ethais/contents/images/1440x900.png -share/wallpapers/Ethais/contents/images/1600x1200.png -share/wallpapers/Ethais/contents/images/1920x1080.png -share/wallpapers/Ethais/contents/images/1920x1200.png -share/wallpapers/Ethais/contents/screenshot.png -share/wallpapers/Ethais/metadata.desktop share/wallpapers/Evening/contents/images/1280x1024.jpg share/wallpapers/Evening/contents/images/1600x1200.jpg share/wallpapers/Evening/contents/images/1920x1080.jpg @@ -2210,6 +2263,12 @@ share/wallpapers/Hanami/contents/images/1920x1080.jpg share/wallpapers/Hanami/contents/images/1920x1200.jpg share/wallpapers/Hanami/contents/screenshot.png share/wallpapers/Hanami/metadata.desktop +share/wallpapers/Horos/contents/images/1280x1024.png +share/wallpapers/Horos/contents/images/1600x1200.png +share/wallpapers/Horos/contents/images/1920x1080.png +share/wallpapers/Horos/contents/images/1920x1200.png +share/wallpapers/Horos/contents/screenshot.png +share/wallpapers/Horos/metadata.desktop share/wallpapers/Media_Life/contents/images/1280x1024.jpg share/wallpapers/Media_Life/contents/images/1280x800.jpg share/wallpapers/Media_Life/contents/images/1440x900.jpg @@ -2279,6 +2338,9 @@ share/wallpapers/stripes.png.desktop @dirrmtry share/wallpapers/Media_Life/contents/images @dirrmtry share/wallpapers/Media_Life/contents @dirrmtry share/wallpapers/Media_Life +@dirrmtry share/wallpapers/Horos/contents/images +@dirrmtry share/wallpapers/Horos/contents +@dirrmtry share/wallpapers/Horos @dirrmtry share/wallpapers/Hanami/contents/images @dirrmtry share/wallpapers/Hanami/contents @dirrmtry share/wallpapers/Hanami @@ -2297,9 +2359,6 @@ share/wallpapers/stripes.png.desktop @dirrm share/wallpapers/Evening/contents/images @dirrm share/wallpapers/Evening/contents @dirrm share/wallpapers/Evening -@dirrm share/wallpapers/Ethais/contents/images -@dirrm share/wallpapers/Ethais/contents -@dirrm share/wallpapers/Ethais @dirrmtry share/wallpapers/Blue_Wood/contents/images @dirrmtry share/wallpapers/Blue_Wood/contents @dirrmtry share/wallpapers/Blue_Wood @@ -2366,22 +2425,51 @@ share/wallpapers/stripes.png.desktop @dirrm share/doc/HTML/en/kcontrol/fontinst @dirrm share/doc/HTML/en/kcontrol/desktopthemedetails @dirrm share/doc/HTML/en/kcontrol/desktop +@dirrm share/doc/HTML/en/kcontrol/cursortheme @dirrm share/doc/HTML/en/kcontrol/colors @dirrm share/doc/HTML/en/kcontrol/clock @dirrm share/doc/HTML/en/kcontrol/bell @dirrm share/doc/HTML/en/kcontrol/autostart -@dirrm share/doc/HTML/en/PolicyKit-kde @dirrm share/apps/systemsettings/classic @dirrm share/apps/systemsettings @dirrm share/apps/solidfakenetbackend @dirrm share/apps/solid/devices @dirrm share/apps/powerdevil +@dirrm share/apps/plasma/shareprovider/wstaw/contents/code +@dirrm share/apps/plasma/shareprovider/wstaw/contents +@dirrm share/apps/plasma/shareprovider/wstaw +@dirrm share/apps/plasma/shareprovider/wklej/contents/code +@dirrm share/apps/plasma/shareprovider/wklej/contents +@dirrm share/apps/plasma/shareprovider/wklej +@dirrm share/apps/plasma/shareprovider/simplestimagehosting/contents/code +@dirrm share/apps/plasma/shareprovider/simplestimagehosting/contents +@dirrm share/apps/plasma/shareprovider/simplestimagehosting +@dirrm share/apps/plasma/shareprovider/privatepastecom/contents/code +@dirrm share/apps/plasma/shareprovider/privatepastecom/contents +@dirrm share/apps/plasma/shareprovider/privatepastecom +@dirrm share/apps/plasma/shareprovider/pasteubuntucom/contents/code +@dirrm share/apps/plasma/shareprovider/pasteubuntucom/contents +@dirrm share/apps/plasma/shareprovider/pasteubuntucom +@dirrm share/apps/plasma/shareprovider/pasteopensuseorg/contents/code +@dirrm share/apps/plasma/shareprovider/pasteopensuseorg/contents +@dirrm share/apps/plasma/shareprovider/pasteopensuseorg +@dirrm share/apps/plasma/shareprovider/pastebincom/contents/code +@dirrm share/apps/plasma/shareprovider/pastebincom/contents +@dirrm share/apps/plasma/shareprovider/pastebincom +@dirrm share/apps/plasma/shareprovider/imgur/contents/code +@dirrm share/apps/plasma/shareprovider/imgur/contents +@dirrm share/apps/plasma/shareprovider/imgur +@dirrmtry share/apps/plasma/shareprovider @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal/contents @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultSal @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel/contents @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPanel @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage/contents @dirrm share/apps/plasma/layout-templates/org.kde.plasma-netbook.defaultPage +@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity/contents +@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.photoActivity +@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets/contents +@dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.findWidgets @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel/contents @dirrm share/apps/plasma/layout-templates/org.kde.plasma-desktop.defaultPanel @dirrm share/apps/plasma/layout-templates/org.kde.freebsd.defaultWallpaper/contents @@ -2420,6 +2508,7 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/ksplash/Themes/Default/800x600 @dirrm share/apps/ksplash/Themes/Default/600x400 @dirrm share/apps/ksplash/Themes/Default/1920x1200 +@dirrm share/apps/ksplash/Themes/Default/1920x1080 @dirrm share/apps/ksplash/Themes/Default/1600x1200 @dirrm share/apps/ksplash/Themes/Default/1280x1024 @dirrm share/apps/ksplash/Themes/Default/1024x768 @@ -2448,6 +2537,7 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/kfontinst @dirrm share/apps/kdm/themes/oxygen-air @dirrm share/apps/kdm/themes/oxygen +@dirrm share/apps/kdm/themes/horos @dirrm share/apps/kdm/themes/ethais @dirrm share/apps/kdm/themes/circles @dirrmtry share/apps/kdm/themes @@ -2470,8 +2560,7 @@ share/wallpapers/stripes.png.desktop @dirrm share/apps/desktoptheme/air-netbook/widgets @dirrm share/apps/desktoptheme/air-netbook @dirrm lib/kde4/plugins/gui_platform -@dirrm lib/KDE4Workspace/cmake -@dirrm lib/KDE4Workspace +@dirrm lib/cmake/KDE4Workspace @dirrm include/taskmanager @dirrm include/systemsettingsview @dirrm include/solid/control/ifaces |