aboutsummaryrefslogtreecommitdiff
path: root/x11/kdebase4
diff options
context:
space:
mode:
authorMarkus Brueffer <markus@FreeBSD.org>2005-04-15 00:00:52 +0000
committerMarkus Brueffer <markus@FreeBSD.org>2005-04-15 00:00:52 +0000
commit849c1121a9fa164516ace2cc49b5ff8cf4845599 (patch)
tree8dc8690e49f115404770556e71ade42dc944dcc7 /x11/kdebase4
parentdc2027d6a34056403b4530185a3442f11ba28935 (diff)
downloadports-849c1121a9fa164516ace2cc49b5ff8cf4845599.tar.gz
ports-849c1121a9fa164516ace2cc49b5ff8cf4845599.zip
Notes
Diffstat (limited to 'x11/kdebase4')
-rw-r--r--x11/kdebase4/files/patch-kcontrol-info-info_fbsd.cpp60
1 files changed, 60 insertions, 0 deletions
diff --git a/x11/kdebase4/files/patch-kcontrol-info-info_fbsd.cpp b/x11/kdebase4/files/patch-kcontrol-info-info_fbsd.cpp
new file mode 100644
index 000000000000..6a166e336e35
--- /dev/null
+++ b/x11/kdebase4/files/patch-kcontrol-info-info_fbsd.cpp
@@ -0,0 +1,60 @@
+--- kcontrol/info/info_fbsd.cpp.orig Tue Feb 24 12:30:07 2004
++++ kcontrol/info/info_fbsd.cpp Thu Apr 14 22:37:54 2005
+@@ -226,18 +226,17 @@
+ {
+ FILE *pipe;
+ QFile *pcicontrol;
+- QTextStream *t;
+ QString s, cmd;
+ QListViewItem *olditem = 0;
+
+- pcicontrol = new QFile("/usr/X11R6/bin/scanpci");
++ pcicontrol = new QFile("/usr/sbin/pciconf");
+
+ if (!pcicontrol->exists()) {
+ delete pcicontrol;
+- pcicontrol = new QFile("/usr/X11R6/bin/pcitweak");
++ pcicontrol = new QFile("/usr/X11R6/bin/scanpci");
+ if (!pcicontrol->exists()) {
+ delete pcicontrol;
+- pcicontrol = new QFile("/usr/sbin/pciconf");
++ pcicontrol = new QFile("/usr/X11R6/bin/pcitweak");
+ if (!pcicontrol->exists()) {
+ QString s;
+ s = i18n("Could not find any programs with which to query your system's PCI information");
+@@ -245,13 +244,13 @@
+ delete pcicontrol;
+ return true;
+ } else {
+- cmd = "/usr/sbin/pciconf -l";
++ cmd = "/usr/X11R6/bin/pcitweak -l 2>&1";
+ }
+ } else {
+- cmd = "/usr/X11R6/bin/pcitweak -l 2>&1";
++ cmd = "/usr/X11R6/bin/scanpci";
+ }
+ } else {
+- cmd = "/usr/X11R6/bin/scanpci";
++ cmd = "/usr/sbin/pciconf -l -v 2>&1";
+ }
+ delete pcicontrol;
+
+@@ -263,17 +262,8 @@
+ /* This prints out a list of all the pci devies, perhaps eventually we could
+ parse it as opposed to schlepping it into a listbox */
+
+- t = new QTextStream(pipe, IO_ReadOnly);
+-
+- while (true) {
+- s = t->readLine();
+- if ( s.isEmpty() )
+- break;
+- olditem = new QListViewItem(lbox, olditem, s);
+- }
+-
+- delete t;
+ pclose(pipe);
++ GetInfo_ReadfromPipe(lbox, cmd.latin1(), true);
+ }
+
+ if (!lbox->childCount()) {