ports/135866: sysutils/xfce-cpugraph-plugin fixes for amd64

[J.R. Oldroyd]

>Number:         135866
>Category:       ports
>Synopsis:       sysutils/xfce-cpugraph-plugin fixes for amd64
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 20 15:30:06 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     J.R. Oldroyd
>Release:        FreeBSD 7.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD xx.opal.com 7.2-STABLE FreeBSD 7.2-STABLE #1: Sun Jun 14 11:33:09 EDT 2009 xx at xx.opal.com:/usr/obj/amd64/usr/src/sys/XX amd64
>Description:
sysutils/xfce-cpugraph-plugin core dumps on amd64.
This is due to mixed use of ints and longs which cause no problems on i386
but are different things on amd64.  Patch below fixes this.  Also adds a header
to avoid compiler warnings.  And corrects a spelling error.
Finally, also a change of maintainer.
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/xfce4-cpugraph-plugin/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile	9 Jun 2009 02:35:50 -0000	1.30
+++ Makefile	16 Jun 2009 06:46:12 -0000
@@ -7,12 +7,12 @@
 
 PORTNAME=	xfce4-cpugraph-plugin
 PORTVERSION=	0.3.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils xfce
 MASTER_SITES=	http://goodies.xfce.org/releases/${PORTNAME}/
 DIST_SUBDIR=	xfce4
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	fbsd at opal.com
 COMMENT=	XFce4 systemload plugin with multiple CPU display modes
 
 GNU_CONFIGURE=	yes
Index: files/patch-panel-plugin-cpu.c
===================================================================
RCS file: files/patch-panel-plugin-cpu.c
diff -N files/patch-panel-plugin-cpu.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-panel-plugin-cpu.c	16 Jun 2009 06:46:12 -0000
@@ -0,0 +1,20 @@
+--- panel-plugin/cpu.c.orig	2005-10-09 05:06:46.000000000 -0400
++++ panel-plugin/cpu.c	2009-06-15 18:29:08.000000000 -0400
+@@ -606,7 +606,7 @@
+     op->m_Notebook = gtk_notebook_new ();
+     gtk_container_set_border_width (GTK_CONTAINER (op->m_Notebook), 
+                                     BORDER - 2);
+-    label = gtk_label_new (_("Apperance"));
++    label = gtk_label_new (_("Appearance"));
+     gtk_notebook_append_page (GTK_NOTEBOOK (op->m_Notebook),
+                               GTK_WIDGET (vbox2), GTK_WIDGET (label));
+     label = gtk_label_new (_("Advanced"));
+@@ -952,7 +952,7 @@
+ SetHistorySize (CPUGraph * base, int size)
+ {
+     base->m_History =
+-        (long *) realloc (base->m_History, size * sizeof (long));
++        (int *) realloc (base->m_History, size * sizeof (int));
+     int i;
+ 
+     for (i = size - 1; i >= base->m_Values; i--)
Index: files/patch-panel-plugin-cpu.h
===================================================================
RCS file: files/patch-panel-plugin-cpu.h
diff -N files/patch-panel-plugin-cpu.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-panel-plugin-cpu.h	16 Jun 2009 06:46:12 -0000
@@ -0,0 +1,19 @@
+--- panel-plugin/cpu.h.orig	2005-10-09 05:19:34.000000000 -0400
++++ panel-plugin/cpu.h	2009-06-15 18:07:25.000000000 -0400
+@@ -10,6 +10,7 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfcegui4/libxfcegui4.h>
+@@ -83,7 +84,7 @@
+ 	
+ 	guint m_TimeoutID; // Timeout ID for the tooltip;
+ 	long m_CPUUsage;
+-	long *m_History;
++	int *m_History;
+ 	int m_Values;
+ 
+ 	int m_Orientation;
>Release-Note:
>Audit-Trail:
>Unformatted: