From jr@opal.com  Sat Jun 20 15:29:14 2009
Return-Path: <jr@opal.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 582CC106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jun 2009 15:29:14 +0000 (UTC)
	(envelope-from jr@opal.com)
Received: from smtp.vzavenue.net (smtp.vzavenue.net [66.171.59.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B6728FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jun 2009 15:29:13 +0000 (UTC)
	(envelope-from jr@opal.com)
Received: from 138.78.171.66.subscriber.vzavenue.net (HELO homobox.opal.com) ([66.171.78.138])
  by smtp.vzavenue.net with ESMTP; 20 Jun 2009 11:29:13 -0400
Received: from opal.com (localhost [IPv6:::1])
	(authenticated bits=0)
	by homobox.opal.com (8.14.3/8.14.3) with ESMTP id n5KFTCan011623
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jun 2009 11:29:12 -0400 (EDT)
	(envelope-from jr@opal.com)
Received: from shibato.opal.com ([2001:5c0:1100:f100:221:63ff:fe5a:c9a7]
	helo=shibato.opal.com) with IPv6:587 by opal.com; 20 Jun 2009
	11:29:11 -0400
Received: from shibato.opal.com (localhost [127.0.0.1])
	by shibato.opal.com (8.14.3/8.14.3) with ESMTP id n5KFTBtO002982
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 20 Jun 2009 11:29:11 -0400 (EDT)
	(envelope-from jr@opal.com)
Received: (from root@localhost)
	by shibato.opal.com (8.14.3/8.14.3/Submit) id n5KFTBmA002981;
	Sat, 20 Jun 2009 11:29:11 -0400 (EDT)
	(envelope-from jr)
Message-Id: <200906201529.n5KFTBmA002981@shibato.opal.com>
Date: Wed, 17 Jun 2009 15:42:20 -0400 (EDT)
From: "J.R. Oldroyd" <fbsd@opal.com>
Reply-To: "J.R. Oldroyd" <fbsd@opal.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: sysutils/xfce-cpugraph-plugin fixes for amd64
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         135866
>Category:       ports
>Synopsis:       sysutils/xfce-cpugraph-plugin fixes for amd64
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 20 15:30:06 UTC 2009
>Closed-Date:    Wed Jul 01 12:33:21 UTC 2009
>Last-Modified:  Wed Jul  1 12:40:07 UTC 2009
>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@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@FreeBSD.org
+MAINTAINER=	fbsd@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:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sun Jun 21 20:22:53 UTC 2009 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135866 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Wed Jul 1 12:33:20 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=135866 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/135866: commit references a PR
Date: Wed,  1 Jul 2009 12:33:25 +0000 (UTC)

 miwi        2009-07-01 12:33:11 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/xfce4-cpugraph-plugin Makefile 
   Added files:
     sysutils/xfce4-cpugraph-plugin/files patch-panel-plugin-cpu.c 
                                          patch-panel-plugin-cpu.h 
   Log:
   - Fix core dump on AMD64
   - Pass maintainership to submitter
   
   PR:             135866
   Submitted by:   "J.R. Oldroyd" <fbsd@opal.com>
   
   Revision  Changes    Path
   1.31      +2 -2      ports/sysutils/xfce4-cpugraph-plugin/Makefile
   1.1       +20 -0     ports/sysutils/xfce4-cpugraph-plugin/files/patch-panel-plugin-cpu.c (new)
   1.1       +19 -0     ports/sysutils/xfce4-cpugraph-plugin/files/patch-panel-plugin-cpu.h (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
