summaryrefslogtreecommitdiff
path: root/x11/kde4-workspace/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/kde4-workspace/files')
-rw-r--r--x11/kde4-workspace/files/kdm.in20
-rw-r--r--x11/kde4-workspace/files/patch-CMakeLists.txt11
-rw-r--r--x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp15
-rw-r--r--x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt12
-rw-r--r--x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp11
-rw-r--r--x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd11
-rw-r--r--x11/kde4-workspace/files/patch-ksysguard-gui-ksgrd-SensorManager.cc10
-rw-r--r--x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c77
-rw-r--r--x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.h22
-rw-r--r--x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp10
-rw-r--r--x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt11
-rw-r--r--x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt11
12 files changed, 0 insertions, 221 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/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt
deleted file mode 100644
index 25851f037692..000000000000
--- a/x11/kde4-workspace/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../CMakeLists.txt.orig 2009-01-01 19:26:09.000000000 +0300
-+++ ../CMakeLists.txt 2009-03-07 10:02:36.000000000 +0300
-@@ -220,7 +220,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-kcontrol-keyboard-kcmmisc.cpp b/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
deleted file mode 100644
index 78ebf36725c6..000000000000
--- a/x11/kde4-workspace/files/patch-kcontrol-keyboard-kcmmisc.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../kcontrol/keyboard/kcmmisc.cpp.orig 2008-04-02 08:18:22.000000000 -0400
-+++ ../kcontrol/keyboard/kcmmisc.cpp 2008-07-07 14:02:16.000000000 -0400
-@@ -505,8 +505,10 @@
-
-
- int numlockState = config.readEntry( "NumLock", 2 );
-- if( numlockState != 2 )
-- numlockx_change_numlock_state( numlockState == 0 );
-+ if( numlockState == 2 )
-+ numlockx_change_numlock_state( TRUE );
-+ if( numlockState == 0 )
-+ numlockx_change_numlock_state( FALSE );
- }
-
-
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 d7654a8cbd5c..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
-@@ -108,6 +108,6 @@
- build_confci()
-
- ## 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-ksmserver_fadeeffect.cpp b/x11/kde4-workspace/files/patch-ksmserver_fadeeffect.cpp
deleted file mode 100644
index a6bdc04d66b8..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 b3ac831e0ac3..000000000000
--- a/x11/kde4-workspace/files/patch-ksysguard-gui-SystemLoad.sgrd
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../ksysguard/gui/SystemLoad.sgrd.orig 2009-02-03 20:22:46.000000000 +0100
-+++ ../ksysguard/gui/SystemLoad.sgrd 2009-02-03 20:22:58.000000000 +0100
-@@ -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" vLines="0" vScroll="0" >
-- <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" vLines="0" vScroll="0" >
- <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 a112710f60ff..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-CPU.c b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
deleted file mode 100644
index 978857c88f17..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 df52f95fab38..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-kwin-kcmkwin-kwinrules_ruleswidget.cpp b/x11/kde4-workspace/files/patch-kwin-kcmkwin-kwinrules_ruleswidget.cpp
deleted file mode 100644
index cbcfad414d0e..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-libs-ksysguard-processui_CMakeLists.txt b/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
deleted file mode 100644
index 1de4d0ae85d0..000000000000
--- a/x11/kde4-workspace/files/patch-libs-ksysguard-processui_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../libs/ksysguard/processui/CMakeLists.txt.orig 2008-06-18 16:41:37.000000000 +0400
-+++ ../libs/ksysguard/processui/CMakeLists.txt 2008-06-28 13:56:54.000000000 +0400
-@@ -1,7 +1,7 @@
-
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../ ../processcore/)
-
--check_include_files(sys/ptrace.h HAVE_SYS_PTRACE_H)
-+check_include_files(signal.h HAVE_SYS_PTRACE_H)
- check_include_files(sys/endian.h HAVE_SYS_ENDIAN_H)
- check_include_files(byteswap.h HAVE_BYTESWAP_H)
-
diff --git a/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt b/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
deleted file mode 100644
index 770d2cf432ce..000000000000
--- a/x11/kde4-workspace/files/patch-libs-ksysguard_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../libs/ksysguard/CMakeLists.txt.orig 2008-04-10 13:30:14.000000000 +0400
-+++ ../libs/ksysguard/CMakeLists.txt 2008-06-28 14:04:29.000000000 +0400
-@@ -5,7 +5,7 @@
- add_subdirectory( processui )
- add_subdirectory( tests )
-
--check_include_files(sys/ptrace.h HAVE_SYS_PTRACE_H)
-+check_include_files(signal.h HAVE_SYS_PTRACE_H)
-
- configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysguard.h )
-