diff options
| -rw-r--r-- | libre/hardinfo/PKGBUILD | 45 | ||||
| -rw-r--r-- | libre/hardinfo/fixsensors.patch | 13 | ||||
| -rw-r--r-- | libre/hardinfo/hardinfo-gnu89.patch | 12 | ||||
| -rw-r--r-- | libre/hardinfo/hardinfo.distro | 1 |
4 files changed, 22 insertions, 49 deletions
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD index 42203f403..a27009609 100644 --- a/libre/hardinfo/PKGBUILD +++ b/libre/hardinfo/PKGBUILD @@ -1,45 +1,44 @@ -# $Id # Maintainer (Arch): Eric Bélanger <eric@archlinux.org> # Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> pkgname=hardinfo -pkgver=0.5.1 -pkgrel=8 -pkgrel+=.parabola1 +pkgver=0.5.1.816.g877ea2b +_commit=877ea2bc7777626c6fe77b6934a09261f1f1409e +pkgrel=1 +pkgrel+=.par1 pkgdesc="A system information and benchmark tool." pkgdesc+="(Parabola rebranded)" arch=('x86_64') arch+=('i686' 'armv7h') url="https://github.com/lpereira/hardinfo" license=('GPL2') -depends=('gtk2' 'libsoup') -depends+=('icu>=62' 'icu<63') -options=('!emptydirs') -source=(http://sourceforge.net/projects/hardinfo.berlios/files/${pkgname}-${pkgver}.tar.bz2 - fixsensors.patch hardinfo.distro hardinfo-gnu89.patch) -sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64' - 'd2151dce76dca238102937d0e15541f172bca530' - '9425e09191cd3a365a3afce57ca1973a6439fa57' - '7807fb252ad8391b61dfe1c3883ecdc232814091') +depends=('gtk2') +makedepends=('cmake' 'git') +depends+=('icu>=63' 'icu<64') +source=($pkgname::git+https://github.com/lpereira/hardinfo#commit=$_commit) +sha1sums=('SKIP') + +pkgver() { + cd $pkgname + git describe --long | sed "s/^release-//;s/^0.5-/0.5.1-/;s/-/./g" +} prepare() { - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}/fixsensors.patch" - sed -i 's|/usr/lib64|/usr/lib|' configure - sed -i 's|lib64|lib|' binreloc.c - sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "parabola" },{ DB_PREFIX "debian_version", "deb" },|' computer.h - patch -p1 -i ../hardinfo-gnu89.patch # Fix build (Debian) + cd ${pkgname} + mkdir build } build() { - cd ${pkgname}-${pkgver} - ./configure --prefix=/usr + cd ${pkgname}/build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + .. make } package() { - cd ${pkgname}-${pkgver} + cd ${pkgname}/build make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/hardinfo.distro" "${pkgdir}/etc/hardinfo.distro" } diff --git a/libre/hardinfo/fixsensors.patch b/libre/hardinfo/fixsensors.patch deleted file mode 100644 index 812c29458..000000000 --- a/libre/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/libre/hardinfo/hardinfo-gnu89.patch b/libre/hardinfo/hardinfo-gnu89.patch deleted file mode 100644 index d9f78e535..000000000 --- a/libre/hardinfo/hardinfo-gnu89.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Makefile.in b/Makefile.in -index 03a9df8..2c69fe9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -1,6 +1,6 @@ - - CCFLAGS = -fPIC -pipe -Wall -g --CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -+CFLAGS = $(GTK_CFLAGS) $(SOUP_CFLAGS) -I. -std=gnu89 - CC = gcc $(ARCHOPTS) -g - CCSLOW = gcc -O0 -g - diff --git a/libre/hardinfo/hardinfo.distro b/libre/hardinfo/hardinfo.distro deleted file mode 100644 index cf378523a..000000000 --- a/libre/hardinfo/hardinfo.distro +++ /dev/null @@ -1 +0,0 @@ -Parabola GNU/Linux-Libre |