Package: wmbubble
Version: 1.46-2
Severity: normal
Hi,
wmbubble currently fails to build on Debian GNU/Hurd. The attached
dpatch patch resolves this (though could probably use some clean-up, I
basically copied sys_linux.c to sys_gnu.c).
Thank you,
Barry deFreese
#! /bin/sh /usr/share/dpatch/dpatch-run
## 11-hurd-build.dpatch by <r...@gnubber>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.
@DPATCH@
diff -urNad wmbubble-1.46~/Makefile wmbubble-1.46/Makefile
--- wmbubble-1.46~/Makefile 2009-06-23 11:14:54.000000000 -0400
+++ wmbubble-1.46/Makefile 2009-06-23 11:16:03.000000000 -0400
@@ -69,6 +69,13 @@
INSTALL = -m 755
endif
+# special things for GNU
+ifeq ($(OS), GNU)
+ OBJS += sys_gnu.o
+ LIBS = `pkg-config gtk+-2.0 --libs | sed "s/-lgtk//g"`
+ INSTALL = -m 755
+endif
+
CFLAGS += -DNAME=\"$(BINARY)\"
all: $(BINARY)
diff -urNad wmbubble-1.46~/sys_gnu.c wmbubble-1.46/sys_gnu.c
--- wmbubble-1.46~/sys_gnu.c 1969-12-31 19:00:00.000000000 -0500
+++ wmbubble-1.46/sys_gnu.c 2009-06-23 11:15:21.000000000 -0400
@@ -0,0 +1,205 @@
+/* BubbleMon dockapp 1.2 - Linux specific code
+ * Copyright 2000, 2001 time...@japan.co.jp
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <sys/utsname.h>
+#include "include/bubblemon.h"
+#include "include/sys_include.h"
+
+extern BubbleMonData bm;
+
+#define LINUX_2_4 1
+#define LINUX_2_6 2
+
+static unsigned char ver;
+
+int init_stuff()
+{
+ struct utsname u;
+
+ ver = 0;
+
+ if (uname(&u) == -1) {
+ puts("Error getting kernel version: uname returned -1");
+ return 1;
+ }
+
+ if (strncmp(u.release, "2.4", 3) == 0) {
+ ver = LINUX_2_4;
+ } else if ((strncmp(u.release, "2.5", 3) == 0) ||
+ (strncmp(u.release, "2.6", 3) == 0)) {
+ ver = LINUX_2_6;
+ }
+
+ if (!ver) {
+ /* Default to Linux 2.4 format. */
+ ver = LINUX_2_4;
+ }
+
+ return 0;
+}
+
+/* returns current CPU load in percent, 0 to 100 */
+int system_cpu(void)
+{
+ unsigned int cpuload;
+ u_int64_t load, total, oload, ototal;
+ u_int64_t ab, ac, ad, ae;
+ int i;
+ FILE *stat;
+
+ stat = fopen("/proc/stat", "r");
+ fscanf(stat, "%*s %Ld %Ld %Ld %Ld", &ab, &ac, &ad, &ae);
+ fclose(stat);
+
+ /* Find out the CPU load */
+ /* user + sys = load
+ * total = total */
+ load = ab + ac + ad; /* cpu.user + cpu.sys; */
+ total = ab + ac + ad + ae; /* cpu.total; */
+
+ /* "i" is an index into a load history */
+ i = bm.loadIndex;
+ oload = bm.load[i];
+ ototal = bm.total[i];
+
+ bm.load[i] = load;
+ bm.total[i] = total;
+ bm.loadIndex = (i + 1) % bm.samples;
+
+ /*
+ Because the load returned from libgtop is a value accumulated
+ over time, and not the current load, the current load percentage
+ is calculated as the extra amount of work that has been performed
+ since the last sample. yah, right, what the fuck does that mean?
+ */
+ if (ototal == 0) /* ototal == 0 means that this is the first time
+ we get here */
+ cpuload = 0;
+ else if ((total - ototal) <= 0)
+ cpuload = 100;
+ else
+ cpuload = (100 * (load - oload)) / (total - ototal);
+
+ return cpuload;
+}
+
+int system_memory(void)
+{
+ u_int64_t my_mem_used, my_mem_max;
+ u_int64_t my_swap_used, my_swap_max;
+ char *p;
+
+ static int mem_delay = 0;
+ FILE *mem;
+ static u_int64_t aa, ab, ac, ad;
+ static u_int64_t ae, af, ag, ah;
+
+ /* put this in permanent storage instead of stack */
+ static char shit[2048];
+
+ /* we might as well get both swap and memory at the same time.
+ * sure beats opening the same file twice */
+ if (mem_delay-- <= 0) {
+ if (ver == LINUX_2_6) {
+ mem = fopen("/proc/meminfo", "r");
+ memset(shit, 0, sizeof(shit));
+ fread(shit, 2048, 1, mem);
+ p = strstr(shit, "MemTotal");
+ if (p) {
+ sscanf(p, "MemTotal:%Ld", &aa);
+ my_mem_max = aa << 10;
+
+ p = strstr(p, "Active");
+ if (p) {
+ sscanf(p, "Active:%Ld", &ab);
+ my_mem_used = ab << 10;
+
+ p = strstr(p, "SwapTotal");
+ if (p) {
+ sscanf(p, "SwapTotal:%Ld", &ac);
+ my_swap_max = ac << 10;
+
+ p = strstr(p, "SwapFree");
+ if (p) {
+ sscanf(p, "SwapFree:%Ld", &ad);
+ my_swap_used = my_swap_max - (ad << 10);
+
+ bm.mem_used = my_mem_used;
+ bm.mem_max = my_mem_max;
+ bm.swap_used = my_swap_used;
+ bm.swap_max = my_swap_max;
+ }
+ }
+ }
+ }
+ fclose(mem);
+ mem_delay = 25;
+ } else if (ver == LINUX_2_4) {
+ mem = fopen("/proc/meminfo", "r");
+ fgets(shit, 2048, mem);
+
+ fscanf(mem, "%*s %Ld %Ld %Ld %Ld %Ld %Ld", &aa, &ab, &ac,
+ &ad, &ae, &af);
+ fscanf(mem, "%*s %Ld %Ld", &ag, &ah);
+ fclose(mem);
+ mem_delay = 25;
+
+ /* calculate it */
+ my_mem_max = aa; /* memory.total; */
+ my_swap_max = ag; /* swap.total; */
+
+ my_mem_used = ah + ab - af - ae; /* swap.used + memory.used -
memory.cached - memory.buffer; */
+
+ 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;
+ }
+
+ bm.mem_used = my_mem_used;
+ bm.mem_max = my_mem_max;
+ bm.swap_used = my_swap_used;
+ bm.swap_max = my_swap_max;
+ }
+
+ /* memory info changed - update things */
+ return 1;
+ }
+ /* nothing new */
+ return 0;
+}
+
+#ifdef ENABLE_MEMSCREEN
+void system_loadavg(void)
+{
+ FILE *avg;
+ static int avg_delay;
+ if (avg_delay-- <= 0) {
+ avg = fopen("/proc/loadavg", "r");
+ fscanf(avg, "%d.%d %d.%d %d.%d", &bm.loadavg[0].i, &bm.loadavg[0].f,
+ &bm.loadavg[1].i, &bm.loadavg[1].f,
+ &bm.loadavg[2].i, &bm.loadavg[2].f);
+ fclose(avg);
+ avg_delay = ROLLVALUE;
+ }
+}
+#endif /* ENABLE_MEMSCREEN */
