From 288161137a3d29ee6e42e8208d86203c2fef66bf Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 4 Nov 2010 15:44:42 +0100
Subject: lshw, port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extra/lshw/Pkgfile            |   6 +-
 extra/lshw/abi_stdlib.diff    |  10 --
 extra/lshw/lshw-gcc-4.5.patch |  11 --
 extra/lshw/lshw.desktop       |  10 --
 extra/lshw/lshw.png           | Bin 2360 -> 0 bytes
 extra/lshw/lshw.svg           | 253 ------------------------------------------
 6 files changed, 2 insertions(+), 288 deletions(-)
 delete mode 100755 extra/lshw/abi_stdlib.diff
 delete mode 100644 extra/lshw/lshw-gcc-4.5.patch
 delete mode 100755 extra/lshw/lshw.desktop
 delete mode 100755 extra/lshw/lshw.png
 delete mode 100755 extra/lshw/lshw.svg

(limited to 'extra')

diff --git a/extra/lshw/Pkgfile b/extra/lshw/Pkgfile
index 987a389a6..5eb585d06 100755
--- a/extra/lshw/Pkgfile
+++ b/extra/lshw/Pkgfile
@@ -8,10 +8,8 @@ name=lshw
 version=B.02.14
 release=1
 source=(http://ezix.org/software/files/$name-$version.tar.gz \
-lshw.png \
-lshw.svg \
-abi_stdlib.diff
-lshw.desktop lshw-gcc-4.5.patch)
+	http://nutyx.meticul.eu/files/patchs/$name/{lshw.png,lshw.svg,abi_stdlib.diff,\
+lshw.desktop,lshw-gcc-4.5.patch})
 
 build() {
 cd $name-$version
diff --git a/extra/lshw/abi_stdlib.diff b/extra/lshw/abi_stdlib.diff
deleted file mode 100755
index 8ab61a006..000000000
--- a/extra/lshw/abi_stdlib.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
- #include <unistd.h>
- #include <dirent.h>
-+#include <stdlib.h>
- 
- __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $");
- 
diff --git a/extra/lshw/lshw-gcc-4.5.patch b/extra/lshw/lshw-gcc-4.5.patch
deleted file mode 100644
index 58b53a29b..000000000
--- a/extra/lshw/lshw-gcc-4.5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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));
diff --git a/extra/lshw/lshw.desktop b/extra/lshw/lshw.desktop
deleted file mode 100755
index 6e8a186e6..000000000
--- a/extra/lshw/lshw.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=LSHW Hardware Lister
-Name[fr]=LSHW Liste votre Materiel
-Exec=gksu gtk-lshw
-Icon=lshw
-Terminal=false
-Type=Application
-Categories=Application;System;
-StartupNotify=true
diff --git a/extra/lshw/lshw.png b/extra/lshw/lshw.png
deleted file mode 100755
index 7f8df6647..000000000
Binary files a/extra/lshw/lshw.png and /dev/null differ
diff --git a/extra/lshw/lshw.svg b/extra/lshw/lshw.svg
deleted file mode 100755
index 97d730d85..000000000
--- a/extra/lshw/lshw.svg
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="logo.svg"
-   sodipodi:docbase="/home/support/Source/ezix-workspace/packages/lshw/development/src/gui/artwork"
-   inkscape:version="0.41"
-   sodipodi:version="0.32"
-   id="svg2"
-   height="600.00000pt"
-   width="600.00000pt">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient2218">
-      <stop
-         id="stop2220"
-         offset="0"
-         style="stop-color:#c2c2c2;stop-opacity:1;" />
-      <stop
-         id="stop2222"
-         offset="1.0000000"
-         style="stop-color:#777777;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="24.538383"
-       fy="924.92517"
-       fx="104.09782"
-       cy="925.70575"
-       cx="103.65790"
-       gradientTransform="scale(1.361999,0.734215)"
-       id="radialGradient2224"
-       xlink:href="#linearGradient2218"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="21.834162"
-       fy="945.49786"
-       fx="92.327774"
-       cy="945.16803"
-       cx="93.272804"
-       gradientTransform="scale(1.413168,0.707630)"
-       id="radialGradient2232"
-       xlink:href="#linearGradient2218"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="98"
-     inkscape:window-x="37"
-     inkscape:window-height="792"
-     inkscape:window-width="1141"
-     inkscape:current-layer="layer1"
-     inkscape:document-units="px"
-     inkscape:cy="251.34181"
-     inkscape:cx="308.44788"
-     inkscape:zoom="0.70000000"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF
-       id="RDF5">
-      <cc:Work
-         id="Work6"
-         rdf:about="">
-        <dc:format
-           id="format7">image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage"
-           id="type9" />
-        <dc:title
-           id="title2085">LSHW logo</dc:title>
-        <dc:date
-           id="date2087">2005/07/15</dc:date>
-        <dc:creator
-           id="creator2089">
-          <cc:Agent
-             id="Agent2091">
-            <dc:title
-               id="title2093">Lyonel Vincent</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:publisher
-           id="publisher2095">
-          <cc:Agent
-             id="Agent2097">
-            <dc:title
-               id="title2099">ezIX.org</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier
-           id="identifier2101">logo</dc:identifier>
-        <dc:source
-           id="source2103">$Id: logo.svg 1959 2008-05-09 20:32:50Z lyonel $</dc:source>
-        <dc:language
-           id="language2105">C</dc:language>
-        <dc:subject
-           id="subject2107">
-          <rdf:Bag
-             id="Bag2109">
-            <rdf:li
-               id="li1372">lshw logo diagnostics</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/"
-           id="license2125" />
-      </cc:Work>
-      <cc:License
-         id="License2127"
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           id="permits2129"
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           id="permits2131"
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           id="requires2133"
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           id="permits2135"
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           id="requires2137"
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           id="requires2139"
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1">
-    <path
-       transform="matrix(0.933830,0.000000,0.000000,0.933830,3.800012,73.07569)"
-       d="M 768.57144 327.14285 A 365.71429 365.71429 0 1 1  37.142853,327.14285 A 365.71429 365.71429 0 1 1  768.57144 327.14285 z"
-       sodipodi:ry="365.71429"
-       sodipodi:rx="365.71429"
-       sodipodi:cy="327.14285"
-       sodipodi:cx="402.85715"
-       id="path2143"
-       style="stroke-dashoffset:0.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-linejoin:round;stroke-linecap:round;stroke-width:26.771467;stroke:#000000;fill-rule:nonzero;fill-opacity:1.0000000;fill:#ffb200"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="czzz"
-       id="path1321"
-       d="M 517.14221,161.48823 C 500.33905,141.43139 462.89203,126.44234 437.58302,167.88598 C 412.82609,208.42560 442.45806,242.24265 430.24120,283.77595 C 418.16157,324.84265 396.78673,340.73407 350.34175,376.78273"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#949494;stroke-width:16.826393;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="czzz"
-       id="path2088"
-       d="M 602.59875,240.16689 C 623.39480,256.04605 640.06158,292.77709 599.80458,319.93398 C 560.42574,346.49848 525.30355,318.42575 484.36507,332.50793 C 443.88651,346.43192 428.97774,368.50338 395.06582,416.53071"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#949494;stroke-width:16.826393;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="cc"
-       id="path2092"
-       d="M 437.74888,242.98782 C 437.80171,290.50241 468.45501,324.29635 522.31243,322.31184"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#949494;stroke-width:8.9740763;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="czzz"
-       id="path2094"
-       d="M 346.56375,379.16757 C 331.05665,393.82414 299.49609,404.62870 299.97314,420.07332 C 300.45019,435.51794 332.90815,470.03747 349.35677,468.77133 C 365.80538,467.50519 379.98282,433.59136 396.41885,414.82641"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:22.400000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
-    <path
-       sodipodi:nodetypes="czzz"
-       id="path2098"
-       d="M 318.30128,451.08052 C 291.12281,480.56237 252.22438,513.13655 290.19105,563.60838 C 327.61337,613.35657 366.22993,589.69063 361.23775,553.57124 C 356.15470,516.79455 247.74252,403.62782 164.98527,415.46260"
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:22.400000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" />
-    <g
-       transform="matrix(0.548322,0.524067,-0.524067,0.548322,417.7587,-30.92536)"
-       id="g2117">
-      <path
-         sodipodi:nodetypes="czzzz"
-         id="path2109"
-         d="M 258.57143,85.714286 C 262.61905,81.190477 275.27399,77.229515 279.32161,81.515229 C 283.36922,85.800943 283.45588,99.170170 279.40826,103.69398 C 275.36065,108.21779 262.61905,104.28571 258.57143,100.00000 C 254.52381,95.714286 254.52381,90.238095 258.57143,85.714286 z "
-         style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
-      <path
-         transform="matrix(0.195122,0.000000,0.000000,0.292929,218.9197,60.03110)"
-         d="M 314.66250 111.33105 A 20.708128 25.001276 0 1 1  273.24625,111.33105 A 20.708128 25.001276 0 1 1  314.66250 111.33105 z"
-         sodipodi:ry="25.001276"
-         sodipodi:rx="20.708128"
-         sodipodi:cy="111.33105"
-         sodipodi:cx="293.95438"
-         id="path2111"
-         style="fill:#c2c2c2;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.2500000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-         sodipodi:type="arc" />
-    </g>
-    <g
-       transform="matrix(0.548322,0.524067,-0.524067,0.548322,417.7587,-30.92536)"
-       id="g2121">
-      <path
-         sodipodi:nodetypes="czzzz"
-         id="path2113"
-         d="M 428.47696,82.683828 C 424.42934,78.160019 411.77440,74.199057 407.72678,78.484771 C 403.67917,82.770485 403.59251,96.139712 407.64013,100.66352 C 411.68774,105.18733 424.42934,101.25525 428.47696,96.969542 C 432.52458,92.683828 432.52458,87.207637 428.47696,82.683828 z "
-         style="fill:#000000;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" />
-      <path
-         transform="matrix(0.195122,0.000000,0.000000,0.292929,353.7751,57.50572)"
-         d="M 314.66250 111.33105 A 20.708128 25.001276 0 1 1  273.24625,111.33105 A 20.708128 25.001276 0 1 1  314.66250 111.33105 z"
-         sodipodi:ry="25.001276"
-         sodipodi:rx="20.708128"
-         sodipodi:cy="111.33105"
-         sodipodi:cx="293.95438"
-         id="path2115"
-         style="fill:#c2c2c2;fill-opacity:1.0000000;fill-rule:nonzero;stroke:none;stroke-width:1.2500000;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-         sodipodi:type="arc" />
-    </g>
-    <path
-       transform="matrix(1.370962,1.310318,-1.310318,1.370962,806.0717,-681.5786)"
-       d="M 176.77669 668.93524 A 29.799500 14.394673 0 1 1  117.17769,668.93524 A 29.799500 14.394673 0 1 1  176.77669 668.93524 z"
-       sodipodi:ry="14.394673"
-       sodipodi:rx="29.799500"
-       sodipodi:cy="668.93524"
-       sodipodi:cx="146.97719"
-       id="path2127"
-       style="stroke-dasharray:none;fill:url(#radialGradient2224);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:7.2435155;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(1.017413,0.972407,-0.972407,1.017413,646.9993,-410.1590)"
-       d="M 176.77669 668.93524 A 29.799500 14.394673 0 1 1  117.17769,668.93524 A 29.799500 14.394673 0 1 1  176.77669 668.93524 z"
-       sodipodi:ry="14.394673"
-       sodipodi:rx="29.799500"
-       sodipodi:cy="668.93524"
-       sodipodi:cx="146.97719"
-       id="path2131"
-       style="stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-linejoin:round;stroke-linecap:square;stroke-width:2.1116693;stroke:#000000;fill-rule:nonzero;fill-opacity:1.0000000;fill:#c2c2c2;stroke-dasharray:none"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.845659,0.808251,-0.808251,0.845659,563.7956,-272.5651)"
-       d="M 176.77669 668.93524 A 29.799500 14.394673 0 1 1  117.17769,668.93524 A 29.799500 14.394673 0 1 1  176.77669 668.93524 z"
-       sodipodi:ry="14.394673"
-       sodipodi:rx="29.799500"
-       sodipodi:cy="668.93524"
-       sodipodi:cx="146.97719"
-       id="path2125"
-       style="stroke-dasharray:none;fill:url(#radialGradient2232);fill-opacity:1.0;fill-rule:nonzero;stroke:#000000;stroke-width:2.1116693;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       sodipodi:type="arc" />
-  </g>
-</svg>
-- 
cgit v1.2.3-70-g09d2