From 60eaf0fc6474d6bc07a202890b500280330a971a Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Wed, 19 May 2010 17:12:08 +0200
Subject: ajout de lshw#B.02.13-1

---
 extra/lshw/.md5sum            |  1 +
 extra/lshw/Pkgfile            |  3 ++-
 extra/lshw/lshw-gcc-4.5.patch | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 extra/lshw/lshw-gcc-4.5.patch

(limited to 'extra')

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));
-- 
cgit v1.2.3-54-g00ecf