Attachment #113791 for bug #155382

Lines 7-13 Link Here

(-)/usr/ports/sysutils/xfce4-systemload-plugin/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= xfce4-systemload-plugin	8	PORTNAME= xfce4-systemload-plugin
9	PORTVERSION= 1.0.0	9	PORTVERSION= 1.0.0
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= sysutils xfce	11	CATEGORIES= sysutils xfce
12	MASTER_SITES= ${MASTER_SITE_XFCE}	12	MASTER_SITES= ${MASTER_SITE_XFCE}
13	MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}	13	MASTER_SITE_SUBDIR= src/panel-plugins/${PORTNAME}/${PORTVERSION:R}




--- panel-plugin/memswap.c.orig	2010-12-09 10:04:10.000000000 -0600
+++ panel-plugin/memswap.c	2011-02-22 21:41:38.000000000 -0600
@@ -228,8 +228,8 @@ gint read_memswap(gulong *mem, gulong *s
         return -1;
     }
 
-    *MT = (total_pages*pagesize) >> 10;
-    *MU = ((total_pages-free_pages-inactive_pages) * pagesize) >> 10;
+    *MT = CONVERT(total_pages);
+    *MU = CONVERT(total_pages-free_pages-inactive_pages);
     *mem = *MU * 100 / *MT;
 
     if((*swap = swapmode(&swap_avail, &swap_free)) >= 0) {

Line 0 Link Here

(-)/usr/ports/sysutils/xfce4-systemload-plugin/files/patch-uptime.c (+11 lines)
	1	--- panel-plugin/uptime.c.orig 2010-12-09 10:04:10.000000000 -0600
	2	+++ panel-plugin/uptime.c 2011-03-14 06:45:44.452052074 -0500
	3	@@ -93,7 +93,7 @@ gulong read_uptime()
	4	int mib[2] = {CTL_KERN, KERN_BOOTTIME};
	5	struct timeval boottime;
	6	time_t now;
	7	- int size = sizeof(boottime);
	8	+ size_t size = sizeof(boottime);
	9	gulong uptime;
	10
	11	if((sysctl(mib, 2, &boottime, &size, NULL, 0) != -1)

Return to bug 155382

Line 0 Link Here

(-)/usr/ports/sysutils/xfce4-systemload-plugin/files/patch-memswap.c (+13 lines)
	1	--- panel-plugin/memswap.c.orig 2010-12-09 10:04:10.000000000 -0600
	2	+++ panel-plugin/memswap.c 2011-02-22 21:41:38.000000000 -0600
	3	@@ -228,8 +228,8 @@ gint read_memswap(gulong mem, gulong s
	4	return -1;
	5	}
	6
	7	- MT = (total_pagespagesize) >> 10;
	8	- MU = ((total_pages-free_pages-inactive_pages) pagesize) >> 10;
	9	+ *MT = CONVERT(total_pages);
	10	+ *MU = CONVERT(total_pages-free_pages-inactive_pages);
	11	mem = MU * 100 / *MT;
	12
	13	if((*swap = swapmode(&swap_avail, &swap_free)) >= 0) {