From beb148658ea025d09a4b9a256064bcb3b131a1cf Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 9 Jan 2019 10:09:02 +0100 Subject: extra/conky: add hot-fix --- extra/conky/PKGBUILD | 8 ++++++++ extra/conky/fix-type-mismatch.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 extra/conky/PKGBUILD create mode 100644 extra/conky/fix-type-mismatch.patch (limited to 'extra') 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); -- cgit v1.2.3-70-g09d2 From 3c0c4e6086d03561e3e5baed215a55667ef3805b Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Wed, 9 Jan 2019 10:28:58 +0100 Subject: extra/conky: fix the patch --- extra/conky/PKGBUILD | 2 +- extra/conky/fix-type-mismatch.patch | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) (limited to 'extra') diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD index 9e60bb86..506fad26 100644 --- a/extra/conky/PKGBUILD +++ b/extra/conky/PKGBUILD @@ -1,5 +1,5 @@ #see https://github.com/brndnmtthws/conky/issues/759 -sha256sums+=('200df4d59c2c8158298fdf26c9ebaa112036a3f2da09a9b6f9f4336f8b78660c') +sha256sums+=('842a3377b1d4fcaff8ec409b68fe6b05a9faf500f29b4d8e21cec3b4cd5b7da2') source+=('fix-type-mismatch.patch') prepare() { diff --git a/extra/conky/fix-type-mismatch.patch b/extra/conky/fix-type-mismatch.patch index 286fa107..a84d05e2 100644 --- a/extra/conky/fix-type-mismatch.patch +++ b/extra/conky/fix-type-mismatch.patch @@ -1,26 +1,13 @@ diff --git a/src/linux.cc b/src/linux.cc -index affa1de1..67d4662e 100644 +index 0a7d4331..09fa6c99 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, +@@ -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 */ -- buf[std::max(0UL, strnlen(buf, 255) - 7)] = 0; -+ buf[std::max((size_t)0UL, strnlen(buf, 255) - 7)] = 0; +- 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); - 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); -- cgit v1.2.3-70-g09d2 From 4dd22c9bde32070cf501c7aa28d58d633e895834 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 10 Jan 2019 08:35:33 +0100 Subject: extra/linux-pae: 4.20 -> 4.20.1 --- extra/linux-pae/PKGBUILD | 6 +++--- extra/linux-pae/config | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'extra') diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index 98cd61a9..2fc41268 100644 --- a/extra/linux-pae/PKGBUILD +++ b/extra/linux-pae/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Baechler pkgbase=linux-pae # Build stock -ARCH kernel -pkgver='4.20' +pkgver='4.20.1' _srcname=linux-${pkgver} pkgrel='1' arch=('i686') @@ -24,9 +24,9 @@ validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('ad0823183522e743972382df0aa08fb5ae3077f662b125f1e599b0b2aaa12438' +sha256sums=('45096f1ffbfbb4cdeef6eecfa6ca7eabbf534f04645fd0d849564a58ddd2198f' 'SKIP' - 'bc31046541799e3d0a916894ca4fb7bba387f582a37216e98345c095f8f5ee43' + 'b5f3d1a14dce62f52c6cf4efb67751cc6080515b2c969912f724e280b9b78060' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' diff --git a/extra/linux-pae/config b/extra/linux-pae/config index 9175b3c3..e09adaad 100644 --- a/extra/linux-pae/config +++ b/extra/linux-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.20.0-1 Kernel Configuration +# Linux/x86 4.20.1-1 Kernel Configuration # # @@ -7277,10 +7277,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m # USB Type-C Alternate Mode drivers # CONFIG_TYPEC_DP_ALTMODE=m +CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_ROLES_INTEL_XHCI=m CONFIG_USB_LED_TRIG=y CONFIG_USB_ULPI_BUS=m -CONFIG_USB_ROLE_SWITCH=m CONFIG_UWB=m CONFIG_UWB_HWA=m CONFIG_UWB_WHCI=m -- cgit v1.2.3-70-g09d2