diff options
| author | markd <markd@pkgsrc.org> | 2004-04-26 11:31:25 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2004-04-26 11:31:25 +0000 |
| commit | 04825482aa2d922bdf3d801a1caed62d166b2562 (patch) | |
| tree | 7c6ea3437f7586bcdd43a0d1c43f8f8bdeec2e02 /x11/kdebase3/patches | |
| parent | 8ea861d7aec41129670688ddaa35be870f1f6253 (diff) | |
| download | pkgsrc-04825482aa2d922bdf3d801a1caed62d166b2562.tar.gz | |
statfs -> statvfs in current.
Patches from John R. Shannon in PR 25327 and PR 25328 with suggestion from
Christos Zoulas
Diffstat (limited to 'x11/kdebase3/patches')
| -rw-r--r-- | x11/kdebase3/patches/patch-af | 28 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-ag | 30 |
2 files changed, 58 insertions, 0 deletions
diff --git a/x11/kdebase3/patches/patch-af b/x11/kdebase3/patches/patch-af new file mode 100644 index 00000000000..f6b90598b81 --- /dev/null +++ b/x11/kdebase3/patches/patch-af @@ -0,0 +1,28 @@ +$NetBSD: patch-af,v 1.4 2004/04/26 11:31:25 markd Exp $ + +--- kcontrol/info/info_netbsd.cpp.orig 2003-01-21 02:17:16.000000000 +1300 ++++ kcontrol/info/info_netbsd.cpp +@@ -272,7 +272,11 @@ bool GetInfo_Partitions (QListView *lbox + FILE *pipe = popen("/sbin/mount", "r"); + QTextStream *t; + u_int64_t tsz, fsz; ++#ifdef ST_RDONLY ++ struct statvfs sfs; ++#else + struct statfs sfs; ++#endif + int ok; + + if (!pipe) { +@@ -312,7 +316,11 @@ bool GetInfo_Partitions (QListView *lbox + flags = ""; + } + ++#ifdef ST_RDONLY ++ if (statvfs(mountpoint, &sfs) == 0) { ++#else + if (statfs(mountpoint, &sfs) == 0) { ++#endif + tsz = ((1LL * sfs.f_blocks * sfs.f_bsize / 1024) + 513) + / 1024; + fsz = ((1LL * sfs.f_bfree * sfs.f_bsize / 1024) + 513) diff --git a/x11/kdebase3/patches/patch-ag b/x11/kdebase3/patches/patch-ag new file mode 100644 index 00000000000..d7bc16cd0f2 --- /dev/null +++ b/x11/kdebase3/patches/patch-ag @@ -0,0 +1,30 @@ +$NetBSD: patch-ag,v 1.6 2004/04/26 11:31:25 markd Exp $ + +--- ksysguard/ksysguardd/NetBSD/diskstat.c.orig 2003-03-13 01:26:05.000000000 +1300 ++++ ksysguard/ksysguardd/NetBSD/diskstat.c +@@ -64,7 +64,11 @@ char *getMntPnt(const char *cmd) + + int numMntPnt(void) + { ++#ifdef ST_RDONLY ++ struct statvfs *fs_info; ++#else + struct statfs *fs_info; ++#endif + int i, n, counter = 0; + + n = getmntinfo(&fs_info, MNT_WAIT); +@@ -130,8 +134,13 @@ void exitDiskStat(void) + + int updateDiskStat(void) + { ++#ifdef ST_RDONLY ++ struct statvfs *fs_info; ++ struct statvfs fs; ++#else + struct statfs *fs_info; + struct statfs fs; ++#endif + float percent; + int i, mntcount; + DiskInfo *disk_info; |