Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cead5db37ba352ab5618bbbc1d962ca354303d70
commit cead5db37ba352ab5618bbbc1d962ca354303d70 Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Apr 19 21:06:46 2010 +0200 lshw-B.02.14-2-i686 - add lshw-02.14b-gcc45.patch diff --git a/source/apps-extra/lshw/FrugalBuild b/source/apps-extra/lshw/FrugalBuild index 2b2349d..f97c29a 100644 --- a/source/apps-extra/lshw/FrugalBuild +++ b/source/apps-extra/lshw/FrugalBuild @@ -4,7 +4,7 @@ pkgname=lshw pkgver=B.02.14 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to provide information on the hardware configuration of the machine." url="http://ezix.org/project/wiki/HardwareLiSter"; license="GPL2" @@ -14,7 +14,8 @@ makedepends=('gtk+2') options=('scriptlet') depends=('libstdc++') up2date="lynx -dump $url|grep -m 1 latest|grep -o '[A-Z][0-9\.]\+[0-9]'" -source=(http://ezix.org/software/files/$pkgname-$pkgver.tar.gz gcc43_fix.patch) +source=(http://ezix.org/software/files/$pkgname-$pkgver.tar.gz \ + lshw-02.14b-gcc45.patch) subpkgs=("gtk-$pkgname") subdescs=("Gtk+2 frontend for lshw") @@ -31,7 +32,7 @@ build() { done # What.. install wants to strip a directory ... Fsed "-p -s" "-p" src/Makefile - Fpatch gcc43_fix.patch + Fpatchall Fmake Fmakeinstall Fmake gui @@ -44,6 +45,6 @@ build() { } sha1sums=('39d61aa218e0a8558417c7f95dcca90bad3d11c1' \ - '78a7882ba531f41c73383977000c63520056bad2') + '2723a297ae71d7df03579dd85a1ef4615332db85') # optimization OK diff --git a/source/apps-extra/lshw/gcc43_fix.patch b/source/apps-extra/lshw/gcc43_fix.patch deleted file mode 100644 index e729809..0000000 --- a/source/apps-extra/lshw/gcc43_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur lshw-B.02.13.orig/src/core/abi.cc lshw-B.02.13/src/core/abi.cc ---- lshw-B.02.13.orig/src/core/abi.cc 2008-05-13 23:49:54.000000000 +0200 -+++ lshw-B.02.13/src/core/abi.cc 2008-05-13 23:50:24.000000000 +0200 -@@ -7,6 +7,7 @@ - #include "version.h" - #include "abi.h" - #include "osutils.h" -+#include <cstdlib> - #include <unistd.h> - #include <dirent.h> - diff --git a/source/apps-extra/lshw/lshw-02.14b-gcc45.patch b/source/apps-extra/lshw/lshw-02.14b-gcc45.patch new file mode 100644 index 0000000..c52b312 --- /dev/null +++ b/source/apps-extra/lshw/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)); _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
