[arch-commits] Commit in hardinfo/repos/community-x86_64 (7 files)

Antonio Rojas arojas at archlinux.org
Thu Jun 7 20:26:00 UTC 2018


    Date: Thursday, June 7, 2018 @ 20:25:59
  Author: arojas
Revision: 341906

archrelease: copy trunk to community-x86_64

Added:
  hardinfo/repos/community-x86_64/PKGBUILD
    (from rev 341905, hardinfo/trunk/PKGBUILD)
  hardinfo/repos/community-x86_64/fixsensors.patch
    (from rev 341905, hardinfo/trunk/fixsensors.patch)
  hardinfo/repos/community-x86_64/hardinfo-gnu89.patch
    (from rev 341905, hardinfo/trunk/hardinfo-gnu89.patch)
  hardinfo/repos/community-x86_64/hardinfo.distro
    (from rev 341905, hardinfo/trunk/hardinfo.distro)
Deleted:
  hardinfo/repos/community-x86_64/PKGBUILD
  hardinfo/repos/community-x86_64/fixsensors.patch
  hardinfo/repos/community-x86_64/hardinfo.distro

----------------------+
 PKGBUILD             |   76 +++++++++++++++++++++++++------------------------
 fixsensors.patch     |   26 ++++++++--------
 hardinfo-gnu89.patch |   12 +++++++
 hardinfo.distro      |    2 -
 4 files changed, 65 insertions(+), 51 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-07 20:25:30 UTC (rev 341905)
+++ PKGBUILD	2018-06-07 20:25:59 UTC (rev 341906)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=hardinfo
-pkgver=0.5.1
-pkgrel=6
-pkgdesc="A system information and benchmark tool."
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/hardinfo.berlios/"
-license=('GPL2')
-depends=('gtk2' 'libsoup')
-options=('!emptydirs')
-source=(http://sourceforge.net/projects/hardinfo.berlios/files/${pkgname}-${pkgver}.tar.bz2
-        fixsensors.patch hardinfo.distro)
-sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64'
-          'd2151dce76dca238102937d0e15541f172bca530'
-          '4c31cbbfbdeb48593641ff600c8d4fb7bda2b01c')
-
-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
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/hardinfo.distro" "${pkgdir}/etc/hardinfo.distro"
-}

Copied: hardinfo/repos/community-x86_64/PKGBUILD (from rev 341905, hardinfo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-07 20:25:59 UTC (rev 341906)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=hardinfo
+pkgver=0.5.1
+pkgrel=7
+pkgdesc="A system information and benchmark tool."
+arch=('x86_64')
+url="http://sourceforge.net/projects/hardinfo.berlios/"
+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')
+
+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)
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  CFLAGS+=' -gnu89' make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 "${srcdir}/hardinfo.distro" "${pkgdir}/etc/hardinfo.distro"
+}

Deleted: fixsensors.patch
===================================================================
--- fixsensors.patch	2018-06-07 20:25:30 UTC (rev 341905)
+++ fixsensors.patch	2018-06-07 20:25:59 UTC (rev 341906)
@@ -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;
-     }

Copied: hardinfo/repos/community-x86_64/fixsensors.patch (from rev 341905, hardinfo/trunk/fixsensors.patch)
===================================================================
--- fixsensors.patch	                        (rev 0)
+++ fixsensors.patch	2018-06-07 20:25:59 UTC (rev 341906)
@@ -0,0 +1,13 @@
+ 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;
+     }

Copied: hardinfo/repos/community-x86_64/hardinfo-gnu89.patch (from rev 341905, hardinfo/trunk/hardinfo-gnu89.patch)
===================================================================
--- hardinfo-gnu89.patch	                        (rev 0)
+++ hardinfo-gnu89.patch	2018-06-07 20:25:59 UTC (rev 341906)
@@ -0,0 +1,12 @@
+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-06-07 20:25:30 UTC (rev 341905)
+++ hardinfo.distro	2018-06-07 20:25:59 UTC (rev 341906)
@@ -1 +0,0 @@
-Arch Linux

Copied: hardinfo/repos/community-x86_64/hardinfo.distro (from rev 341905, hardinfo/trunk/hardinfo.distro)
===================================================================
--- hardinfo.distro	                        (rev 0)
+++ hardinfo.distro	2018-06-07 20:25:59 UTC (rev 341906)
@@ -0,0 +1 @@
+Arch Linux



More information about the arch-commits mailing list