Fix build w/ GCC 4.5. (bug #314201 by Bernd Buschinski)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 358148f72f679d918b8ee884017d3817f88bdb30..1e9c2db0f8f7f662fd8bd7ff926271304148b6cc 100644 (file)
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.81 2010/04/04 15:22:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.82 2010/04/11 20:33:36 dirtyepic Exp $
+
+  11 Apr 2010; Ryan Hill <dirtyepic@gentoo.org> lshw-02.14b.ebuild,
+  +files/lshw-02.14b-gcc45.patch:
+  Fix build w/ GCC 4.5. (bug #314201 by Bernd Buschinski)
 
   04 Apr 2010; Raúl Porcel <armin76@gentoo.org> lshw-02.14b.ebuild:
   alpha/ia64/sparc stable wrt #304881

diff --git a/sys-apps/lshw/files/lshw-02.14b-gcc45.patch b/sys-apps/lshw/files/lshw-02.14b-gcc45.patch
new file mode 100644 (file)
index 0000000..c52b312
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.14b-gcc45.patch
@@ -0,0 +1,15 @@
+http://ezix.org/project/ticket/512
+http://ezix.org/project/changeset/2147
+http://bugs.gentoo.org/314201
+
+--- src/core/scsi.cc
++++ src/core/scsi.cc
+@@ -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));

diff --git a/sys-apps/lshw/lshw-02.14b.ebuild b/sys-apps/lshw/lshw-02.14b.ebuild
index 5a81186fd18bc7094830f1eb4009be0728646fe1..aeb8b24a6946ed45618b1710f5863f6a7b01c54b 100644 (file)
--- a/sys-apps/lshw/lshw-02.14b.ebuild
+++ b/sys-apps/lshw/lshw-02.14b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.14b.ebuild,v 1.6 2010/04/04 15:22:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.14b.ebuild,v 1.7 2010/04/11 20:33:36 dirtyepic Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -26,6 +26,7 @@ src_unpack() {
        unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/${PN}-02.12.01b-build.patch
+       epatch "${FILESDIR}"/${P}-gcc45.patch # 314201 - fixed for 02.15b
 }
 
 src_compile() {