From b2e3cb5bbcbe66ec01935ad26ecb97b00b9f5ea4 Mon Sep 17 00:00:00 2001
From: Michael Hanson <hansonorders@verizon.net>
Date: Tue, 16 Nov 2010 03:33:45 +0000
Subject: lshw: upgrade to latest
---
abs/core/lshw/PKGBUILD | 28 ++++++++++++++++++----------
abs/core/lshw/abi_stdlib.diff | 21 +++++++++++++++++----
2 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/abs/core/lshw/PKGBUILD b/abs/core/lshw/PKGBUILD
index b2d786b..6d76925 100644
--- a/abs/core/lshw/PKGBUILD
+++ b/abs/core/lshw/PKGBUILD
@@ -1,26 +1,34 @@
+# $Id: PKGBUILD 29087 2010-10-10 07:47:30Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Stefano Zamprogno <stefano dot zamprogno at gmail dot com>
# Contributor: Chuck Yang <Chuck.Yang@gmail.com>
pkgname=lshw
-pkgver=B.02.13
+pkgver=B.02.15
pkgrel=1
pkgdesc="A small tool to provide detailed information on the hardware configuration of the machine."
url="http://ezix.org/project/wiki/HardwareLiSter"
license=('GPL')
-source=(http://ezix.org/software/files/lshw-B.02.13.tar.gz abi_stdlib.diff)
-md5sums=('e94c728ed037ca706436b5ef71aa392d' '8696f9e8ecb71bedf374b538e8634d2d')
arch=('i686' 'x86_64')
-depends=('gtk2')
+depends=('gcc-libs')
+optdepends=('gtk2')
makedepends=('gcc')
+source=(http://ezix.org/software/files/lshw-$pkgver.tar.gz
+ abi_stdlib.diff)
+md5sums=('970bd9eb05fa3ae139a24a417465c54c'
+ '7adcdd7a2be2feba956a9832cf36abdf')
build() {
- cd $startdir/src/$pkgname-$pkgver
+ cd $srcdir/$pkgname-$pkgver
- patch -Np0 -i ../abi_stdlib.diff || return 1
+# patch -Np1 -i ../abi_stdlib.diff || return 1
- make || return 1
- make gui || return 1
- make DESTDIR=$startdir/pkg/ install
- make DESTDIR=$startdir/pkg/ install-gui
+ make || return 1
+ make gui || return 1
+}
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir/ install || return 1
+ make DESTDIR=$pkgdir/ install-gui || return 1
}
diff --git a/abs/core/lshw/abi_stdlib.diff b/abs/core/lshw/abi_stdlib.diff
index 8ab61a0..ffe88d1 100644
--- a/abs/core/lshw/abi_stdlib.diff
+++ b/abs/core/lshw/abi_stdlib.diff
@@ -1,10 +1,23 @@
---- src/core/abi.cc 2008-05-24 22:30:21.000000000 -0500
-+++ src/core/abi.cc 2008-05-24 22:29:28.000000000 -0500
-@@ -9,6 +9,7 @@
- #include "osutils.h"
+diff -wbBur lshw-B.02.14/src/core/abi.cc lshw-B.02.14.my//src/core/abi.cc
+--- lshw-B.02.14/src/core/abi.cc 2009-02-12 22:53:09.000000000 +0000
++++ lshw-B.02.14.my//src/core/abi.cc 2010-05-24 14:30:18.000000000 +0000
+@@ -10,6 +10,7 @@
#include <unistd.h>
+ #include <stdlib.h>
#include <dirent.h>
+#include <stdlib.h>
__ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
+diff -wbBur lshw-B.02.14/src/core/scsi.cc lshw-B.02.14.my//src/core/scsi.cc
+--- lshw-B.02.14/src/core/scsi.cc 2009-02-12 22:53:09.000000000 +0000
++++ lshw-B.02.14.my//src/core/scsi.cc 2010-05-24 14:32:13.000000000 +0000
+@@ -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 v0.12