Fix memory leak as described in upstream bug #3812, comment #8.

Package-Manager: portage-2.1.4.4

4 files changed, 96 insertions, 3 deletions

diff --git a/xfce-base/xfdesktop/ChangeLog b/xfce-base/xfdesktop/ChangeLog
index 299d40bc24d9..b280c41e3089 100644
--- a/xfce-base/xfdesktop/ChangeLog
+++ b/xfce-base/xfdesktop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for xfce-base/xfdesktop
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.118 2007/12/17 18:39:05 jer Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/ChangeLog,v 1.119 2008/02/25 15:06:10 drac Exp $
+
+*xfdesktop-4.4.2-r1 (25 Feb 2008)
+
+  25 Feb 2008; Samuli Suominen <drac@gentoo.org>
+  +files/xfdesktop-4.4.2-memory-leak.patch, +xfdesktop-4.4.2-r1.ebuild:
+  Fix memory leak as described in upstream bug #3812, comment #8.
 
   17 Dec 2007; Jeroen Roovers <jer@gentoo.org> xfdesktop-4.4.2.ebuild:
   Stable for HPPA (bug #201747).
diff --git a/xfce-base/xfdesktop/Manifest b/xfce-base/xfdesktop/Manifest
index 57b63c2eb8a8..2c21066a40a6 100644
--- a/xfce-base/xfdesktop/Manifest
+++ b/xfce-base/xfdesktop/Manifest
@@ -1,7 +1,9 @@
 AUX xfdesktop-4.4.1-translation.patch 16569 RMD160 7bbd9d40a212f13ab3e94ad49d1f6e129fc47788 SHA1 78d1e3297e06fa40d63354c597c1c0ad47c23e05 SHA256 c5a4895f1db46ba0d5c32095c00d0108a80c326b8b2cfb42956eeafdb0721bd1
+AUX xfdesktop-4.4.2-memory-leak.patch 496 RMD160 a91fd1c2ebcdeeb3cd75228c86602a881beecbc9 SHA1 a2fa027dac82925b86e1bda263f9529a5149bc8f SHA256 43238dac7b27cf6e4467fd70861d097ce3949865407ce8adbcd91d04a493c391
 DIST xfdesktop-4.4.1.tar.bz2 3067577 RMD160 10e182f2cebd309ed7e2b18d00331861e21f4528 SHA1 46324ad37bb782ec7a5da11c619d9e76a0f54133 SHA256 abf8c93af0df9d6ec730917e02c57783546c40b8be091a74a5160bbf59ee4a80
 DIST xfdesktop-4.4.2.tar.bz2 3047839 RMD160 4e1e4db449a6e18e3c32458c7946246f399c52af SHA1 f2ff4d429c0241401bdeebd3dc9b71b35dbe9ae8 SHA256 7e50c13e45b1424924c49dd1e9daa6c16881ee57ac21e4e2c6f20c0eec227cdb
 EBUILD xfdesktop-4.4.1-r1.ebuild 2339 RMD160 fcf4e27a94b90096c9dff487b9382028f6d363c5 SHA1 3e97defe0b9754da395311bc46310815ae3b628c SHA256 f844565d7e01da8918c9c34cce7eb75673aa24c35eb007c2d4b5436ce7d930e4
+EBUILD xfdesktop-4.4.2-r1.ebuild 2077 RMD160 2eb9d9f5b8631b2ec166524dd0681ab97236655d SHA1 97eb602a52e9fd7f37d139e82b85aaa919107748 SHA256 c30076c4bcedb7e0990005f21a68c96abd4f00e4c9c258c5163d3c67d641af79
 EBUILD xfdesktop-4.4.2.ebuild 2016 RMD160 c2c3416a7a961f57ecb3a7e14d022b8c05bae92c SHA1 30c7461d9a0ab1156d63b7752ae7e6837356a10e SHA256 3fb67cebf67ac2a9a6e989fa0879b5f88561cce174eb5073a0ef7c73f7489364
-MISC ChangeLog 14756 RMD160 da50179353841949919994f643101fc312ac4902 SHA1 c49abe27ce4a63690474992ee50bb843c109619c SHA256 ed2945926c363f0a8ed9d73d0c268445d80ef05dd81c01c01a085872ba023e8d
+MISC ChangeLog 14980 RMD160 7c5ddfc3928cb33f096807869337809e84e8e376 SHA1 2b9e3c14f2543f9e4c88cca2b970e7d2e270c72e SHA256 043ebdcf4576630455049c6f355e4eb16219ef261a151ad3886d8c10d7ebaae9
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
diff --git a/xfce-base/xfdesktop/files/xfdesktop-4.4.2-memory-leak.patch b/xfce-base/xfdesktop/files/xfdesktop-4.4.2-memory-leak.patch
new file mode 100644
index 000000000000..4b7ac36966cc
--- /dev/null
+++ b/xfce-base/xfdesktop/files/xfdesktop-4.4.2-memory-leak.patch
@@ -0,0 +1,11 @@
+diff -ur xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c
+--- xfdesktop-4.4.2.orig/modules/menu/desktop-menu-dentry.c	2007-11-17 21:31:43.000000000 +0200
++++ xfdesktop-4.4.2/modules/menu/desktop-menu-dentry.c	2008-02-25 17:00:37.000000000 +0200
+@@ -173,6 +173,7 @@
+         if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
+             break;
+     }
++    g_list_free(items);
+     
+     gtk_menu_shell_insert(menu_shell, mi, i);
+     
diff --git a/xfce-base/xfdesktop/xfdesktop-4.4.2-r1.ebuild b/xfce-base/xfdesktop/xfdesktop-4.4.2-r1.ebuild
new file mode 100644
index 000000000000..0f32f178145a
--- /dev/null
+++ b/xfce-base/xfdesktop/xfdesktop-4.4.2-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfdesktop/xfdesktop-4.4.2-r1.ebuild,v 1.1 2008/02/25 15:06:10 drac Exp $
+
+EAPI=1
+
+inherit eutils xfce44
+
+XFCE_VERSION=4.4.2
+xfce44
+xfce44_core_package
+
+DESCRIPTION="Desktop manager"
+HOMEPAGE="http://www.xfce.org/projects/xfdesktop"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc +file-icons +menu-plugin"
+
+LANG="be ca cs da de el es et eu fi fr he hu it ja ko nb_NO nl pa pl pt_BR ro ru sk sv tr uk vi zh_CN zh_TW"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	gnome-base/librsvg
+	>=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+	>=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+	>=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}
+	file-icons? ( >=xfce-base/thunar-${THUNAR_MASTER_VERSION}
+		>=xfce-extra/exo-0.3.2 dev-libs/dbus-glib )
+	menu-plugin? ( >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION} )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool"
+
+for X in ${LANG}; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+DOCS="AUTHORS ChangeLog NEWS TODO README"
+
+XFCE_LOCALIZED_CONFIGS="/etc/xdg/xfce4/desktop/xfce-registered-categories.xml
+	/etc/xdg/xfce4/desktop/menu.xml"
+
+pkg_setup() {
+	XFCE_CONFIG+=" $(use_enable doc xsltproc) $(use_enable menu-plugin panel-plugin)"
+
+	if use file-icons; then
+		XFCE_CONFIG+=" --enable-thunarx --enable-file-icons --enable-exo"
+	else
+		XFCE_CONFIG+=" --disable-thunarx --disable-file-icons --disable-exo"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	echo src/xfdesktop-clipboard-manager.c >> po/POTFILES.skip
+	epatch "${FILESDIR}"/${P}-memory-leak.patch
+}
+
+src_install() {
+	xfce44_src_install
+
+	local config lang
+	for config in ${XFCE_LOCALIZED_CONFIGS}; do
+		for lang in ${LANG}; do
+			local localized_config="${D}/${config}.${lang}"
+			if [[ -f ${localized_config} ]]; then
+				use "linguas_${lang}" || rm ${localized_config}
+			fi
+		done
+	done
+}