diff options
| author | markd <markd> | 2007-12-27 08:01:20 +0000 |
|---|---|---|
| committer | markd <markd> | 2007-12-27 08:01:20 +0000 |
| commit | da4d267260d1241b890d3f6a4bb504f715df0283 (patch) | |
| tree | 8710196b2e05a8c5d5bd3eb816a36d3fd7725a32 /x11/kdebase3/patches | |
| parent | 649b8ed23b840d5609b2580db782754299d892f4 (diff) | |
| download | pkgsrc-da4d267260d1241b890d3f6a4bb504f715df0283.tar.gz | |
Quick fix for PR pkg/37605. ps->userTime is never used so just set to 0,
a proper fix will be committed after the freeze.
Also fix PR pkg/37423 - LP64 issue with nspluginviewer from Steve Woodford.
Bump PKGREVISION.
Diffstat (limited to 'x11/kdebase3/patches')
| -rw-r--r-- | x11/kdebase3/patches/patch-er | 13 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-ge | 13 |
2 files changed, 22 insertions, 4 deletions
diff --git a/x11/kdebase3/patches/patch-er b/x11/kdebase3/patches/patch-er index c572908986d..ef8d344872c 100644 --- a/x11/kdebase3/patches/patch-er +++ b/x11/kdebase3/patches/patch-er @@ -1,7 +1,7 @@ -$NetBSD: patch-er,v 1.6 2006/05/16 13:21:06 tron Exp $ +$NetBSD: patch-er,v 1.7 2007/12/27 08:01:20 markd Exp $ ---- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig 2005-10-10 16:04:31.000000000 +0100 -+++ ksysguard/ksysguardd/NetBSD/ProcessList.c 2006-05-16 14:17:57.000000000 +0100 +--- ksysguard/ksysguardd/NetBSD/ProcessList.c.orig 2005-10-11 04:04:31.000000000 +1300 ++++ ksysguard/ksysguardd/NetBSD/ProcessList.c @@ -24,6 +24,7 @@ #include <ctype.h> @@ -10,7 +10,7 @@ $NetBSD: patch-er,v 1.6 2006/05/16 13:21:06 tron Exp $ #include <pwd.h> #include <stdio.h> #include <stdlib.h> -@@ -191,7 +192,9 @@ +@@ -191,11 +192,13 @@ updateProcess(int pid) ps->ppid = p.kp_eproc.e_ppid; ps->uid = p.kp_eproc.e_ucred.cr_uid; ps->gid = p.kp_eproc.e_pgid; @@ -20,3 +20,8 @@ $NetBSD: patch-er,v 1.6 2006/05/16 13:21:06 tron Exp $ ps->niceLevel = p.kp_proc.p_nice; /* this isn't usertime -- it's total time (??) */ +- ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100; ++ ps->userTime = 0; + ps->sysTime = 0; + ps->sysLoad = 0; + diff --git a/x11/kdebase3/patches/patch-ge b/x11/kdebase3/patches/patch-ge new file mode 100644 index 00000000000..3574455a151 --- /dev/null +++ b/x11/kdebase3/patches/patch-ge @@ -0,0 +1,13 @@ +$NetBSD: patch-ge,v 1.1 2007/12/27 08:01:21 markd Exp $ + +--- nsplugins/viewer/qxteventloop.cpp.orig 2007-05-14 19:55:42.000000000 +1200 ++++ nsplugins/viewer/qxteventloop.cpp +@@ -72,7 +72,7 @@ public: + + QIntDict<QSocketNotifier> socknotDict; + bool activate_timers; +- int timerid; ++ XtIntervalId timerid; + + // arguments for Xt display initialization + const char* applicationClass; |