summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-09 10:09:02 +0100
committerErich Eckner <git@eckner.net>2019-01-09 10:09:02 +0100
commitbeb148658ea025d09a4b9a256064bcb3b131a1cf (patch)
tree51c754b3c5bab95646781b77c87c0972bdccfd14
parent3af6f0ab19f5fab69122a96e87f66e5377c0b872 (diff)
downloadpackages-beb148658ea025d09a4b9a256064bcb3b131a1cf.tar.xz
extra/conky: add hot-fix
-rw-r--r--extra/conky/PKGBUILD8
-rw-r--r--extra/conky/fix-type-mismatch.patch26
2 files changed, 34 insertions, 0 deletions
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
new file mode 100644
index 00000000..9e60bb86
--- /dev/null
+++ b/extra/conky/PKGBUILD
@@ -0,0 +1,8 @@
+#see https://github.com/brndnmtthws/conky/issues/759
+sha256sums+=('200df4d59c2c8158298fdf26c9ebaa112036a3f2da09a9b6f9f4336f8b78660c')
+source+=('fix-type-mismatch.patch')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i "${srcdir}/fix-type-mismatch.patch"
+}
diff --git a/extra/conky/fix-type-mismatch.patch b/extra/conky/fix-type-mismatch.patch
new file mode 100644
index 00000000..286fa107
--- /dev/null
+++ b/extra/conky/fix-type-mismatch.patch
@@ -0,0 +1,26 @@
+diff --git a/src/linux.cc b/src/linux.cc
+index affa1de1..67d4662e 100644
+--- a/src/linux.cc
++++ b/src/linux.cc
+@@ -1171,7 +1171,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 */
+- buf[std::max(0UL, strnlen(buf, 255) - 7)] = 0;
++ buf[std::max((size_t)0UL, strnlen(buf, 255) - 7)] = 0;
+ snprintf(path, 255, "%s%s/%s%d_input", dir, dev, type, n);
+ fd = open(path, O_RDONLY);
+ if (fd < 0) {
+diff --git a/src/mail.cc b/src/mail.cc
+index 19dd1af8..fbcc4e2a 100644
+--- a/src/mail.cc
++++ b/src/mail.cc
+@@ -302,7 +302,7 @@ static void update_mail_count(struct local_mail_s *mail) {
+ }
+ closedir(dir);
+
+- dirname[std::max(0UL, strnlen(dirname, dirname_len - 1) - 3)] = '\0';
++ dirname[std::max((size_t)0UL, strnlen(dirname, dirname_len - 1) - 3)] = '\0';
+ strcat(dirname, "new");
+
+ dir = opendir(dirname);