mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-05 11:35:01 +00:00
Code Issues Releases Activity

Add patch to fix the kinfocenter PCI module (KDE Bug 101686)

Browse Source 
Reported by:	Steven Earl Smith
This commit is contained in:
Markus Brueffer 2005-04-15 00:00:52 +00:00
parent dc2027d6a3
commit 849c1121a9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=133369
7 changed files with 420 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
x11/kde4-baseapps/files/patch-kcontrol-info-info_fbsd.cpp Normal file
View File

@ -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()) {

60
x11/kde4-runtime/files/patch-kcontrol-info-info_fbsd.cpp Normal file
View File

@ -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()) {

60
x11/kde4-workspace/files/patch-kcontrol-info-info_fbsd.cpp Normal file
View File

@ -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()) {

60
x11/kdebase3/files/patch-kcontrol-info-info_fbsd.cpp Normal file
View File

@ -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()) {

60
x11/kdebase4-runtime/files/patch-kcontrol-info-info_fbsd.cpp Normal file
View File

@ -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()) {

60
x11/kdebase4-workspace/files/patch-kcontrol-info-info_fbsd.cpp Normal file
View File

@ -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()) {

60
x11/kdebase4/files/patch-kcontrol-info-info_fbsd.cpp Normal file
View File

@ -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()) {