Merge changes from Ubuntu.

1 files changed, 46 insertions, 0 deletions

diff --git a/debian/patches/fix-ftbfs-shared-symbols.diff b/debian/patches/fix-ftbfs-shared-symbols.diff
new file mode 100644
index 00000000..a25b3321
--- /dev/null
+++ b/debian/patches/fix-ftbfs-shared-symbols.diff
@@ -0,0 +1,46 @@
+Description: Make the strend function accessible
+ This patch makes the strend function accessible by removing the `inline`
+ prefix.
+Author: Simon Quigley <tsimonq2@ubuntu.com>
+Last-Update: 2017-06-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+---
+--- a/hardinfo/util.c
++++ b/hardinfo/util.c
+@@ -113,7 +113,7 @@ gchar *seconds_to_string(unsigned int se
+     return g_strdup_printf(wdays, whours, wminutes);
+ }
+ 
+-inline gchar *size_human_readable(gfloat size)
++gchar *size_human_readable(gfloat size)
+ {
+     if (size < KiB)
+ 	return g_strdup_printf(_("%.1f B"), size);
+@@ -129,7 +129,7 @@ inline gchar *size_human_readable(gfloat
+     return g_strdup_printf(_("%.1f PiB"), size / PiB);
+ }
+ 
+-inline char *strend(gchar * str, gchar chr)
++char *strend(gchar * str, gchar chr)
+ {
+     if (!str)
+ 	return NULL;
+@@ -141,7 +141,7 @@ inline char *strend(gchar * str, gchar c
+     return str;
+ }
+ 
+-inline void remove_quotes(gchar * str)
++void remove_quotes(gchar * str)
+ {
+     if (!str)
+ 	return;
+@@ -152,7 +152,7 @@ inline void remove_quotes(gchar * str)
+     strend(str, '"');
+ }
+ 
+-inline void remove_linefeed(gchar * str)
++void remove_linefeed(gchar * str)
+ {
+     strend(str, '\n');
+ }