[arch-commits] Commit in hardinfo/trunk (4 files)

[Evangelos Foutras]

    Date: Wednesday, October 24, 2018 @ 12:51:44
  Author: foutrelis
Revision: 398815

upgpkg: hardinfo 0.5.1.816.g877ea2b-1

Bump to latest git snapshot; fixes build issue with meson-based glib2.

Modified:
  hardinfo/trunk/PKGBUILD
Deleted:
  hardinfo/trunk/fixsensors.patch
  hardinfo/trunk/hardinfo-gnu89.patch
  hardinfo/trunk/hardinfo.distro

----------------------+
 PKGBUILD             |   40 ++++++++++++++++++++--------------------
 fixsensors.patch     |   13 -------------
 hardinfo-gnu89.patch |   12 ------------
 hardinfo.distro      |    1 -
 4 files changed, 20 insertions(+), 46 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-24 12:28:10 UTC (rev 398814)
+++ PKGBUILD	2018-10-24 12:51:44 UTC (rev 398815)
@@ -1,38 +1,38 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=hardinfo
-pkgver=0.5.1
-pkgrel=8
+pkgver=0.5.1.816.g877ea2b
+_commit=877ea2bc7777626c6fe77b6934a09261f1f1409e
+pkgrel=1
 pkgdesc="A system information and benchmark tool."
 arch=('x86_64')
 url="https://github.com/lpereira/hardinfo"
 license=('GPL2')
-depends=('gtk2' 'libsoup')
-options=('!emptydirs')
-source=(http://sourceforge.net/projects/hardinfo.berlios/files/${pkgname}-${pkgver}.tar.bz2
-        fixsensors.patch hardinfo.distro hardinfo-gnu89.patch)
-sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
-          'd2151dce76dca238102937d0e15541f172bca530'
-          '4c31cbbfbdeb48593641ff600c8d4fb7bda2b01c'
-          '7807fb252ad8391b61dfe1c3883ecdc232814091')
+depends=('gtk2')
+makedepends=('cmake' 'git')
+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",       "arch"  },{ 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"
 }

Deleted: fixsensors.patch
===================================================================
--- fixsensors.patch	2018-10-24 12:28:10 UTC (rev 398814)
+++ fixsensors.patch	2018-10-24 12:51:44 UTC (rev 398815)
@@ -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;
-     }

Deleted: hardinfo-gnu89.patch
===================================================================
--- hardinfo-gnu89.patch	2018-10-24 12:28:10 UTC (rev 398814)
+++ hardinfo-gnu89.patch	2018-10-24 12:51:44 UTC (rev 398815)
@@ -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
- 

Deleted: hardinfo.distro
===================================================================
--- hardinfo.distro	2018-10-24 12:28:10 UTC (rev 398814)
+++ hardinfo.distro	2018-10-24 12:51:44 UTC (rev 398815)
@@ -1 +0,0 @@
-Arch Linux