From a16081e41beeb58c55a0ed1187cc4e79ec32368f Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Sat, 9 Mar 2019 02:14:12 -0300
Subject: [PATCH] hardinfo: fix runtime issues

closes #7117
---
 srcpkgs/hardinfo/patches/fix-runtime.patch    | 56 +++++++++++++++++++
 srcpkgs/hardinfo/patches/hardinfo-0.5.1.patch | 35 ------------
 srcpkgs/hardinfo/template                     |  4 +-
 3 files changed, 58 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/hardinfo/patches/fix-runtime.patch
 delete mode 100644 srcpkgs/hardinfo/patches/hardinfo-0.5.1.patch

diff --git a/srcpkgs/hardinfo/patches/fix-runtime.patch b/srcpkgs/hardinfo/patches/fix-runtime.patch
new file mode 100644
index 00000000000..0c7b72d5a93
--- /dev/null
+++ b/srcpkgs/hardinfo/patches/fix-runtime.patch
@@ -0,0 +1,56 @@
+diff --git hardinfo.h hardinfo.h
+index 9f52f63..aeb84d9 100644
+--- hardinfo.h
++++ hardinfo.h
+@@ -64,8 +64,8 @@ struct _ModuleAbout {
+ };
+ 
+ /* String utility functions */
+-inline void  remove_quotes(gchar *str);
+-inline char *strend(gchar *str, gchar chr);
++void  remove_quotes(gchar *str);
++char *strend(gchar *str, gchar chr);
+ inline void  remove_linefeed(gchar *str);
+ gchar       *strreplace(gchar *string, gchar *replace, gchar new_char);
+ 
+@@ -91,7 +91,7 @@ gpointer __idle_free(gpointer ptr, gchar *f, gint l);
+ 
+ 
+ gchar	     *find_program(gchar *program_name);
+-inline gchar *size_human_readable(gfloat size);
++gchar        *size_human_readable(gfloat size);
+ void          nonblock_sleep(guint msec);
+ void          open_url(gchar *url);
+ GSList	     *modules_load_selected(void);
+diff --git util.c util.c
+index 266ce4e..e6c81fd 100644
+--- util.c
++++ util.c
+@@ -111,7 +111,7 @@ gchar *seconds_to_string(unsigned int seconds)
+ 			   plural(hours), minutes, plural(minutes));
+ }
+ 
+-inline gchar *size_human_readable(gfloat size)
++gchar *size_human_readable(gfloat size)
+ {
+     if (size < KiB)
+ 	return g_strdup_printf("%.1f B", size);
+@@ -123,7 +123,7 @@ inline gchar *size_human_readable(gfloat size)
+     return g_strdup_printf("%.1f GiB", size / GiB);
+ }
+ 
+-inline char *strend(gchar * str, gchar chr)
++char *strend(gchar * str, gchar chr)
+ {
+     if (!str)
+ 	return NULL;
+@@ -135,7 +135,7 @@ inline char *strend(gchar * str, gchar chr)
+     return str;
+ }
+ 
+-inline void remove_quotes(gchar * str)
++void remove_quotes(gchar * str)
+ {
+     if (!str)
+ 	return;
+
diff --git a/srcpkgs/hardinfo/patches/hardinfo-0.5.1.patch b/srcpkgs/hardinfo/patches/hardinfo-0.5.1.patch
deleted file mode 100644
index 1808a89d8ba..00000000000
--- a/srcpkgs/hardinfo/patches/hardinfo-0.5.1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f11d5624be68e95e9c2a8c7779b182ef97b7973c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
-Date: Fri, 30 Nov 2018 11:29:13 +0100
-Subject: [PATCH] Fix inline strend
-
-
-diff --git hardinfo.h hardinfo.h
-index 9f52f63..6c7044d 100644
---- hardinfo.h
-+++ hardinfo.h
-@@ -65,7 +65,7 @@ struct _ModuleAbout {
- 
- /* String utility functions */
- inline void  remove_quotes(gchar *str);
--inline char *strend(gchar *str, gchar chr);
-+char *strend(gchar *str, gchar chr);
- inline void  remove_linefeed(gchar *str);
- gchar       *strreplace(gchar *string, gchar *replace, gchar new_char);
- 
-diff --git util.c util.c
-index 266ce4e..068889f 100644
---- util.c
-+++ util.c
-@@ -123,7 +123,7 @@ inline gchar *size_human_readable(gfloat size)
-     return g_strdup_printf("%.1f GiB", size / GiB);
- }
- 
--inline char *strend(gchar * str, gchar chr)
-+char *strend(gchar * str, gchar chr)
- {
-     if (!str)
- 	return NULL;
--- 
-2.19.1
-
diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template
index d7621ba129a..e2b5a58107f 100644
--- a/srcpkgs/hardinfo/template
+++ b/srcpkgs/hardinfo/template
@@ -1,12 +1,12 @@
 # Template file for 'hardinfo'
 pkgname=hardinfo
 version=0.5.1
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="gtk+-devel libsoup-devel desktop-file-utils"
 depends="desktop-file-utils"
-short_desc="A system information and benchmark tool"
+short_desc="System information and benchmark tool"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="http://sourceforge.net/projects/hardinfo.berlios/"