summaryrefslogtreecommitdiffstats
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rwxr-xr-xextra/lshw/.md5sum1
-rwxr-xr-xextra/lshw/Pkgfile3
-rw-r--r--extra/lshw/lshw-gcc-4.5.patch11
3 files changed, 14 insertions, 1 deletions
diff --git a/extra/lshw/.md5sum b/extra/lshw/.md5sum
index 76cacd755..4a9fe91f6 100755
--- a/extra/lshw/.md5sum
+++ b/extra/lshw/.md5sum
@@ -1,5 +1,6 @@
8696f9e8ecb71bedf374b538e8634d2d abi_stdlib.diff
e94c728ed037ca706436b5ef71aa392d lshw-B.02.13.tar.gz
+e6aad95dec4c5c4c9e18ed1194af7ad2 lshw-gcc-4.5.patch
2da90026aad1b4fc471502e246a0d1f3 lshw.desktop
1483092efed2bff70703ad45fb64090c lshw.png
591b7da1afece14613ef9cc24fd921a3 lshw.svg
diff --git a/extra/lshw/Pkgfile b/extra/lshw/Pkgfile
index 6c5fb06e6..11f64f571 100755
--- a/extra/lshw/Pkgfile
+++ b/extra/lshw/Pkgfile
@@ -11,11 +11,12 @@ source=(http://ezix.org/software/files/$name-$version.tar.gz \
lshw.png \
lshw.svg \
abi_stdlib.diff
-lshw.desktop)
+lshw.desktop lshw-gcc-4.5.patch)
build() {
cd $name-$version
patch -Np0 -i ../abi_stdlib.diff
+ patch -Np1 -i ../lshw-gcc-4.5.patch
sed -i 's@-g -Wall@-g -Wall -O2 -march=i686 -pipe@g' src/Makefile
sed -i 's@-g -Wall@-g -Wall -O2 -march=i686 -pipe@g' src/core/Makefile
sed -i 's@-g -Wall@-g -Wall -O2 -march=i686 -pipe@g' src/gui/Makefile
diff --git a/extra/lshw/lshw-gcc-4.5.patch b/extra/lshw/lshw-gcc-4.5.patch
new file mode 100644
index 000000000..58b53a29b
--- /dev/null
+++ b/extra/lshw/lshw-gcc-4.5.patch
@@ -0,0 +1,11 @@
+--- lshw-B.02.13-original/src/core/scsi.cc 2008-05-09 22:32:50.000000000 +0200
++++ lshw-B.02.13/src/core/scsi.cc 2010-05-19 16:58:50.000000000 +0200
+@@ -842,7 +842,7 @@
+
+ if (!controller)
+ {
+- controller = node.addChild(hwNode::hwNode("scsi", hw::storage));
++ controller = node.addChild(hwNode("scsi", hw::storage));
+ if (controller)
+ {
+ controller->setLogicalName(host_logicalname(number));