Update to KDE 3.5.7
KDE base * Various DragonFlyBSD fixes. * Removed "Serbia and Montenegro" (yu), added "Serbia" (rs) and "Montenegro" (me). Kicker * Added option to change the font color used by the taskbar applet. Kate * Fix not honoring current locale in some situations. KControl * Allow changing of font colors for taskbar. * Fix various crashes on KHotKeys. KDesktop * Use mkfontscale/mkfontdir to create fonts.scale/fonts.dir - as opposed to custom code. * Make kdesktop_lock honour kiosk switch user restriction. KWin * Option to turn off alt+tab outline. * Support for new windows types for compositing. * Fix bug in dead program detection in 64 bit architectures. * Fix crash on consecutive 'Show Desktop'.
This commit is contained in:
markd
parent
f9b6d4e54a
commit
9a06691e1d
14 changed files with 32 additions and 308 deletions
|
|
@ -1,7 +1,6 @@
|
|||
# $NetBSD: Makefile,v 1.125 2007/04/14 21:40:18 markd Exp $
|
||||
# $NetBSD: Makefile,v 1.126 2007/05/23 13:05:33 markd Exp $
|
||||
|
||||
DISTNAME= kdebase-${_KDE_VERSION}
|
||||
PKGREVISION= 1
|
||||
CATEGORIES= x11
|
||||
COMMENT= Base modules for the KDE 3 integrated X11 desktop
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@comment $NetBSD: PLIST,v 1.47 2007/04/14 21:40:18 markd Exp $
|
||||
@comment $NetBSD: PLIST,v 1.48 2007/05/23 13:05:34 markd Exp $
|
||||
bin/appletproxy
|
||||
bin/drkonqi
|
||||
bin/extensionproxy
|
||||
|
|
@ -2988,7 +2988,7 @@ share/kde/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
|
|||
share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
|
||||
share/kde/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
|
||||
share/kde/apps/kwin/b2.desktop
|
||||
share/kde/apps/kwin/default_rules/fsp_workarounds_1
|
||||
share/kde/apps/kwin/default_rules/fsp_workarounds_1.kwinrules
|
||||
share/kde/apps/kwin/eventsrc
|
||||
share/kde/apps/kwin/keramik.desktop
|
||||
share/kde/apps/kwin/laptop.desktop
|
||||
|
|
@ -3764,6 +3764,8 @@ share/locale/l10n/mc/entry.desktop
|
|||
share/locale/l10n/mc/flag.png
|
||||
share/locale/l10n/md/entry.desktop
|
||||
share/locale/l10n/md/flag.png
|
||||
share/locale/l10n/me/entry.desktop
|
||||
share/locale/l10n/me/flag.png
|
||||
share/locale/l10n/mg/entry.desktop
|
||||
share/locale/l10n/mg/flag.png
|
||||
share/locale/l10n/mh/entry.desktop
|
||||
|
|
@ -3861,6 +3863,8 @@ share/locale/l10n/qa/entry.desktop
|
|||
share/locale/l10n/qa/flag.png
|
||||
share/locale/l10n/ro/entry.desktop
|
||||
share/locale/l10n/ro/flag.png
|
||||
share/locale/l10n/rs/entry.desktop
|
||||
share/locale/l10n/rs/flag.png
|
||||
share/locale/l10n/ru/entry.desktop
|
||||
share/locale/l10n/ru/flag.png
|
||||
share/locale/l10n/rw/entry.desktop
|
||||
|
|
@ -3966,8 +3970,6 @@ share/locale/l10n/ws/entry.desktop
|
|||
share/locale/l10n/ws/flag.png
|
||||
share/locale/l10n/ye/entry.desktop
|
||||
share/locale/l10n/ye/flag.png
|
||||
share/locale/l10n/yu/entry.desktop
|
||||
share/locale/l10n/yu/flag.png
|
||||
share/locale/l10n/za/entry.desktop
|
||||
share/locale/l10n/za/flag.png
|
||||
share/locale/l10n/zm/entry.desktop
|
||||
|
|
@ -3977,7 +3979,6 @@ share/locale/l10n/zw/flag.png
|
|||
@dirrm share/locale/l10n/zw
|
||||
@dirrm share/locale/l10n/zm
|
||||
@dirrm share/locale/l10n/za
|
||||
@dirrm share/locale/l10n/yu
|
||||
@dirrm share/locale/l10n/ye
|
||||
@dirrm share/locale/l10n/ws
|
||||
@dirrm share/locale/l10n/wf
|
||||
|
|
@ -4027,6 +4028,7 @@ share/locale/l10n/zw/flag.png
|
|||
@dirrm share/locale/l10n/sa
|
||||
@dirrm share/locale/l10n/rw
|
||||
@dirrm share/locale/l10n/ru
|
||||
@dirrm share/locale/l10n/rs
|
||||
@dirrm share/locale/l10n/ro
|
||||
@dirrm share/locale/l10n/qa
|
||||
@dirrm share/locale/l10n/py
|
||||
|
|
@ -4073,6 +4075,7 @@ share/locale/l10n/zw/flag.png
|
|||
@dirrm share/locale/l10n/mk
|
||||
@dirrm share/locale/l10n/mh
|
||||
@dirrm share/locale/l10n/mg
|
||||
@dirrm share/locale/l10n/me
|
||||
@dirrm share/locale/l10n/md
|
||||
@dirrm share/locale/l10n/mc
|
||||
@dirrm share/locale/l10n/ma
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: distinfo,v 1.95 2007/03/08 14:38:31 rillig Exp $
|
||||
$NetBSD: distinfo,v 1.96 2007/05/23 13:05:34 markd Exp $
|
||||
|
||||
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
|
||||
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
|
||||
|
|
@ -9,22 +9,19 @@ Size (Daemon.png) = 15725 bytes
|
|||
SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c
|
||||
RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0
|
||||
Size (NetBSD-flag-1.0.png) = 4532 bytes
|
||||
SHA1 (kdebase-3.5.6.tar.bz2) = 0b37cae9637692c123a28c405dea8540e6b935c5
|
||||
RMD160 (kdebase-3.5.6.tar.bz2) = d3cbdcd148ea4c08d254f48faa10fc693517394c
|
||||
Size (kdebase-3.5.6.tar.bz2) = 24155599 bytes
|
||||
SHA1 (patch-aa) = 28647cdec95367504e582ceb871e67dd3c321e29
|
||||
SHA1 (kdebase-3.5.7.tar.bz2) = 833a35e4bbec2852f0f5267e680590be0c986594
|
||||
RMD160 (kdebase-3.5.7.tar.bz2) = f43070b5428c3099c0abceed56041e5b4ff3c656
|
||||
Size (kdebase-3.5.7.tar.bz2) = 24395088 bytes
|
||||
SHA1 (patch-aa) = 96c587d930dd9f25ed722e759fb2127a8ec14de4
|
||||
SHA1 (patch-ab) = 353de4dfb9f465ad5c3349f65854726fdb52dbed
|
||||
SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb
|
||||
SHA1 (patch-ad) = 031e5622acb376ce1867d08b35c55bce101e8855
|
||||
SHA1 (patch-ae) = e281920c63ab6cea8ed41c406275e63120d27490
|
||||
SHA1 (patch-af) = 5438b3738420d154715bf0d0f75b23767aa944d6
|
||||
SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
|
||||
SHA1 (patch-ah) = fc102fc211ba24281d84e4fd2d253e92c20cdc01
|
||||
SHA1 (patch-af) = e2366a7b638d574984674a8e6f84a687c2b0fcf9
|
||||
SHA1 (patch-ag) = c2d1318f7f0d539b976fa1c1e2b234ef45056cb3
|
||||
SHA1 (patch-ai) = 9691a1811585f2743a31f53a92d64b92a525551e
|
||||
SHA1 (patch-aj) = bedd17a5a04bff32e4441ed1750ae8ab5a4fa323
|
||||
SHA1 (patch-ak) = df7ff2bf5ed6bb2442d49df1c277712712a7f966
|
||||
SHA1 (patch-al) = 555384dc03ab59845e5794e081dd5d1a92e2959e
|
||||
SHA1 (patch-am) = 07ed2a5717a8f72bc36906ef4fafc360ac63479c
|
||||
SHA1 (patch-an) = e1620c558d300db98580109e64ee44a63571e5f7
|
||||
SHA1 (patch-aq) = 8cdc56fb3ca1646983790b6bb20b62ac04e41aa2
|
||||
SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba
|
||||
|
|
@ -33,12 +30,7 @@ SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
|
|||
SHA1 (patch-ca) = 0cdd9ee4766fef59a3c1c04a4ff820aee5043e2c
|
||||
SHA1 (patch-cb) = d13c59029ef13c89d565431244128044735ddaef
|
||||
SHA1 (patch-cc) = ed95490558d4de4a04aa0f45634e44ed0b78fdd8
|
||||
SHA1 (patch-da) = 06da421a8adcb54712e7c04125cffa9bef9003fb
|
||||
SHA1 (patch-db) = f67ffaf0676484db40759574cc2822ad0d6933bd
|
||||
SHA1 (patch-dc) = dd44652ad806d49d45ef86cbff58a01e506deeee
|
||||
SHA1 (patch-dd) = 4c98e62275ce9a632f79f99110e8fb4995e3f017
|
||||
SHA1 (patch-de) = 94d7f083784b8b56c2b23c320772a80a27df19d1
|
||||
SHA1 (patch-df) = ee6f6967d77d13217055d69dcf8be98b48d40598
|
||||
SHA1 (patch-ep) = 745f03daf088afdef4d5eff486311a49291eb947
|
||||
SHA1 (patch-er) = ead52469004abbb4e04278e038fad8f850d79701
|
||||
SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-aa,v 1.16 2006/01/31 22:25:34 markd Exp $
|
||||
$NetBSD: patch-aa,v 1.17 2007/05/23 13:05:34 markd Exp $
|
||||
|
||||
--- configure.orig 2006-01-21 20:13:16.000000000 +1300
|
||||
--- configure.orig 2007-05-14 23:57:00.000000000 +1200
|
||||
+++ configure
|
||||
@@ -30884,7 +30884,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
|
||||
@@ -34288,7 +34288,7 @@ if { (eval echo "$as_me:$LINENO: \"$kde_
|
||||
# if you're trying to debug this check and think it's incorrect,
|
||||
# better check your installation. The check _is_ correct - your
|
||||
# installation is not.
|
||||
|
|
@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.16 2006/01/31 22:25:34 markd Exp $
|
|||
kde_cv_uic_plugins=yes
|
||||
fi
|
||||
fi
|
||||
@@ -42634,6 +42634,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
|
||||
@@ -47113,6 +47113,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
|
||||
|
||||
ac_cv_have_dpms="-lXdpms"
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ $NetBSD: patch-aa,v 1.16 2006/01/31 22:25:34 markd Exp $
|
|||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
@@ -45486,7 +45503,7 @@ fi
|
||||
@@ -50244,7 +50261,7 @@ fi
|
||||
|
||||
|
||||
case "$host" in
|
||||
|
|
@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.16 2006/01/31 22:25:34 markd Exp $
|
|||
FOUND_USBVIEW=yes
|
||||
;;
|
||||
esac
|
||||
@@ -46925,7 +46942,7 @@ acimake:
|
||||
@@ -51868,7 +51885,7 @@ acimake:
|
||||
|
||||
EOF
|
||||
if $XMKMF >&5 2>&1 && test -f Makefile; then
|
||||
|
|
@ -52,25 +52,8 @@ $NetBSD: patch-aa,v 1.16 2006/01/31 22:25:34 markd Exp $
|
|||
+ kde_cv_defines_imake=`${MAKE-make} PREFIX='${X11_ROOT}' acimake 2> /dev/null | grep -v "^make"`
|
||||
kde_cv_defines_imake_version=$imkv
|
||||
else
|
||||
echo "$as_me:$LINENO: result: failed" >&5
|
||||
@@ -54341,6 +54358,7 @@ case "$host" in
|
||||
*-*-osf*) ksysguardd_compile=yes; UNAME='Tru64' ;;
|
||||
*-*-irix*) ksysguardd_compile=yes; UNAME='Irix' ;;
|
||||
*-*-openbsd*) ksysguardd_compile=yes; UNAME='OpenBSD' ;;
|
||||
+ *-*-dragonfly*) ksysguardd_compile=yes; UNAME='DragonFly' ;;
|
||||
*) ksysguardd_compile=no; UNAME='' ;;
|
||||
esac
|
||||
|
||||
@@ -54369,7 +54387,7 @@ fi
|
||||
|
||||
|
||||
|
||||
-if test "$UNAME" = FreeBSD; then
|
||||
+if test "$UNAME" = FreeBSD || test "$UNAME" = DragonFly; then
|
||||
include_ksysguardd_freebsd_TRUE=
|
||||
include_ksysguardd_freebsd_FALSE='#'
|
||||
else
|
||||
@@ -54704,6 +54722,7 @@ fi
|
||||
{ echo "$as_me:$LINENO: result: failed" >&5
|
||||
@@ -60629,6 +60647,7 @@ fi
|
||||
case "$UNAME" in
|
||||
Linux) LIBHOSTS="$LIBSENSORS" ;;
|
||||
FreeBSD) LIBHOSTS="$LIBSENSORS -lkvm" ;;
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
$NetBSD: patch-ae,v 1.8 2005/04/14 20:53:30 markd Exp $
|
||||
|
||||
--- kcontrol/krdb/krdb.cpp.orig 2004-07-17 18:52:04.000000000 +0100
|
||||
+++ kcontrol/krdb/krdb.cpp
|
||||
@@ -384,7 +386,14 @@ static void createGtkrc( bool exportColo
|
||||
// not every button, checkbox, etc.
|
||||
t << "style \"MenuItem\"" << endl;
|
||||
t << "{" << endl;
|
||||
- t << " bg[PRELIGHT] = " << color( cg.highlight() ) << endl;
|
||||
+ if (cg.highlight() == cg.text())
|
||||
+ {
|
||||
+ t << " bg[PRELIGHT] = " << color( cg.background() ) << endl;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ t << " bg[PRELIGHT] = " << color( cg.highlight() ) << endl;
|
||||
+ }
|
||||
t << "}" << endl;
|
||||
t << endl;
|
||||
t << "class \"*MenuItem\" style \"MenuItem\"" << endl;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-af,v 1.7 2006/02/01 12:36:25 markd Exp $
|
||||
$NetBSD: patch-af,v 1.8 2007/05/23 13:05:35 markd Exp $
|
||||
|
||||
--- kcontrol/info/info_netbsd.cpp.orig 2005-09-10 20:25:05.000000000 +1200
|
||||
+++ kcontrol/info/info_netbsd.cpp
|
||||
|
|
@ -17,7 +17,7 @@ $NetBSD: patch-af,v 1.7 2006/02/01 12:36:25 markd Exp $
|
|||
int num; // number of mounts
|
||||
- // FIXME: older pkgsrc patches checked ST_RDONLY for this declaration
|
||||
- // what is ST_RDONLY and how does it affect getmntinfo?
|
||||
+#ifdef ST_RDONLY
|
||||
+#ifdef HAVE_STATVFS
|
||||
+ struct statvfs *mnt; // mount data pointer
|
||||
+#else
|
||||
struct statfs *mnt; // mount data pointer
|
||||
|
|
@ -29,7 +29,7 @@ $NetBSD: patch-af,v 1.7 2006/02/01 12:36:25 markd Exp $
|
|||
unsigned long long big[2];
|
||||
QString vv[5];
|
||||
|
||||
+#ifdef ST_RDONLY
|
||||
+#ifdef HAVE_STATVFS
|
||||
+ big[0] = big[1] = mnt->f_frsize; // coerce the product
|
||||
+#else
|
||||
big[0] = big[1] = mnt->f_bsize; // coerce the product
|
||||
|
|
@ -41,7 +41,7 @@ $NetBSD: patch-af,v 1.7 2006/02/01 12:36:25 markd Exp $
|
|||
.arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0);
|
||||
|
||||
vv[4] = QString::null;
|
||||
+#ifdef ST_RDONLY
|
||||
+#ifdef HAVE_STATVFS
|
||||
+#define MNTF(x) if (mnt->f_flag & ST_##x) vv[4] += QString::fromLatin1(#x " ");
|
||||
+#else
|
||||
#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += QString::fromLatin1(#x " ");
|
||||
|
|
@ -53,7 +53,7 @@ $NetBSD: patch-af,v 1.7 2006/02/01 12:36:25 markd Exp $
|
|||
MNTF(EXPORTED)
|
||||
MNTF(EXPUBLIC)
|
||||
MNTF(EXRDONLY)
|
||||
+#ifndef ST_RDONLY
|
||||
+#ifndef HAVE_STATVFS
|
||||
MNTF(IGNORE)
|
||||
+#endif
|
||||
MNTF(LOCAL)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-ag,v 1.6 2004/04/26 11:31:25 markd Exp $
|
||||
$NetBSD: patch-ag,v 1.7 2007/05/23 13:05:35 markd Exp $
|
||||
|
||||
--- ksysguard/ksysguardd/NetBSD/diskstat.c.orig 2003-03-13 01:26:05.000000000 +1300
|
||||
+++ ksysguard/ksysguardd/NetBSD/diskstat.c
|
||||
|
|
@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.6 2004/04/26 11:31:25 markd Exp $
|
|||
|
||||
int numMntPnt(void)
|
||||
{
|
||||
+#ifdef ST_RDONLY
|
||||
+#ifdef HAVE_STATVFS
|
||||
+ struct statvfs *fs_info;
|
||||
+#else
|
||||
struct statfs *fs_info;
|
||||
|
|
@ -18,7 +18,7 @@ $NetBSD: patch-ag,v 1.6 2004/04/26 11:31:25 markd Exp $
|
|||
|
||||
int updateDiskStat(void)
|
||||
{
|
||||
+#ifdef ST_RDONLY
|
||||
+#ifdef HAVE_STATVFS
|
||||
+ struct statvfs *fs_info;
|
||||
+ struct statvfs fs;
|
||||
+#else
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
$NetBSD: patch-ah,v 1.9 2007/01/26 02:49:25 markd Exp $
|
||||
|
||||
--- kioslave/media/kfile-plugin/kfilemediaplugin.cpp.orig 2007-01-25 11:51:55.000000000 +1300
|
||||
+++ kioslave/media/kfile-plugin/kfilemediaplugin.cpp
|
||||
@@ -29,7 +29,22 @@
|
||||
#include <qapplication.h>
|
||||
#include <qfile.h>
|
||||
|
||||
-#include <sys/statvfs.h>
|
||||
+#if defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
+# include <sys/param.h>
|
||||
+# if __NetBSD_Version__ >= 299000900 /* 2.99.9 */
|
||||
+# define HAVE_STATVFS 1
|
||||
+# endif
|
||||
+#else
|
||||
+# define HAVE_STATVFS 1
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_STATVFS
|
||||
+# include <sys/statvfs.h>
|
||||
+#else
|
||||
+# include <sys/mount.h>
|
||||
+# define statvfs statfs
|
||||
+# define f_frsize f_bsize
|
||||
+#endif
|
||||
|
||||
typedef KGenericFactory<KFileMediaPlugin> KFileMediaPluginFactory;
|
||||
K_EXPORT_COMPONENT_FACTORY(kfile_media, KFileMediaPluginFactory("kio_media"))
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
$NetBSD: patch-am,v 1.16 2005/12/11 11:03:13 markd Exp $
|
||||
|
||||
--- nsplugins/viewer/viewer.cpp.orig 2005-10-11 04:04:05.000000000 +1300
|
||||
+++ nsplugins/viewer/viewer.cpp
|
||||
@@ -205,6 +205,9 @@ bool qt_set_socket_handler( int sockfd,
|
||||
}
|
||||
#endif
|
||||
|
||||
+#ifndef RLIMIT_AS
|
||||
+#define RLIMIT_AS RLIMIT_DATA
|
||||
+#endif
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-da,v 1.4 2005/11/08 18:25:44 joerg Exp $
|
||||
|
||||
--- kcontrol/info/info.cpp.orig 2005-08-17 23:33:43.000000000 +0000
|
||||
+++ kcontrol/info/info.cpp
|
||||
@@ -468,7 +468,7 @@ static int GetInfo_ReadfromPipe( QListVi
|
||||
#include "info_linux.cpp"
|
||||
#elif defined(sgi) && sgi
|
||||
#include "info_sgi.cpp"
|
||||
-#elif __FreeBSD__
|
||||
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
#include "info_fbsd.cpp"
|
||||
#elif __hpux
|
||||
#include "info_hpux.cpp"
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
$NetBSD: patch-db,v 1.4 2005/11/08 18:25:44 joerg Exp $
|
||||
|
||||
--- kcontrol/clock/dtime.cpp.orig 2005-08-17 23:34:03.000000000 +0000
|
||||
+++ kcontrol/clock/dtime.cpp
|
||||
@@ -306,7 +306,7 @@ void Dtime::save()
|
||||
KProcess c_proc;
|
||||
|
||||
// BSD systems reverse year compared to Susv3
|
||||
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
|
||||
BufS.sprintf("%04d%02d%02d%02d%02d.%02d",
|
||||
date.year(),
|
||||
date.month(), date.day(),
|
||||
@@ -324,7 +324,7 @@ void Dtime::save()
|
||||
c_proc.start( KProcess::Block );
|
||||
int result = c_proc.exitStatus();
|
||||
if (result != 0
|
||||
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
|
||||
&& result != 2 // can only set local date, which is okay
|
||||
#endif
|
||||
) {
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
$NetBSD: patch-dc,v 1.4 2005/11/08 18:25:44 joerg Exp $
|
||||
|
||||
--- kcontrol/info/memory.cpp.orig 2005-08-17 23:34:47.000000000 +0000
|
||||
+++ kcontrol/info/memory.cpp
|
||||
@@ -458,7 +458,7 @@ void KMemoryWidget::update_Values()
|
||||
#include "memory_sgi.cpp"
|
||||
#elif defined(__svr4__) && defined(sun)
|
||||
#include "memory_solaris.cpp"
|
||||
-#elif defined(__FreeBSD__)
|
||||
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
#include "memory_fbsd.cpp"
|
||||
#elif defined(__hpux)
|
||||
#include "memory_hpux.cpp"
|
||||
|
|
@ -1,109 +0,0 @@
|
|||
$NetBSD: patch-de,v 1.5 2005/11/08 18:25:44 joerg Exp $
|
||||
|
||||
--- ksysguard/ksysguardd/FreeBSD/CPU.c.orig 2005-05-23 12:15:08.000000000 +0000
|
||||
+++ ksysguard/ksysguardd/FreeBSD/CPU.c
|
||||
@@ -22,7 +22,10 @@
|
||||
#include <osreldate.h>
|
||||
|
||||
#include <sys/types.h>
|
||||
-#if __FreeBSD_version < 500101
|
||||
+#if defined(__DragonFly__)
|
||||
+#include <sys/param.h>
|
||||
+#include <kinfo.h>
|
||||
+#elif __FreeBSD_version < 500101
|
||||
#include <sys/dkstat.h>
|
||||
#else
|
||||
#include <sys/resource.h>
|
||||
@@ -40,6 +43,18 @@
|
||||
#include "Command.h"
|
||||
#include "ksysguardd.h"
|
||||
|
||||
+#if defined(__DragonFly__)
|
||||
+static void cputime_percentages(int[4], struct kinfo_cputime *,
|
||||
+ struct kinfo_cputime *);
|
||||
+static struct kinfo_cputime cp_time, cp_old;
|
||||
+
|
||||
+#define CPUSTATES 4
|
||||
+#define CP_USER 0
|
||||
+#define CP_NICE 1
|
||||
+#define CP_SYS 2
|
||||
+#define CP_IDLE 3
|
||||
+
|
||||
+#else
|
||||
long percentages(int cnt, int *out, long *new, long *old, long *diffs);
|
||||
|
||||
unsigned long cp_time_offset;
|
||||
@@ -47,6 +62,8 @@ unsigned long cp_time_offset;
|
||||
long cp_time[CPUSTATES];
|
||||
long cp_old[CPUSTATES];
|
||||
long cp_diff[CPUSTATES];
|
||||
+#endif
|
||||
+
|
||||
int cpu_states[CPUSTATES];
|
||||
|
||||
void
|
||||
@@ -73,9 +90,14 @@ exitCpuInfo(void)
|
||||
int
|
||||
updateCpuInfo(void)
|
||||
{
|
||||
+#if defined(__DragonFly__)
|
||||
+ kinfo_get_sched_cputime(&cp_time);
|
||||
+ cputime_percentages(cpu_states, &cp_time, &cp_old);
|
||||
+#else
|
||||
size_t len = sizeof(cp_time);
|
||||
sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0);
|
||||
percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff);
|
||||
+#endif
|
||||
return (0);
|
||||
}
|
||||
|
||||
@@ -148,7 +170,44 @@ printCPUIdleInfo(const char* cmd)
|
||||
* The routine assumes modulo arithmetic. This function is especially
|
||||
* useful on BSD mchines for calculating cpu state percentages.
|
||||
*/
|
||||
+#if defined(__DragonFly__)
|
||||
+static void
|
||||
+cputime_percentages(int out[4], struct kinfo_cputime *new, struct kinfo_cputime * old)
|
||||
+{
|
||||
+ struct kinfo_cputime diffs;
|
||||
+ int i;
|
||||
+ uint64_t total_change, half_total;
|
||||
+
|
||||
+ /* initialization */
|
||||
+ total_change = 0;
|
||||
+
|
||||
+ diffs.cp_user = new->cp_user - old->cp_user;
|
||||
+ diffs.cp_nice = new->cp_nice - old->cp_nice;
|
||||
+ diffs.cp_sys = new->cp_sys - old->cp_sys;
|
||||
+ diffs.cp_intr = new->cp_intr - old->cp_intr;
|
||||
+ diffs.cp_idle = new->cp_idle - old->cp_idle;
|
||||
+ total_change = diffs.cp_user + diffs.cp_nice + diffs.cp_sys +
|
||||
+ diffs.cp_intr + diffs.cp_idle;
|
||||
+ old->cp_user = new->cp_user;
|
||||
+ old->cp_nice = new->cp_nice;
|
||||
+ old->cp_sys = new->cp_sys;
|
||||
+ old->cp_intr = new->cp_intr;
|
||||
+ old->cp_idle = new->cp_idle;
|
||||
+
|
||||
+ /* avoid divide by zero potential */
|
||||
+ if (total_change == 0)
|
||||
+ total_change = 1;
|
||||
+
|
||||
+ /* calculate percentages based on overall change, rounding up */
|
||||
+ half_total = total_change >> 1;
|
||||
+
|
||||
+ 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[4] = ((diffs.cp_idle * 1000LL + half_total) / total_change);
|
||||
+}
|
||||
|
||||
+#else
|
||||
long percentages(cnt, out, new, old, diffs)
|
||||
|
||||
int cnt;
|
||||
@@ -201,3 +260,4 @@ long *diffs;
|
||||
/* return the total in case the caller wants to use it */
|
||||
return(total_change);
|
||||
}
|
||||
+#endif
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
$NetBSD: patch-df,v 1.9 2005/11/08 18:25:44 joerg Exp $
|
||||
|
||||
--- ksysguard/ksysguardd/FreeBSD/ProcessList.c.orig 2005-08-18 00:27:47.000000000 +0000
|
||||
+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c
|
||||
@@ -217,23 +217,25 @@ 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;
|
||||
+#if defined(__DragonFly__)
|
||||
+ ps->priority = p.kp_thread.td_pri;
|
||||
+#else
|
||||
ps->priority = p.kp_proc.p_priority;
|
||||
+#endif
|
||||
ps->niceLevel = p.kp_proc.p_nice;
|
||||
#endif
|
||||
|
||||
/* this isn't usertime -- it's total time (??) */
|
||||
#if __FreeBSD_version >= 500015
|
||||
ps->userTime = p.ki_runtime / 10000;
|
||||
-#elif __FreeBSD_version >= 300000
|
||||
-#if defined(__DragonFly__)
|
||||
+#elif defined(__DragonFly__)
|
||||
if (!getrusage(p.kp_proc.p_pid, &pru))
|
||||
{
|
||||
errx(1, "failed to get rusage info");
|
||||
}
|
||||
ps->userTime = pru.ru_utime.tv_usec / 1000; /*p_runtime / 1000*/
|
||||
-#else
|
||||
+#elif __FreeBSD_version >= 300000
|
||||
ps->userTime = p.kp_proc.p_runtime / 10000;
|
||||
-#endif
|
||||
#else
|
||||
ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100;
|
||||
#endif
|
||||
Loading…
Reference in a new issue