Updated xfce4-cpugraph-plugin to 0.2.2

* Bug fixes

4 files changed, 29 insertions, 58 deletions

diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile
index c98b7708e96..86a033a542d 100644
--- a/sysutils/xfce4-cpugraph-plugin/Makefile
+++ b/sysutils/xfce4-cpugraph-plugin/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/06/21 06:06:11 martti Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/30 12:33:53 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-XFCE4_VERSION=	0.2.0
+XFCE4_VERSION=	0.2.2
 
 DISTNAME=	xfce4-cpugraph-plugin-${XFCE4_VERSION}
 CATEGORIES=	sysutils
diff --git a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
index 861b1ae3cd8..038750727fe 100644
--- a/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
+++ b/sysutils/xfce4-cpugraph-plugin/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2004/06/21 06:06:11 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/06/30 12:33:53 martti Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:=	${XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-cpugraph-plugin}
 BUILDLINK_PACKAGES+=	xfce4-cpugraph-plugin
 
 .if !empty(XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.2.0
+BUILDLINK_DEPENDS.xfce4-cpugraph-plugin+=	xfce4-cpugraph-plugin>=0.2.2
 BUILDLINK_PKGSRCDIR.xfce4-cpugraph-plugin?=	../../sysutils/xfce4-cpugraph-plugin
 .endif	# XFCE4_CPUGRAPH_PLUGIN_BUILDLINK3_MK
 
diff --git a/sysutils/xfce4-cpugraph-plugin/distinfo b/sysutils/xfce4-cpugraph-plugin/distinfo
index 8115c3b1241..8bc3dee7c82 100644
--- a/sysutils/xfce4-cpugraph-plugin/distinfo
+++ b/sysutils/xfce4-cpugraph-plugin/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/06/28 00:47:40 kristerw Exp $
+$NetBSD: distinfo,v 1.3 2004/06/30 12:33:53 martti Exp $
 
-SHA1 (xfce4-cpugraph-plugin-0.2.0.tar.gz) = efad4db850e753e1c3e6f1ed93e7ce3251d750c0
-Size (xfce4-cpugraph-plugin-0.2.0.tar.gz) = 209312 bytes
-SHA1 (patch-aa) = 1ff45a4504fc418f7db4f5c2cdb525a851bfa452
+SHA1 (xfce4-cpugraph-plugin-0.2.2.tar.gz) = 64914e2d766ba093b6158d45ab37c0021057121b
+Size (xfce4-cpugraph-plugin-0.2.2.tar.gz) = 210953 bytes
+SHA1 (patch-aa) = e82ba46e5c089dd6dcc12f93361e4ba86cc9bd42
diff --git a/sysutils/xfce4-cpugraph-plugin/patches/patch-aa b/sysutils/xfce4-cpugraph-plugin/patches/patch-aa
index d8aaf593616..299264f0ce0 100644
--- a/sysutils/xfce4-cpugraph-plugin/patches/patch-aa
+++ b/sysutils/xfce4-cpugraph-plugin/patches/patch-aa
@@ -1,96 +1,67 @@
-$NetBSD: patch-aa,v 1.1 2004/06/28 00:47:40 kristerw Exp $
+$NetBSD: patch-aa,v 1.2 2004/06/30 12:33:53 martti Exp $
 
---- panel-plugin/cpu.c.orig	Mon Jun 28 02:38:06 2004
-+++ panel-plugin/cpu.c	Mon Jun 28 02:41:45 2004
-@@ -36,11 +36,12 @@
- void ReadSettings (Control *control, xmlNode *node)
- {
+--- panel-plugin/cpu.c.orig	2004-06-12 01:25:31.000000000 +0000
++++ panel-plugin/cpu.c	2004-06-30 15:18:42.000000000 +0000
+@@ -38,2 +38,3 @@
  	xmlChar *value;
 +	CPUGraph *base;
  
- 	if (node == NULL || node->children == NULL)
- 		return;
+@@ -42,3 +43,3 @@
  
 -	CPUGraph *base = (CPUGraph *)control->data;
 +	base = (CPUGraph *)control->data;
  
- 	for (node = node->children; node; node = node->next)
- 	{
-@@ -640,6 +641,8 @@
- 
- void DrawGraph (CPUGraph *base)
+@@ -653,2 +654,4 @@
  {
 +	int startx, starty;
 +	float step;
          GdkGC *fg1, *fg2, *bg, *fc;
- 	GtkWidget *da = base->m_DrawArea;
- 
-@@ -658,8 +661,8 @@
- 		gdk_gc_set_rgb_fg_color (fc, &base->m_FrameColor);
- 	}
+@@ -671,4 +674,4 @@
  
 -	int startx = base->m_Frame ? 1 : 0;
 -	int starty = base->m_Frame ? 1 : 0;
 +	startx = base->m_Frame ? 1 : 0;
 +	starty = base->m_Frame ? 1 : 0;
  
- 	gdk_draw_rectangle (da->window,
- 			    bg,
-@@ -678,7 +681,7 @@
-         }
- 																							
+@@ -691,3 +694,3 @@
  
 -	float step = base->m_Height/100.0;
 +	step = base->m_Height/100.0;
  
- 	if (base->m_Mode == 0)
-         {
-@@ -718,12 +721,14 @@
- 	else if (base->m_Mode == 1)
- 	{
+@@ -731,8 +734,10 @@
                  GdkGC *gc;
-+		int nrx, nry;
-+		float tstep;
-+		int x, y;
++                int nrx, nry;
++                float tstep;
++                int x, y;
  		if (base->m_ColorMode > 0)
  			gc = gdk_gc_new (da->window);
--                int nrx = base->m_Width/3.0;
--                int nry = base->m_Height/2.0;
+-                int nrx = (base->m_Width+1)/3.0;
+-                int nry = (base->m_Height+1)/2.0;
 -                float tstep = nry/100.0;
 -                int x, y;
-+                nrx = base->m_Width/3.0;
-+                nry = base->m_Height/2.0;
++                nrx = (base->m_Width+1)/3.0;
++                nry = (base->m_Height+1)/2.0;
 +                tstep = nry/100.0;
                  for (x=nrx-1;x>=0;x--)
-                 {
- 	                int usage = (int)(base->m_History[nrx - 1 - x]*tstep);
-@@ -761,12 +766,15 @@
- 	else if (base->m_Mode == 2)
- 	{
+@@ -774,8 +779,11 @@
  		GdkGC *gc;
 +		int y;
-+		int usage;
++		float usage;
 +		int tmp;
 +		int length;
  		if (base->m_ColorMode > 0)
  			gc = gdk_gc_new (da->window);
 -		int y;
--		int usage = (int)(base->m_History[0]*step);
+-		float usage = base->m_History[0]*step;
 -		int tmp=0;
 -		int length = base->m_Height - (base->m_Height - usage);
-+		usage = (int)(base->m_History[0]*step);
++		usage = base->m_History[0]*step;
 +		tmp=0;
 +		length = base->m_Height - (base->m_Height - usage);
  		for (y=base->m_Height-1;y>=base->m_Height - usage;y--)
- 		{
- 			if (base->m_ColorMode > 0)
-@@ -926,8 +934,8 @@
- 
- void SetHistorySize (CPUGraph *base, int size)
+@@ -948,4 +956,4 @@
  {
 -	base->m_History = (long *)realloc (base->m_History, size*sizeof (long));
  	int i;
 +	base->m_History = (long *)realloc (base->m_History, size*sizeof (long));
  	for (i=size-1;i>=base->m_Values;i--)
- 		base->m_History[i] = 0;
- 	base->m_Values = size;