Added patch from upstream to fix a memory leak.

Package-Manager: portage-2.1.5

4 files changed, 77 insertions, 5 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index a78e33acdd18..0dde51eebd02 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.125 2008/05/16 00:40:39 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.126 2008/05/16 09:51:21 ingmar Exp $
+
+  16 May 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/kwin-4.0.4-memory-leak.patch, +kwin-4.0.4-r1.ebuild:
+  Added patch from upstream to fix a memory leak.
 
 *kwin-4.0.4 (15 May 2008)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 896c3c2cc64c..f68dc1143d5a 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX kwin-4.0.4-memory-leak.patch 581 RMD160 599eb5b43b6385491724e914d13b7d61caf18ecb SHA1 0cc5e74326f177aac621f577a89867c3b175e8f2 SHA256 cec549e5ce56a5d62cd8d9d9808958e0d44c8d8a88622f12a9a4e6d23f8444d2
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdebase-3.5-patchset-05.tar.bz2 16068 RMD160 dc1572fbb3cf3ce9a8e424edd3408b8912c6bfd5 SHA1 ba4e667fe64e3095d8de0b4fa5813029557a2cac SHA256 d1d3c8b51c68610c76c61ba4923618a16609bb76af547d8d26bb9a3f6990bd4d
 DIST kdebase-3.5.8.tar.bz2 24200172 RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea SHA1 07f2e33aef101e97237676719ef2bf8418d894b2 SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493
@@ -13,13 +14,14 @@ EBUILD kwin-3.5.9-r1.ebuild 841 RMD160 60c44239ec22f59dd4a3dfa0616ec432665cbe82
 EBUILD kwin-3.5.9.ebuild 655 RMD160 1a961dd90db9eb51a0b775aea5b6f4b6add5ccb2 SHA1 425a1362a35664f5cee2b50aeb367979a28ff6ea SHA256 2fcba5ef24138de543e96fa253c76c4fbd1339dd41d337d3490753eb9c26ceec
 EBUILD kwin-4.0.2.ebuild 1203 RMD160 24e1d0aa9ab559b24a0b35f3f5091f91290d9066 SHA1 562ddc20d964ea48ddb72398b80c2d966ba04caa SHA256 4b8d5aeccd60df03b8d9cf31f2f03bf7f3413adca89a9dea88c2deacd0e35729
 EBUILD kwin-4.0.3.ebuild 1203 RMD160 e0229d9cf14bac96352fb8b5cc265cdc941ace48 SHA1 77b4951ec866792173521360b036835defe8c3ba SHA256 e4317cae67a5661807aa7577e056f1bc08520efd25bbee2b0e1651a4f65bfb98
+EBUILD kwin-4.0.4-r1.ebuild 1254 RMD160 4693bec29af17116c4149917cde7ad63607ca173 SHA1 93c284d7d67328b0e6ba894fd70f4bb4a2518606 SHA256 fdeb19115679a27543a4d2ef771d545d82b2c03bc04c5b20260832bef898d496
 EBUILD kwin-4.0.4.ebuild 1205 RMD160 3a734508bfaf6ded4b4b7d59e7af33f7439e6d65 SHA1 d60209724980f1b9ae9fe4efcc11f61eec5a45d3 SHA256 f49b382ab9438343330048943c84e5bde3cac0a8467065c44b594b0667b46f9d
-MISC ChangeLog 15296 RMD160 22cb207362a8a5b08157e1eeda794e85402340b0 SHA1 5983f5c4d404ce82863f181d92f996b670c484d0 SHA256 67831702722b0f5a1dbfc85e3cea9ad14721dda2b02ffede4f7f4d38aac4e85b
+MISC ChangeLog 15461 RMD160 c325a53ddad54e2c999bab31e5d66aef09d66624 SHA1 4287165c58d5e924870cb1ef0d0e85907135e1f1 SHA256 45a1fed70b62216740b1f69cd68df84d595c034ec798a4053f5188c12997b4d8
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgs1+QACgkQB18eXLOpYdn2+ACgrqWgBWKaTE80Y1VohYPkzeOm
-YQEAn12y3+lsKW8nEL0wJSjebyFrOXYB
-=iurO
+iEYEARECAAYFAkgtWPcACgkQB18eXLOpYdnptwCgmkPBqZ3gDMaKLIsOZ2+k5P5q
+7pcAn0EjYHvRFnyRTJ2+kS1XZzEDN/EV
+=8Soj
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.0.4-memory-leak.patch b/kde-base/kwin/files/kwin-4.0.4-memory-leak.patch
new file mode 100644
index 000000000000..2b07df24c97a
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.0.4-memory-leak.patch
@@ -0,0 +1,20 @@
+--- kdebase/workspace/kwin/layers.cpp	2008/05/05 07:22:45	804132
++++ kdebase/workspace/kwin/layers.cpp	2008/05/05 07:23:32	804133
+@@ -721,7 +721,7 @@
+ ToplevelList Workspace::rootStackingOrder() const
+     {
+     Window dummy;
+-    Window* windows;
++    Window* windows = NULL;
+     unsigned int count = 0;
+     XQueryTree( display(), rootWindow(), &dummy, &dummy, &windows, &count );
+     ToplevelList ret;
+@@ -736,6 +736,8 @@
+         }
+     foreach( Deleted* c, deleted )
+         ret.append( c );
++    if( windows != NULL )
++        XFree( windows );
+     return ret;
+     }
+ 
diff --git a/kde-base/kwin/kwin-4.0.4-r1.ebuild b/kde-base/kwin/kwin-4.0.4-r1.ebuild
new file mode 100644
index 000000000000..345c9324e99d
--- /dev/null
+++ b/kde-base/kwin/kwin-4.0.4-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.0.4-r1.ebuild,v 1.1 2008/05/16 09:51:21 ingmar Exp $
+
+EAPI="1"
+
+KMNAME=kdebase-workspace
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~amd64 ~x86"
+IUSE="captury debug opengl xcomposite xinerama"
+
+COMMONDEPEND="
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXrender
+	captury? ( media-libs/libcaptury )
+	opengl? ( virtual/opengl )
+	xcomposite? ( x11-libs/libXcomposite )
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${COMMONDEPEND}
+	x11-proto/damageproto
+	x11-proto/renderproto
+	xcomposite? ( x11-proto/compositeproto )
+	xinerama? ( x11-proto/xineramaproto )"
+RDEPEND="${COMMONDEPEND}"
+
+PATCHES="${FILESDIR}/${P}-memory-leak.patch"
+
+src_compile() {
+	if ! use captury; then
+		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
+			-i "${S}"/kwin/effects/CMakeLists.txt || \
+			die "Making captury optional failed."
+	fi
+
+	mycmakeargs="${mycmakeargs}
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with xcomposite X11_Xcomposite)
+		$(cmake-utils_use_with xinerama X11_Xinerama)"
+
+	kde4-meta_src_compile
+}