1 |
commit: 9fca48d65af5a35a5b2773671563b2728edd799b |
2 |
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 8 18:06:01 2018 +0000 |
4 |
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 8 18:06:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fca48d6 |
7 |
|
8 |
app-admin/conky: Remove unused patches. |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
.../conky/files/conky-1.10.6-cpu-hotplug.patch | 23 ---------- |
13 |
.../conky/files/conky-1.10.6-fix-text-shades.patch | 12 ------ |
14 |
app-admin/conky/files/conky-1.10.6-gcc-7.patch | 11 ----- |
15 |
.../conky/files/conky-1.10.6-new_graph-oor.patch | 35 ---------------- |
16 |
.../conky/files/conky-1.10.7-cpu-hotplug.patch | 13 ------ |
17 |
.../files/conky-1.10.7-out_to_x-segfault.patch | 49 ---------------------- |
18 |
6 files changed, 143 deletions(-) |
19 |
|
20 |
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 |
21 |
deleted file mode 100644 |
22 |
index 00e1003617e..00000000000 |
23 |
--- a/app-admin/conky/files/conky-1.10.6-cpu-hotplug.patch |
24 |
+++ /dev/null |
25 |
@@ -1,23 +0,0 @@ |
26 |
-From 7d2639e9c489c34fa9673fcaee8deec46043fbf8 Mon Sep 17 00:00:00 2001 |
27 |
-From: Daniel Pielmeier <billie80@××××××××××××××××××××.com> |
28 |
-Date: Sat, 18 Feb 2017 16:55:35 +0100 |
29 |
-Subject: [PATCH] Fix SEGV in a CPU hotplug environment #127 |
30 |
- |
31 |
---- |
32 |
- src/linux.cc | 3 +++ |
33 |
- 1 file changed, 3 insertions(+) |
34 |
- |
35 |
-diff --git a/src/linux.cc b/src/linux.cc |
36 |
-index 664ddf5e..63b3ea40 100644 |
37 |
---- a/src/linux.cc |
38 |
-+++ b/src/linux.cc |
39 |
-@@ -900,6 +900,9 @@ int update_stat(void) |
40 |
- } else { |
41 |
- idx = 0; |
42 |
- } |
43 |
-+ if (idx > info.cpu_count) { |
44 |
-+ continue; |
45 |
-+ } |
46 |
- sscanf(buf, stat_template, &(cpu[idx].cpu_user), |
47 |
- &(cpu[idx].cpu_nice), &(cpu[idx].cpu_system), |
48 |
- &(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait), |
49 |
|
50 |
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 |
51 |
deleted file mode 100644 |
52 |
index 70b0c52d2a1..00000000000 |
53 |
--- a/app-admin/conky/files/conky-1.10.6-fix-text-shades.patch |
54 |
+++ /dev/null |
55 |
@@ -1,12 +0,0 @@ |
56 |
---- a/src/conky.cc 2017-02-21 18:00:40.157275779 -0800 |
57 |
-+++ b/src/conky.cc 2017-02-21 18:05:16.137077877 -0800 |
58 |
-@@ -1930,7 +1930,9 @@ |
59 |
- |
60 |
- static void draw_stuff(void) |
61 |
- { |
62 |
-+#ifndef BUILD_X11 |
63 |
- static int text_offset_x, text_offset_y; /* offset for start position */ |
64 |
-+#endif |
65 |
- text_offset_x = text_offset_y = 0; |
66 |
- #ifdef BUILD_IMLIB2 |
67 |
- cimlib_render(text_start_x, text_start_y, window.width, window.height); |
68 |
|
69 |
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 |
70 |
deleted file mode 100644 |
71 |
index 6784129d39c..00000000000 |
72 |
--- a/app-admin/conky/files/conky-1.10.6-gcc-7.patch |
73 |
+++ /dev/null |
74 |
@@ -1,11 +0,0 @@ |
75 |
-diff -Naur a/src/luamm.hh b/src/luamm.hh |
76 |
---- a/src/luamm.hh 2017-07-07 15:05:28.250032963 +0200 |
77 |
-+++ b/src/luamm.hh 2017-07-07 15:05:43.230033134 +0200 |
78 |
-@@ -28,6 +28,7 @@ |
79 |
- #include <exception> |
80 |
- #include <stdexcept> |
81 |
- #include <string> |
82 |
-+#include <functional> |
83 |
- |
84 |
- #include <lua.hpp> |
85 |
- |
86 |
|
87 |
diff --git a/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch b/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch |
88 |
deleted file mode 100644 |
89 |
index 18091702f68..00000000000 |
90 |
--- a/app-admin/conky/files/conky-1.10.6-new_graph-oor.patch |
91 |
+++ /dev/null |
92 |
@@ -1,35 +0,0 @@ |
93 |
-From 2600d01373ce04b34f698f3887e90a35c77bda61 Mon Sep 17 00:00:00 2001 |
94 |
-From: labath <pavelo@×××××××.sk> |
95 |
-Date: Tue, 31 Jan 2017 01:31:09 +0000 |
96 |
-Subject: [PATCH] Fix an out-of-range error in new_graph (#356) |
97 |
- |
98 |
-The code was multiplying the index with the size of the element, and |
99 |
-then adding it to the typed pointer (resulting in a double |
100 |
-multiplication and an OOB access). |
101 |
- |
102 |
-Replace the buggy code with a slightly safer c++ alternative. |
103 |
---- |
104 |
- src/specials.cc | 6 ++---- |
105 |
- 1 file changed, 2 insertions(+), 4 deletions(-) |
106 |
- |
107 |
-diff --git a/src/specials.cc b/src/specials.cc |
108 |
-index ee941eb..73bd2a2 100644 |
109 |
---- a/src/specials.cc |
110 |
-+++ b/src/specials.cc |
111 |
-@@ -519,14 +519,12 @@ void new_graph(struct text_object *obj, char *buf, int buf_max_size, double val) |
112 |
- DBGP("reallocing graph from %d to %d", s->graph_allocated, s->graph_width); |
113 |
- if (!s->graph) { |
114 |
- /* initialize */ |
115 |
-- memset(graph, 0, s->graph_width * sizeof(double)); |
116 |
-+ std::fill_n(graph, s->graph_width, 0.0); |
117 |
- s->scale = 100; |
118 |
- } else { |
119 |
- if (s->graph_width > s->graph_allocated) { |
120 |
- /* initialize the new region */ |
121 |
-- memset(graph + (s->graph_allocated * sizeof(double)), 0, |
122 |
-- (s->graph_width - s->graph_allocated) * |
123 |
-- sizeof(double)); |
124 |
-+ std::fill(graph + s->graph_allocated, graph + s->graph_width, 0.0); |
125 |
- } |
126 |
- } |
127 |
- s->graph = graph; |
128 |
|
129 |
diff --git a/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch b/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch |
130 |
deleted file mode 100644 |
131 |
index 18394828105..00000000000 |
132 |
--- a/app-admin/conky/files/conky-1.10.7-cpu-hotplug.patch |
133 |
+++ /dev/null |
134 |
@@ -1,13 +0,0 @@ |
135 |
-diff -Naur conky-1.10.7_old/src/linux.cc conky-1.10.7/src/linux.cc |
136 |
---- conky-1.10.7_old/src/linux.cc 2018-01-19 16:59:14.158830825 +0100 |
137 |
-+++ conky-1.10.7/src/linux.cc 2018-01-19 16:59:44.796144615 +0100 |
138 |
-@@ -923,6 +923,9 @@ |
139 |
- } else { |
140 |
- idx = 0; |
141 |
- } |
142 |
-+ if (idx > info.cpu_count) { |
143 |
-+ continue; |
144 |
-+ } |
145 |
- sscanf(buf, stat_template, &(cpu[idx].cpu_user), |
146 |
- &(cpu[idx].cpu_nice), &(cpu[idx].cpu_system), |
147 |
- &(cpu[idx].cpu_idle), &(cpu[idx].cpu_iowait), |
148 |
|
149 |
diff --git a/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch b/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch |
150 |
deleted file mode 100644 |
151 |
index fef22ac46e5..00000000000 |
152 |
--- a/app-admin/conky/files/conky-1.10.7-out_to_x-segfault.patch |
153 |
+++ /dev/null |
154 |
@@ -1,49 +0,0 @@ |
155 |
-From 562c7375883445acb58388ff16d9eb126b7e12a1 Mon Sep 17 00:00:00 2001 |
156 |
-From: Brenden Matthews <brenden@××××××××.com> |
157 |
-Date: Tue, 23 Jan 2018 13:52:11 -0500 |
158 |
-Subject: [PATCH] Fix segfault when out_to_x = false. (#455) |
159 |
- |
160 |
-This resolves #454. |
161 |
---- |
162 |
- src/conky.cc | 24 ++++++++++++++---------- |
163 |
- 1 file changed, 14 insertions(+), 10 deletions(-) |
164 |
- |
165 |
-diff --git a/src/conky.cc b/src/conky.cc |
166 |
-index 48256ecc..f10d08fb 100644 |
167 |
---- a/src/conky.cc |
168 |
-+++ b/src/conky.cc |
169 |
-@@ -2076,20 +2076,24 @@ static void main_loop(void) |
170 |
- sigaddset(&newmask, SIGUSR1); |
171 |
- #endif |
172 |
- |
173 |
-+#ifdef BUILD_X11 |
174 |
- #ifdef BUILD_XSHAPE |
175 |
-- /* allow only decorated windows to be given mouse input */ |
176 |
-- int major_version, minor_version; |
177 |
-- if (!XShapeQueryVersion(display, &major_version, &minor_version)) { |
178 |
-- NORM_ERR("Input shapes are not supported"); |
179 |
-- } else { |
180 |
-- if (own_window.get(*state) && |
181 |
-- (own_window_type.get(*state) != TYPE_NORMAL || |
182 |
-- (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) { |
183 |
-- XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0, |
184 |
-- NULL, 0, ShapeSet, Unsorted); |
185 |
-+ if (out_to_x.get(*state)) { |
186 |
-+ /* allow only decorated windows to be given mouse input */ |
187 |
-+ int major_version, minor_version; |
188 |
-+ if (!XShapeQueryVersion(display, &major_version, &minor_version)) { |
189 |
-+ NORM_ERR("Input shapes are not supported"); |
190 |
-+ } else { |
191 |
-+ if (own_window.get(*state) && |
192 |
-+ (own_window_type.get(*state) != TYPE_NORMAL || |
193 |
-+ (TEST_HINT(own_window_hints.get(*state), HINT_UNDECORATED)))) { |
194 |
-+ XShapeCombineRectangles(display, window.window, ShapeInput, 0, 0, |
195 |
-+ NULL, 0, ShapeSet, Unsorted); |
196 |
-+ } |
197 |
- } |
198 |
- } |
199 |
- #endif /* BUILD_XSHAPE */ |
200 |
-+#endif /* BUILD_X11 */ |
201 |
- |
202 |
- last_update_time = 0.0; |
203 |
- next_update_time = get_time() - fmod(get_time(), active_update_interval()); |