cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backport two patches from upstream 4_4 branch which fixes two memleaks.

Browse Source 
While here, convert to use x11/xfce4 module.

ok ajacoutot@
This commit is contained in:
landry 2008-06-14 16:35:36 +00:00
parent dc4df24aba
commit fbc6a820bf
3 changed files with 40 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
x11/xfce4/xfdesktop/Makefile
View File

@ -1,24 +1,18 @@
# $OpenBSD: Makefile,v 1.18 2008/05/24 01:24:31 fgsch Exp $ # $OpenBSD: Makefile,v 1.19 2008/06/14 16:35:36 landry Exp $
COMMENT= xfce4 desktop manager COMMENT= xfce4 desktop manager
V= 4.4.2 XFCE_PROJECT= xfdesktop
DISTNAME= xfdesktop-${V} PKGNAME= ${DISTNAME}p2
PKGNAME= ${DISTNAME}p1
HOMEPAGE= http://www.xfce.org/projects/xfdesktop/ # GPLv2
MAINTAINER= Landry Breuil <gaston@gcu.info>
# GPL
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes PERMIT_PACKAGE_FTP= Yes
MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ MODULES= x11/xfce4
EXTRACT_SUFX= .tar.bz2 DESKTOP_FILES= Yes
USE_GMAKE= Yes
CONFIGURE_ARGS= --enable-thunarx \ CONFIGURE_ARGS= --enable-thunarx \
--enable-exo --enable-exo
@ -27,8 +21,7 @@ LIB_DEPENDS= xfcegui4.>=4::x11/xfce4/libxfcegui4 \
xfce4mcs-client.>=3::x11/xfce4/libxfce4mcs \ xfce4mcs-client.>=3::x11/xfce4/libxfce4mcs \
thunar-vfs-1.>=4,thunarx-1.>=4::x11/xfce4/thunar \ thunar-vfs-1.>=4,thunarx-1.>=4::x11/xfce4/thunar \
RUN_DEPENDS= ::devel/desktop-file-utils \ RUN_DEPENDS= ::x11/xfce4/xfce-mcs-manager
::x11/xfce4/xfce-mcs-manager
WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ WANTLIB= ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \ Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 \

12
x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menu-dentry_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-modules_menu_desktop-menu-dentry_c,v 1.1 2008/06/14 16:35:36 landry Exp $
--- modules/menu/desktop-menu-dentry.c.orig Thu Jun 12 18:24:40 2008
+++ modules/menu/desktop-menu-dentry.c Thu Jun 12 18:25:02 2008
@@ -173,7 +173,7 @@ _menu_shell_insert_sorted(GtkMenuShell *menu_shell, Gt
if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
break;
}
-
+ g_list_free(items);
gtk_menu_shell_insert(menu_shell, mi, i);
return i;

21
x11/xfce4/xfdesktop/patches/patch-modules_menu_desktop-menuspec_c Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-modules_menu_desktop-menuspec_c,v 1.1 2008/06/14 16:35:37 landry Exp $
--- modules/menu/desktop-menuspec.c.orig Thu Jun 12 18:25:32 2008
+++ modules/menu/desktop-menuspec.c Thu Jun 12 18:26:06 2008
@@ -203,7 +203,7 @@ get_paths_multilevel(GNode *node, gpointer data)
else
foundcat = NULL;
if(!foundcat) {
- g_ptr_array_free(revpath, FALSE);
+ g_ptr_array_free(revpath, TRUE);
revpath = NULL;
break;
}
@@ -220,7 +220,7 @@ get_paths_multilevel(GNode *node, gpointer data)
newpath[totlen] = 0;
g_ptr_array_add(mtfpi->paths, newpath);
- g_ptr_array_free(revpath, FALSE);
+ g_ptr_array_free(revpath, TRUE);
}
}
}