Merge branch 'master' into i486

1 files changed, 13 insertions, 0 deletions

diff --git a/extra/conky/fix-type-mismatch.patch b/extra/conky/fix-type-mismatch.patch
new file mode 100644
index 00000000..a84d05e2
--- /dev/null
+++ b/extra/conky/fix-type-mismatch.patch
@@ -0,0 +1,13 @@
+diff --git a/src/linux.cc b/src/linux.cc
+index 0a7d4331..09fa6c99 100644
+--- a/src/linux.cc
++++ b/src/linux.cc
+@@ -1169,7 +1169,7 @@ static int open_sysfs_sensor(const char *dir, const char *dev, const char *type,
+   fd = open(path, O_RDONLY);
+   if (fd < 0) {
+     /* if it fails, strip the /device from dev and attempt again */
+-    size_t len_to_trunc = std::max(7UL, strnlen(buf, 255)) - 7;
++    size_t len_to_trunc = std::max((size_t)7UL, strnlen(buf, 255)) - 7;
+     buf[len_to_trunc] = 0;
+     snprintf(path, 255, "%s%s/%s%d_input", dir, dev, type, n);
+     fd = open(path, O_RDONLY);