head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.44 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.42 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.40 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.38 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.36 pkgsrc-2009Q4-base:1.4 pkgsrc-2008Q4:1.4.0.34 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.32 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.30 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.28 pkgsrc-2008Q2-base:1.4 pkgsrc-2008Q1:1.4.0.26 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.24 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.22 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.20 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.18 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.16 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.14 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.12 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.10 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.4.0.8 pkgsrc-2005Q4-base:1.4 pkgsrc-2005Q3:1.4.0.6 pkgsrc-2005Q3-base:1.4 pkgsrc-2005Q2:1.4.0.4 pkgsrc-2005Q2-base:1.4 pkgsrc-2005Q1:1.4.0.2 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.3.0.18 pkgsrc-2004Q4-base:1.3 pkgsrc-2004Q3:1.3.0.16 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.14 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.12 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.10 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.3.0.6 netbsd-1-6-1-base:1.3 netbsd-1-6:1.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3; locks; strict; comment @# @; 1.4 date 2005.01.03.14.32.32; author wiz; state dead; branches; next 1.3; 1.3 date 2001.12.03.15.37.19; author skrll; state Exp; branches; next 1.2; 1.2 date 2001.10.15.22.46.01; author skrll; state Exp; branches; next 1.1; 1.1 date 2001.09.22.14.51.50; author jdolecek; state Exp; branches; next ; desc @@ 1.4 log @Remove KDE2 packages (and their dependencies) as proposed on tech-pkg. @ text @$NetBSD: patch-ba,v 1.3 2001/12/03 15:37:19 skrll Exp $ --- kcontrol/konq/Makefile.in.orig Sat Nov 10 07:58:20 2001 +++ kcontrol/konq/Makefile.in @@@@ -285,7 +285,7 @@@@ libkcm_konq_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) +libkcm_konq_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KSYCOCA) ${KDE_RPATH} libkcm_konq_la_DATA = overlapping.png onlyone.png libkcm_konq_ladir = $(kde_datadir)/kcontrol/pics @@@@ -338,7 +338,7 @@@@ #>- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) #>+ 4 -KDE_DIST=fontopts.h onlyone.png kcmkonq.desktop desktop.desktop desktop.h main.h rootopts.h overlapping.png virtualdesktops.desktop behaviour.h uninstall.desktop trashopts.h +KDE_DIST=trashopts.h desktop.h behaviour.h virtualdesktops.desktop onlyone.png desktop.desktop kcmkonq.desktop fontopts.h main.h rootopts.h uninstall.desktop overlapping.png DISTFILES= $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) @ 1.3 log @Update to KDE 2.2.2 Closes pkg/14728 from Mark Davies . Changes from him with updates from myself. From www.kde.org... The principal improvements over KDE 2.2.1, release two months ago, include: o security-related - SSL certificate loading - symlink vulnerability in .wmrc access by KDM introduced in 2.2 - security problem with eFax (used by klprfax) - potential problem in PAM invocation by KDM - potential harmful side-effect of failed KDM session starts o new features - added support for CodeWeavers' CrossOver plug-in (provides support for QuickTime, etc.) - added support for the wheelmouse for scrolling through the KGhostview PS/PDF viewer component - ability to search for multiple patterns at a time in the file search dialog - debugging multi-threaded applications with KDevelop o improvements/fixes - handling of HTTP links that redirect to FTP - POST using SSL through a proxy and sending headers through proxies - saving of recently-selected files in the file dialog - handling of non-ASCII characters over SMB - toolbar button captions with certain styles - selecting items with the mouse in Konqueror - sorting in Konqueror's textview - saving current settings as a theme in the theme manager - crashes in KMail with certain mails - crash on invoking the KDM chooser - non-Latin languages with KDevelop performance - icon loading optimized - file dialog speedups - stop spinning SMB client processes - handling of large files in Kate @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Update to KDE 2.2.1 With apologies to Al I wouldn't know where to start with a summary of the changes between 2.1 and 2.2.1 - there are just too many. A couple of hopefully static URLS that contain useful information are http://www.kde.org/announcements/changelog2_1to2_2.html http://www.kde.org/announcements/changelog2_2to2_2_1.html Support for a.out for kde{libs,base} added by me. The libtool/a.out combination doesn't like the linking of modules into binaries. A better way of doing this will appear in future versions of KDE/pkgsrc. @ text @d3 1 a3 1 --- kcontrol/konq/Makefile.in.orig Sat Sep 8 01:36:26 2001 d5 4 a8 1 @@@@ -286 +286 @@@@ d11 7 a17 1 @@@@ -339 +339 @@@@ d20 3 a22 12 @@@@ -537,11 +536,0 @@@@ -#>- @@for file in $(DISTFILES); do \ -#>- d=$(srcdir); \ -#>- if test -d $$d/$$file; then \ -#>- cp -pr $$/$$file $(distdir)/$$file; \ -#>- else \ -#>- test -f $(distdir)/$$file \ -#>- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ -#>- || cp -p $$d/$$file $(distdir)/$$file || :; \ -#>- fi; \ -#>- done -#>+ 10 @ 1.1 log @Changes to kcontrol/info/info_netbsd.cpp: GetDmesgInfo(): - changed to support '^foobar' in the filter string - the filter function is now supposed to add the appropriate stuff to passed QListView immediatelly, opaque/final is not passed any more Couple fixes to kcontrol Information stuff: - fix the display of IRQs, simplify the AddIRQLine(), use the QListView sort facilities instead separate QStrList - remove the 'waiting x seconds for devices to settle' on SCSI display - fix the display of audio devices - include Total Size and Free Size on Partition display, remove parentheses in Mount Options The patch will be fed to KDE Team for inclusion in future KDE versions. @ text @d3 20 a22 254 --- kcontrol/info/info_netbsd.cpp.orig Fri Sep 21 23:01:26 2001 +++ kcontrol/info/info_netbsd.cpp Sat Sep 22 16:25:36 2001 @@@@ -34,8 +34,10 @@@@ #include #include #include +#include #include /* for NULL */ #include /* for malloc(3) */ +#include #include #include @@@@ -100,20 +102,18 @@@@ bool GetInfo_CPU(QListView *lBox) // this is used to find out which devices are currently // on system static bool GetDmesgInfo(QListView *lBox, const char *filter, - void func(QListView *, QCString s, void **, bool)) + void func(QListView *, QString s)) { QFile *dmesg = new QFile("/var/run/dmesg.boot"); bool usepipe=false; FILE *pipe=NULL; QTextStream *t; bool seencpu=false; - void *opaque=NULL; - QCString s; + QString s; bool found=false; - if (dmesg->exists() && dmesg->open(IO_ReadOnly)) { + if (dmesg->exists() && dmesg->open(IO_ReadOnly)) t = new QTextStream(dmesg); - } else { delete dmesg; pipe = popen("/sbin/dmesg", "r"); @@@@ -134,25 +134,20 @@@@ static bool GetDmesgInfo(QListView *lBox s.contains("WARNING: old BSD partition ID!")) break; - if (!filter || s.contains(filter)) { - if (func) { - func(lBox, s, &opaque, false); - } - else { + if (!filter + || (filter[0] == '^' && s.find(&filter[1]) == 0) + || (filter[0] != '^' && s.contains(filter))) { + if (func) + func(lBox, s); + else olditem = new QListViewItem(lBox, olditem, s); - } found = true; } } - if (func) { - func(lBox, s, &opaque, true); - } - //lBox->triggerUpdate(); delete t; - if (pipe) { + if (pipe) pclose(pipe); - } else { dmesg->close(); delete dmesg; @@@@ -161,40 +156,31 @@@@ static bool GetDmesgInfo(QListView *lBox return found; } -void AddIRQLine(QListView *lBox, QCString s, void **opaque, bool ending) +void +AddIRQLine(QListView *lBox, QString s) { - QStrList *strlist = (QStrList *) *opaque; - const char *str; - int pos, irqnum=0; - - if (!strlist) { - strlist = new QStrList(); - *opaque = (void *) strlist; - } - if (ending) { - str = strlist->first(); - for(;str; str = strlist->next()) { - new QListViewItem(lBox, str); - } - delete strlist; - return; - } + int pos, irqnum; + char numstr[3]; pos = s.find(" irq "); - irqnum = (pos < 0) ? 0 : atoi(&(((const char *)s)[pos+5])); - if (irqnum) { - s.sprintf("%02d%s", irqnum, (const char *)s); - } + irqnum = (pos < 0) ? 0 : atoi(&s.ascii()[pos+5]); + if (irqnum) + snprintf(numstr, 3, "%02d", irqnum); else { - s.sprintf("??%s", (const char *)s); + // this should never happen + strcpy(numstr, "??"); } - strlist->inSort(s); + + new QListViewItem(lBox, numstr, s); } + bool GetInfo_IRQ (QListView *lBox) { lBox->addColumn(i18n("IRQ")); lBox->addColumn(i18n("Device")); + lBox->setSorting(0); + lBox->setShowSortIndicator(FALSE); (void) GetDmesgInfo(lBox, " irq ", AddIRQLine); return true; } @@@@ -220,26 +206,27 @@@@ bool GetInfo_IO_Ports (QListView *lbox) bool GetInfo_Sound (QListView *lbox) { + lbox->setSorting(false); + if (!GetDmesgInfo(lbox, "audio", NULL)) new QListViewItem(lbox, i18n("No audio devices found.")); - // append information on any audio devices found + // append information for each audio devices found QListViewItem *lvitem = lbox->firstChild(); for(; lvitem; lvitem = lvitem->nextSibling()) { QString s; int pos, len; - const char *start, *end; + const char *start; char *dev; s = lvitem->text(0); - if ((pos = s.find("at ")) >= 0) { - pos += 3; // skip "at " - start = end = s.ascii(); - for(; (*end!=':') && (*end!='\n'); end++); - len = end - start; - dev = (char *) malloc(len + 1); - strncpy(dev, start, len); - dev[len] = '\0'; + // The autoconf message is in form 'audio0 at auvia0: ...' + if (s.find("audio") == 0 && (pos = s.find(" at ")) > 0) { + pos += 4; // skip " at " + start = s.ascii() + pos; + len = (int) strcspn(start, ":\n\t "); + dev = (char *) malloc(1 + len + 1); + sprintf(dev, "^%.*s", len, start); /* safe */ GetDmesgInfo(lbox, dev, NULL); @@@@ -260,16 +247,32 @@@@ bool GetInfo_SCSI (QListView *lbox) { if (!GetDmesgInfo(lbox, "scsibus", NULL)) new QListViewItem(lbox, i18n("No SCSI devices found.")); + + // remove the 'waiting %d seconds for devices to settle' message + QListViewItem *lvitem = lbox->firstChild(); + for(; lvitem; lvitem = lvitem->nextSibling()) { + QString s = lvitem->text(0); + + if (s.contains("seconds for devices to settle")) { + lbox->removeItem(lvitem); + break; + } + } + return true; } bool GetInfo_Partitions (QListView *lbox) { - QCString s; + QString s; + QString MB; char *line, *orig_line; const char *device, *mountpoint, *type, *flags; FILE *pipe = popen("/sbin/mount", "r"); QTextStream *t; + u_int64_t tsz, fsz; + struct statfs sfs; + int ok; if (!pipe) { kdError(0) << i18n("Ahh couldn't run /sbin/mount!") << endl; @@@@ -277,27 +280,49 @@@@ bool GetInfo_Partitions (QListView *lbox } t = new QTextStream(pipe, IO_ReadOnly); + MB = QString(" ") + QString(i18n("MB")); lbox->addColumn(i18n("Device")); lbox->addColumn(i18n("Mount Point")); lbox->addColumn(i18n("FS Type")); + lbox->addColumn(i18n("Total Size")); + lbox->addColumn(i18n("Free Size")); lbox->addColumn(i18n("Mount Options")); - QListViewItem *olditem = 0; while (!(s = t->readLine().latin1()).isEmpty()) { - orig_line = line = strdup(s); + orig_line = line = strdup(s.ascii()); + + // the lines returned by /sbin/mount look like: + // /dev/wd0a on / type ffs (local, soft dependencies) device = strsep(&line, " "); - (void) strsep(&line, " "); // cosume word "on" + (void) strsep(&line, " "); // consume word "on" mountpoint = strsep(&line, " "); - (void) strsep(&line, " "); // cosume word "type" + (void) strsep(&line, " "); // consume word "type" type = strsep(&line, " "); - flags = line; + /* skip leading '(' and trailing ')' */ + line++; + flags = strsep(&line, ")"); + + if (statfs(mountpoint, &sfs) == 0) { + tsz = ((1LL * sfs.f_blocks * sfs.f_bsize / 1024) + 513) + / 1024; + fsz = ((1LL * sfs.f_bfree * sfs.f_bsize / 1024) + 513) + / 1024; + ok = 1; + } else { + tsz = fsz = 0; + ok = 0; + } - olditem = new QListViewItem(lbox, olditem, device, mountpoint, - type, flags); + new QListViewItem(lbox, + QString(device) + " ", + QString(mountpoint) + " ", QString(type) + " ", + (ok) ? (Value(tsz, 6) + MB) : " ", + (ok) ? (Value(fsz, 6) + MB) : " ", + flags); free(orig_line); } @