diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-11-18 18:38:22 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-11-18 18:38:22 +0000 |
commit | a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 (patch) | |
tree | 3d2e0a61f348a5299e73ca7c2b236156a8cc79b5 /app-admin/conky/files | |
parent | 38f60b3ec9ff175535d9a056a76ae42931e61e21 (diff) |
gentoo resync : 18.11.2017
Diffstat (limited to 'app-admin/conky/files')
-rw-r--r-- | app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch | 23 | ||||
-rw-r--r-- | app-admin/conky/files/conky-1.10.6-fix-text-shades.patch | 12 | ||||
-rw-r--r-- | app-admin/conky/files/conky-1.10.6-gcc-7.patch | 11 |
3 files changed, 46 insertions, 0 deletions
diff --git a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch new file mode 100644 index 000000000000..16adbd8a6908 --- /dev/null +++ b/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch @@ -0,0 +1,23 @@ +From 7d2639e9c489c34fa9673fcaee8deec46043fbf8 Mon Sep 17 00:00:00 2001 +From: Daniel Pielmeier <billie80@users.noreply.github.com> +Date: Sat, 18 Feb 2017 16:55:35 +0100 +Subject: [PATCH] Fix SEGV in a CPU hotplug environment #127 + +--- + src/linux.cc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/linux.cc b/src/linux.cc +index 664ddf5e..63b3ea40 100644 +--- a/src/linux.cc ++++ b/src/linux.cc +@@ -900,6 +900,9 @@ int update_stat(void) + } else { + idx = 0; + } ++ if (idx >= info.cpu_count) { ++ continue; ++ } + sscanf(buf, stat_template, &(cpu[idx].cpu_user), + &(cpu[idx].cpu_nice), &(cpu[idx].cpu_system), + &(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait), diff --git a/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch new file mode 100644 index 000000000000..70b0c52d2a14 --- /dev/null +++ b/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch @@ -0,0 +1,12 @@ +--- a/src/conky.cc 2017-02-21 18:00:40.157275779 -0800 ++++ b/src/conky.cc 2017-02-21 18:05:16.137077877 -0800 +@@ -1930,7 +1930,9 @@ + + static void draw_stuff(void) + { ++#ifndef BUILD_X11 + static int text_offset_x, text_offset_y; /* offset for start position */ ++#endif + text_offset_x = text_offset_y = 0; + #ifdef BUILD_IMLIB2 + cimlib_render(text_start_x, text_start_y, window.width, window.height); diff --git a/app-admin/conky/files/conky-1.10.6-gcc-7.patch b/app-admin/conky/files/conky-1.10.6-gcc-7.patch new file mode 100644 index 000000000000..6784129d39c4 --- /dev/null +++ b/app-admin/conky/files/conky-1.10.6-gcc-7.patch @@ -0,0 +1,11 @@ +diff -Naur a/src/luamm.hh b/src/luamm.hh +--- a/src/luamm.hh 2017-07-07 15:05:28.250032963 +0200 ++++ b/src/luamm.hh 2017-07-07 15:05:43.230033134 +0200 +@@ -28,6 +28,7 @@ + #include <exception> + #include <stdexcept> + #include <string> ++#include <functional> + + #include <lua.hpp> + |