diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
commit | f5e137fdf748b757bacfc50577e5d48a693d31c4 (patch) | |
tree | c75bdfef17b69eff3b8bb20b285c880d7f9183c0 /community/hardinfo | |
parent | 300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff) | |
parent | dd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chntpw/PKGBUILD
community/hardinfo/PKGBUILD
community/obconf/obconf.install
community/xplc/PKGBUILD
community/zziplib/PKGBUILD
core/rp-pppoe/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/icon-naming-utils/PKGBUILD
extra/lxmenu-data/PKGBUILD
extra/openbox/PKGBUILD
extra/phonon-xine/PKGBUILD
extra/qt/PKGBUILD
extra/zope-interface/PKGBUILD
libre/pacman/PKGBUILD
libre/pacman/pacman.conf.mips64el
libre/pacman/rePKGBUILD
testing/coreutils/PKGBUILD
testing/net-tools/PKGBUILD
Diffstat (limited to 'community/hardinfo')
-rw-r--r-- | community/hardinfo/ChangeLog | 20 | ||||
-rw-r--r-- | community/hardinfo/PKGBUILD | 36 | ||||
-rw-r--r-- | community/hardinfo/fixsensors.patch | 13 | ||||
-rw-r--r-- | community/hardinfo/hardinfo.distro | 1 |
4 files changed, 0 insertions, 70 deletions
diff --git a/community/hardinfo/ChangeLog b/community/hardinfo/ChangeLog deleted file mode 100644 index faf242a7b..000000000 --- a/community/hardinfo/ChangeLog +++ /dev/null @@ -1,20 +0,0 @@ -2009-04-06 Eric Belanger <eric@archlinux.org> - - * hardinfo 0.5.1-1 - * Upstream update - -2009-03-29 Eric Belanger <eric@archlinux.org> - - * hardinfo 0.5c-1 - * Upstream update - -2008-08-13 Eric Belanger <eric@archlinux.org> - - * hardinfo 0.4.2.3-3 - * Rebuilt against gnutls 2.4.1 - -2008-04-06 Eric Belanger <eric@archlinux.org> - - * hardinfo 0.4.2.3-2 - * Rebuilt against libsoup 2.4 - * Added ChangeLog diff --git a/community/hardinfo/PKGBUILD b/community/hardinfo/PKGBUILD deleted file mode 100644 index e97e66584..000000000 --- a/community/hardinfo/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 17993 2010-05-29 04:49:43Z ebelanger $ -# Maintainer: Eric Belanger <eric@archlinux.org> - -pkgname=hardinfo -pkgver=0.5.1 -pkgrel=2 -pkgdesc="A system information and benchmark tool." -arch=('i686' 'x86_64' 'mips64el') -url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" -license=('GPL2') -depends=('gtk2' 'libsoup' 'gnutls') -options=('!emptydirs') -source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \ - fixsensors.patch hardinfo.distro) -md5sums=('6fb38992e140f2fab16518ae1f38e188' '05c212db07b9f152cdea052ff7bb28fa'\ - 'ab8a557d10f74bec5c94ed6cae34729c') -sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64' 'd2151dce76dca238102937d0e15541f172bca530'\ - '4c31cbbfbdeb48593641ff600c8d4fb7bda2b01c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../fixsensors.patch || return 1 - sed -i 's|/usr/lib64|/usr/lib|' configure || return 1 - ./configure --prefix=/usr || return 1 - sed -i 's|lib64|lib|' binreloc.c || return 1 - sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/linux/{parisc,ppc,m68k,x86,common,mips,sparc,x86_64}/modules.h || return 1 - sed -i 's|/sbin/lsmod|/bin/lsmod|g' arch/this/modules.h || return 1 - sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "arch" },{ DB_PREFIX "debian_version", "deb" },|' computer.h || return 1 - make || return 1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro" || return 1 -} diff --git a/community/hardinfo/fixsensors.patch b/community/hardinfo/fixsensors.patch deleted file mode 100644 index 812c29458..000000000 --- a/community/hardinfo/fixsensors.patch +++ /dev/null @@ -1,13 +0,0 @@ - diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c ---- hardinfo-0.4.2.2.orign/util.c 2007-07-20 16:45:08.000000000 +0200 -+++ hardinfo-0.4.2.2/util.c 2007-07-26 10:15:32.000000000 +0200 -@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo - if (source) { - retn = g_strconcat(source, buffer, NULL); - g_free(buffer); -- g_free(source); -+ if(strlen(source)) -+ g_free(source); - } else { - retn = buffer; - } diff --git a/community/hardinfo/hardinfo.distro b/community/hardinfo/hardinfo.distro deleted file mode 100644 index 850183eeb..000000000 --- a/community/hardinfo/hardinfo.distro +++ /dev/null @@ -1 +0,0 @@ -Arch Linux |