summaryrefslogtreecommitdiff
path: root/packages/matchbox-panel/matchbox-panel-0.9.2/kernel2.6.patch
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/matchbox-panel/matchbox-panel-0.9.2/kernel2.6.patch
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/matchbox-panel/matchbox-panel-0.9.2/kernel2.6.patch')
-rw-r--r--packages/matchbox-panel/matchbox-panel-0.9.2/kernel2.6.patch226
1 files changed, 0 insertions, 226 deletions
diff --git a/packages/matchbox-panel/matchbox-panel-0.9.2/kernel2.6.patch b/packages/matchbox-panel/matchbox-panel-0.9.2/kernel2.6.patch
deleted file mode 100644
index f849c8a41e..0000000000
--- a/packages/matchbox-panel/matchbox-panel-0.9.2/kernel2.6.patch
+++ /dev/null
@@ -1,226 +0,0 @@
---- matchbox-panel-0.9.2/applets/mb-applet-system-monitor.c.old 2005-03-20 18:43:31.000000000 +0100
-+++ matchbox-panel-0.9.2/applets/mb-applet-system-monitor.c 2005-12-21 10:24:18.000000000 +0100
-@@ -37,6 +37,11 @@
- # define _(text) (text)
- #endif
-
-+#include <linux/version.h>
-+#ifndef KERNEL_VERSION
-+#define KERNEL_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))
-+#endif
-+
- #ifdef MB_HAVE_PNG
- #define IMG_EXT "png"
- #else
-@@ -112,71 +117,148 @@
-
- int system_memory(void)
- {
-- u_int64_t my_mem_used, my_mem_max;
-- u_int64_t my_swap_max;
--
-- static int mem_delay = 0;
-- FILE *mem;
-- static u_int64_t total, used, mfree, shared, buffers, cached,
-- cache_total, cache_used;
--
-- /* put this in permanent storage instead of stack */
-- static char not_needed[2048];
--
-- if (mem_delay-- <= 0) {
-- if ((mem = fopen("/proc/meminfo", "r")) == NULL)
-- {
-- fprintf(stderr, "mb-applet-system-monitor: failed to open /proc/meminfo. Exiting.\n");
-- exit(1);
-- }
--
--
--
-- fgets(not_needed, 2048, mem);
--
-- /*
-- total: used: free: shared: buffers: cached:
-- */
--
-- fscanf(mem, "%*s %Ld %Ld %Ld %Ld %Ld %Ld", &total, &used, &mfree,
-- &shared, &buffers, &cached);
--
-- fscanf(mem, "%*s %Ld %Ld", &cache_total, &cache_used);
--
-- fclose(mem);
-- mem_delay = 25;
--
-- /* calculate it */
-- my_mem_max = total;
-- my_swap_max = cache_total;
--
-- my_mem_used = cache_used + used - cached - buffers;
--
-- /* No swap on ipaq
-- if (my_mem_used > my_mem_max) {
-- my_swap_used = my_mem_used - my_mem_max;
-- my_mem_used = my_mem_max;
-- } else {
-- my_swap_used = 0;
-- }
-- */
--
-- msd.mem_used = my_mem_used;
-- msd.mem_max = my_mem_max;
-- //msd.swap_used = my_swap_used;
-- //msd.swap_max = my_swap_max;
--
-- msd.mem_percent = (100 * msd.mem_used) / msd.mem_max;
-- //msd.swap_percent = (100 * msd.swap_used) / msd.swap_max;
--
-- /* memory info changed - update things */
-- return 1;
-- }
-- /* nothing new */
-- return 0;
-+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-+ u_int64_t total, mfree, buffers, cached, used, shared,
-+ cache_total, cache_free, cache_used;
-+
-+ u_int64_t my_mem_used, my_mem_max;
-+ u_int64_t my_swap_max;
-+
-+ static int mem_delay = 0;
-+ FILE *mem;
-+
-+ /* put this in permanent storage instead of stack */
-+ static char not_needed[2048];
-+
-+ if (mem_delay-- <= 0) {
-+ if ((mem = fopen("/proc/meminfo", "r")) == NULL) {
-+ fprintf(stderr, "mb-applet-system-monitor: failed to open /proc/meminfo. Exiting.\n");
-+ exit(1);
-+ }
-+
-+ fgets(not_needed, 2048, mem);
-+
-+ rewind (mem);
-+
-+ fscanf (mem, "%*s %Ld %*s", &total);
-+ fscanf (mem, "%*s %Ld %*s", &mfree);
-+ fscanf (mem, "%*s %Ld %*s", &buffers);
-+ fscanf (mem, "%*s %Ld %*s", &cached);
-+ fscanf (mem, "%*s %Ld %*s", &shared);
-+ fscanf (mem, "%*s %Ld %*s", &used);
-+ fscanf (mem, "%*s %*Ld %*s");
-+ fscanf (mem, "%*s %*Ld %*s");
-+ fscanf (mem, "%*s %*Ld %*s");
-+ fscanf (mem, "%*s %*Ld %*s");
-+ fscanf (mem, "%*s %*Ld %*s");
-+ fscanf (mem, "%*s %Ld %*s", &cache_total);
-+ fscanf (mem, "%*s %Ld %*s", &cache_free);
-+
-+ fclose (mem);
-+
-+ total = total * 1024;
-+ mfree = mfree * 1024;
-+ buffers = buffers * 1024;
-+ cached = cached * 1024;
-+ used = used * 1024;
-+ shared = shared * 1024;
-+ cache_total = cache_total * 1024;
-+ cache_used = cache_total - (cache_free * 1024);
-+
-+ mem_delay = 25;
-+
-+ /* calculate it */
-+ my_mem_max = total;
-+ my_swap_max = cache_total;
-+
-+ my_mem_used = cache_used + used - cached - buffers;
-+
-+ /* No swap on ipaq
-+ if (my_mem_used > my_mem_max) {
-+ my_swap_used = my_mem_used - my_mem_max;
-+ my_mem_used = my_mem_max;
-+ } else {
-+ my_swap_used = 0;
-+ }
-+ */
-+
-+ msd.mem_used = my_mem_used;
-+ msd.mem_max = my_mem_max;
-+ //msd.swap_used = my_swap_used;
-+ //msd.swap_max = my_swap_max;
-+
-+ msd.mem_percent = (100 * msd.mem_used) / msd.mem_max;
-+ //msd.swap_percent = (100 * msd.swap_used) / msd.swap_max;
-+
-+ /* memory info changed - update things */
-+ return 1;
-+ }
-+ /* nothing new */
-+ return 0;
-+ #else
-+ static u_int64_t total, used, mfree, shared, buffers, cached,
-+ cache_total, cache_used;
-+
-+ u_int64_t my_mem_used, my_mem_max;
-+ u_int64_t my_swap_max;
-+
-+ static int mem_delay = 0;
-+ FILE *mem;
-+
-+ /* put this in permanent storage instead of stack */
-+ static char not_needed[2048];
-+
-+ if (mem_delay-- <= 0) {
-+ if ((mem = fopen("/proc/meminfo", "r")) == NULL) {
-+ fprintf(stderr, "mb-applet-system-monitor: failed to open /proc/meminfo. Exiting.\n");
-+ exit(1);
-+ }
-+
-+ fgets(not_needed, 2048, mem);
-+
-+ /*
-+ total: used: free: shared: buffers: cached:
-+ */
-+ fscanf(mem, "%*s %Ld %Ld %Ld %Ld %Ld %Ld", &total, &used, &mfree,
-+ &shared, &buffers, &cached);
-+
-+ fscanf(mem, "%*s %Ld %Ld", &cache_total, &cache_used);
-+
-+ fclose(mem);
-+
-+ mem_delay = 25;
-+
-+ /* calculate it */
-+ my_mem_max = total;
-+ my_swap_max = cache_total;
-+
-+ my_mem_used = cache_used + used - cached - buffers;
-+
-+ /* No swap on ipaq
-+ if (my_mem_used > my_mem_max) {
-+ my_swap_used = my_mem_used - my_mem_max;
-+ my_mem_used = my_mem_max;
-+ } else {
-+ my_swap_used = 0;
-+ }
-+ */
-+
-+ msd.mem_used = my_mem_used;
-+ msd.mem_max = my_mem_max;
-+ //msd.swap_used = my_swap_used;
-+ //msd.swap_max = my_swap_max;
-+
-+ msd.mem_percent = (100 * msd.mem_used) / msd.mem_max;
-+ //msd.swap_percent = (100 * msd.swap_used) / msd.swap_max;
-+
-+ /* memory info changed - update things */
-+ return 1;
-+ }
-+ /* nothing new */
-+ return 0;
-+ #endif
- }
-
--
- void
- paint_callback (MBTrayApp *app, Drawable drw )
- {