diff options
Diffstat (limited to 'x11/kdebase3/patches/patch-af')
| -rw-r--r-- | x11/kdebase3/patches/patch-af | 61 |
1 files changed, 55 insertions, 6 deletions
diff --git a/x11/kdebase3/patches/patch-af b/x11/kdebase3/patches/patch-af index 5e165f3231b..f5537a4398b 100644 --- a/x11/kdebase3/patches/patch-af +++ b/x11/kdebase3/patches/patch-af @@ -1,8 +1,16 @@ -$NetBSD: patch-af,v 1.8 2007/05/23 13:05:35 markd Exp $ +$NetBSD: patch-af,v 1.9 2008/01/04 21:05:57 markd Exp $ --- kcontrol/info/info_netbsd.cpp.orig 2005-09-10 20:25:05.000000000 +1200 +++ kcontrol/info/info_netbsd.cpp -@@ -123,7 +123,7 @@ static bool GetDmesgInfo(QListView *lBox +@@ -41,6 +41,7 @@ + #include <qfontmetrics.h> + #include <qstrlist.h> + #include <qtextstream.h> ++#include <qregexp.h> + + #include <kdebug.h> + #include <kio/global.h> /* for KIO::convertSize() */ +@@ -123,7 +124,7 @@ static bool GetDmesgInfo(QListView *lBox } QListViewItem *olditem = NULL; @@ -11,7 +19,36 @@ $NetBSD: patch-af,v 1.8 2007/05/23 13:05:35 markd Exp $ if (!seencpu) { if (s.contains("cpu")) seencpu = true; -@@ -265,9 +265,11 @@ bool GetInfo_SCSI (QListView *lbox) +@@ -134,9 +135,7 @@ static bool GetDmesgInfo(QListView *lBox + s.contains("WARNING: old BSD partition ID!")) + break; + +- if (!filter +- || (filter[0] == '^' && s.find(&filter[1]) == 0) +- || (filter[0] != '^' && s.contains(filter))) { ++ if (!filter || s.contains(QRegExp(filter))) { + if (func) + func(lBox, s); + else +@@ -163,7 +162,7 @@ AddIRQLine(QListView *lBox, QString s) + int pos, irqnum; + char numstr[3]; + +- pos = s.find(" irq "); ++ pos = s.find(QRegExp("[ (]irq ")); + irqnum = (pos < 0) ? 0 : atoi(&s.ascii()[pos+5]); + if (irqnum) + snprintf(numstr, 3, "%02d", irqnum); +@@ -181,7 +180,7 @@ bool GetInfo_IRQ (QListView *lBox) + lBox->addColumn(i18n("Device")); + lBox->setSorting(0); + lBox->setShowSortIndicator(FALSE); +- (void) GetDmesgInfo(lBox, " irq ", AddIRQLine); ++ (void) GetDmesgInfo(lBox, "[ (]irq ", AddIRQLine); + return true; + } + +@@ -265,9 +264,11 @@ bool GetInfo_SCSI (QListView *lbox) bool GetInfo_Partitions (QListView *lbox) { int num; // number of mounts @@ -25,7 +62,7 @@ $NetBSD: patch-af,v 1.8 2007/05/23 13:05:35 markd Exp $ // get mount info if (!(num=getmntinfo(&mnt, MNT_WAIT))) { -@@ -290,7 +292,11 @@ bool GetInfo_Partitions (QListView *lbox +@@ -290,24 +291,31 @@ bool GetInfo_Partitions (QListView *lbox unsigned long long big[2]; QString vv[5]; @@ -37,7 +74,19 @@ $NetBSD: patch-af,v 1.8 2007/05/23 13:05:35 markd Exp $ big[0] *= mnt->f_blocks; big[1] *= mnt->f_bavail; // FIXME: use f_bfree if root? -@@ -307,7 +313,11 @@ bool GetInfo_Partitions (QListView *lbox + // convert to strings + vv[0] = KIO::convertSize(big[0]); +- vv[1] = QString::fromLatin1("%1 (%2%%)") ++ vv[1] = QString("%1 (%2%)") + .arg(KIO::convertSize(big[1])) + .arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0); + +- // FIXME: these two are large enough to punctuate +- vv[2] = QString::number(mnt->f_files); +- vv[3] = QString::fromLatin1("%1 (%2%%) ") ++ vv[2] = QString("%L1").arg(mnt->f_files); ++ vv[3] = QString("%L1 (%2%) ") + .arg(mnt->f_ffree) .arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0); vv[4] = QString::null; @@ -49,7 +98,7 @@ $NetBSD: patch-af,v 1.8 2007/05/23 13:05:35 markd Exp $ MNTF(ASYNC) MNTF(DEFEXPORTED) MNTF(EXKERB) -@@ -316,7 +326,9 @@ bool GetInfo_Partitions (QListView *lbox +@@ -316,7 +324,9 @@ bool GetInfo_Partitions (QListView *lbox MNTF(EXPORTED) MNTF(EXPUBLIC) MNTF(EXRDONLY) |