diff options
| -rw-r--r-- | x11/kdebase3/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-ah | 28 |
2 files changed, 17 insertions, 15 deletions
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index b6b2c58f709..d8fc2047533 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.104 2008/01/28 19:33:01 markd Exp $ +$NetBSD: distinfo,v 1.105 2008/01/31 08:40:51 markd Exp $ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 @@ -18,7 +18,7 @@ SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855 SHA1 (patch-af) = bf23bacbca7e5e5e85c64ee89acfadddce473eb4 SHA1 (patch-ag) = c2d1318f7f0d539b976fa1c1e2b234ef45056cb3 -SHA1 (patch-ah) = de7d3ff96f3b0a0e021a5fb69b7424a370e81d16 +SHA1 (patch-ah) = 828fd2c11b466b9fe3b09346dc713a969a5f280f SHA1 (patch-ai) = 21b59f0a4723160ca8d1ef77ccacbfc09d5fd8ef SHA1 (patch-aj) = bedd17a5a04bff32e4441ed1750ae8ab5a4fa323 SHA1 (patch-ak) = df7ff2bf5ed6bb2442d49df1c277712712a7f966 diff --git a/x11/kdebase3/patches/patch-ah b/x11/kdebase3/patches/patch-ah index 3ae6c7e1ed9..e26e821744b 100644 --- a/x11/kdebase3/patches/patch-ah +++ b/x11/kdebase3/patches/patch-ah @@ -1,17 +1,19 @@ -$NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ +$NetBSD: patch-ah,v 1.12 2008/01/31 08:40:51 markd Exp $ ---- kicker/applets/naughty/NaughtyProcessMonitor.cpp.orig 2007-12-30 16:38:02.000000000 +1300 +--- kicker/applets/naughty/NaughtyProcessMonitor.cpp.orig 2005-10-11 04:03:59.000000000 +1300 +++ kicker/applets/naughty/NaughtyProcessMonitor.cpp -@@ -20,7 +20,7 @@ +@@ -20,8 +20,9 @@ /* OpenBSD support by Jean-Yves Burlett <jean-yves@burlett.org> */ -#ifdef __OpenBSD__ +#if defined(__OpenBSD__) || defined(__NetBSD__) #include <sys/param.h> ++#include <sys/time.h> #include <sys/proc.h> #include <sys/sysctl.h> -@@ -29,6 +29,11 @@ + #include <sys/ucred.h> +@@ -29,6 +30,11 @@ #include <stdlib.h> #endif @@ -23,7 +25,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ #include <sys/types.h> #include <signal.h> #include <unistd.h> -@@ -67,10 +72,13 @@ class NaughtyProcessMonitorPrivate +@@ -67,10 +73,13 @@ class NaughtyProcessMonitorPrivate QTimer * timer_; QMap<ulong, uint> loadMap_; QMap<ulong, uint> scoreMap_; @@ -38,7 +40,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ uint oldLoad_; uint triggerLevel_; -@@ -95,11 +103,17 @@ NaughtyProcessMonitor::NaughtyProcessMon +@@ -95,11 +104,17 @@ NaughtyProcessMonitor::NaughtyProcessMon d->interval_ = interval * 1000; d->triggerLevel_ = triggerLevel; d->timer_ = new QTimer(this); @@ -56,7 +58,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ delete d; } -@@ -219,7 +233,7 @@ NaughtyProcessMonitor::canKill(ulong pid +@@ -219,7 +234,7 @@ NaughtyProcessMonitor::canKill(ulong pid // uint d(l[4].toUInt()); return geteuid() == a; @@ -65,7 +67,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ // simply check if entry exists in the uid map and use it if (!d->uidMap_.contains(pid)) return false ; -@@ -234,7 +248,7 @@ NaughtyProcessMonitor::canKill(ulong pid +@@ -234,7 +249,7 @@ NaughtyProcessMonitor::canKill(ulong pid QString NaughtyProcessMonitor::processName(ulong pid) const { @@ -74,7 +76,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ #ifdef __linux__ QFile f("/proc/" + QString::number(pid) + "/cmdline"); -@@ -283,6 +297,29 @@ NaughtyProcessMonitor::processName(ulong +@@ -283,6 +298,29 @@ NaughtyProcessMonitor::processName(ulong QString unicode(QString::fromLocal8Bit(argv[0])); free (argv) ; @@ -104,7 +106,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ #endif QStringList parts(QStringList::split(' ', unicode)); -@@ -350,6 +387,28 @@ NaughtyProcessMonitor::cpuLoad() const +@@ -350,6 +388,28 @@ NaughtyProcessMonitor::cpuLoad() const d->oldLoad_ = load ; return (forgetThisOne ? 0 : diff); @@ -133,7 +135,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ #else return 0; #endif -@@ -420,6 +479,30 @@ NaughtyProcessMonitor::pidList() const +@@ -420,6 +480,30 @@ NaughtyProcessMonitor::pidList() const free (kp) ; return l ; @@ -164,7 +166,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ #else QValueList<ulong> l; return l; -@@ -447,7 +530,7 @@ NaughtyProcessMonitor::getLoad(ulong pid +@@ -447,7 +531,7 @@ NaughtyProcessMonitor::getLoad(ulong pid load = userTime + sysTime; return true; @@ -173,7 +175,7 @@ $NetBSD: patch-ah,v 1.11 2008/01/04 21:05:57 markd Exp $ // use cache if (!d->cacheLoadMap_.contains(pid)) return false ; -@@ -464,7 +547,7 @@ NaughtyProcessMonitor::getLoad(ulong pid +@@ -464,7 +548,7 @@ NaughtyProcessMonitor::getLoad(ulong pid bool NaughtyProcessMonitor::kill(ulong pid) const { |