ports/109725: update-port x11/xfce4-taskmanager

[Oliver Lehmann]

>Number:         109725
>Category:       ports
>Synopsis:       update-port x11/xfce4-taskmanager
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 01 17:10:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Oliver Lehmann
>Release:        FreeBSD 6.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 6.2-STABLE FreeBSD 6.2-STABLE #0: Wed Feb 21 20:10:29 CET 2007 root at kartoffel.salatschuessel.net:/usr/obj/amd64-athlon64-6.2/usr/src/sys/KARTOFFEL amd64


>Description:
	this is for fixing a memory leak
	Submitted by:	Xavier Otazu <xotazu at cvc.uab.es>

>How-To-Repeat:
>Fix:


--- xfce4-taskmanager.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/ports/x11/xfce4-taskmanager/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	1 Feb 2007 16:24:52 -0000	1.6
+++ Makefile	1 Mar 2007 15:27:59 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-taskmanager
 PORTVERSION=	0.4.0.r2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://xfce4-taskmanager.nebulon.de/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-rc/}
Index: files/patch-src-interface.c
===================================================================
RCS file: files/patch-src-interface.c
diff -N files/patch-src-interface.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src-interface.c	1 Mar 2007 15:27:59 -0000
@@ -0,0 +1,62 @@
+--- src/interface.c.orig	Wed Aug 23 20:55:38 2006
++++ src/interface.c	Thu Mar  1 16:20:58 2007
+@@ -359,12 +359,9 @@
+ 
+ gint compare_int_list_item(GtkTreeModel *model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer column)
+ {	
+-	gchar *s1 = NULL;
+-	gchar *s2 = NULL;
+-	
+-        s1 = (gchar*)malloc(sizeof(char) * 100);
+-	s2 = (gchar*)malloc(sizeof(char) * 100);
+-        
++ 	gchar s1[256];
++	gchar s2[256];      
++
+ 	gint ret = 0;
+ 
+ 	gtk_tree_model_get(model, iter1, column, &s1, -1);
+@@ -380,40 +377,19 @@
+ 		i2 = atoi(s2);
+ 		
+ 	ret = i1 - i2;
+-	
+-	if(s1 != NULL)
+-		g_free(s1);
+-	if(s2 != NULL)
+-		g_free(s2);
+-	
+ 	return ret;
+ }
+ 
+ gint compare_string_list_item(GtkTreeModel *model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer column)
+ {	
+-	gchar *s1 = NULL;
+-	gchar *s2 = NULL;
+-	
+-        s1 = (gchar*)malloc(sizeof(gchar) * 100);
+-	s2 = (gchar*)malloc(sizeof(gchar) * 100);
+-        
++	gchar s1[256];
++	gchar s2[256];
++       
+ 	gint ret = 0;
+ 
+ 	gtk_tree_model_get(model, iter1, GPOINTER_TO_INT(column), &s1, -1);
+ 	gtk_tree_model_get(model, iter2, GPOINTER_TO_INT(column), &s2, -1);
+-
+-	if(s1 == NULL)
+-		s1 = "";
+-	if(s2 == NULL)
+-		s2 = "";
+-
+ 	ret = strcmp(s1, s2);
+-	
+-	if(s1 != NULL)
+-		g_free(s1);
+-	if(s2 != NULL)
+-		g_free(s2);
+-	
+ 	return ret;
+ }
+ 
Index: files/patch-src-xfce-taskmanager-freebsd.c
===================================================================
RCS file: /usr/local/cvsroot/ports/x11/xfce4-taskmanager/files/patch-src-xfce-taskmanager-freebsd.c,v
retrieving revision 1.2
diff -u -r1.2 patch-src-xfce-taskmanager-freebsd.c
--- files/patch-src-xfce-taskmanager-freebsd.c	1 Feb 2007 16:24:53 -0000	1.2
+++ files/patch-src-xfce-taskmanager-freebsd.c	1 Mar 2007 15:27:59 -0000
@@ -1,6 +1,6 @@
---- src/xfce-taskmanager-freebsd.c.orig	Thu Jan  1 01:00:00 1970
-+++ src/xfce-taskmanager-freebsd.c	Thu Feb  1 12:17:27 2007
-@@ -0,0 +1,171 @@
+--- src/xfce-taskmanager-freebsd.c.orig	Thu Mar  1 16:17:09 2007
++++ src/xfce-taskmanager-freebsd.c	Thu Mar  1 16:18:01 2007
+@@ -0,0 +1,172 @@
 +/*
 + Copyright (c) 2006 Oliver Lehmann <oliver at FreeBSD.org>
 + All rights reserved.
@@ -170,5 +170,6 @@
 +		}
 +
 +	}
++	kvm_close(kd);
 +	return task_list;
 +}
--- xfce4-taskmanager.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: