Merge branch 'master' into i486

1 files changed, 8 insertions, 0 deletions

diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
new file mode 100644
index 00000000..506fad26
--- /dev/null
+++ b/extra/conky/PKGBUILD
@@ -0,0 +1,8 @@
+#see https://github.com/brndnmtthws/conky/issues/759
+sha256sums+=('842a3377b1d4fcaff8ec409b68fe6b05a9faf500f29b4d8e21cec3b4cd5b7da2')
+source+=('fix-type-mismatch.patch')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/fix-type-mismatch.patch"
+}