summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-06-14 13:23:49 +0000
committerAlexey Shvetsov <alexxy@gentoo.org>2009-06-14 13:23:49 +0000
commit885cefd46e6447528e897e7e3fbc41dcde932668 (patch)
tree8e427c687b12ba18baba3d307ae73619f3618950 /kde-base/kwin
parent[kde-base/kstars] Clean unneeded patches (diff)
downloadhistorical-885cefd46e6447528e897e7e3fbc41dcde932668.tar.gz
historical-885cefd46e6447528e897e7e3fbc41dcde932668.tar.bz2
historical-885cefd46e6447528e897e7e3fbc41dcde932668.zip
[kde-base/kwin] Clean unneeded patches
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
Diffstat (limited to 'kde-base/kwin')
-rw-r--r--kde-base/kwin/ChangeLog7
-rw-r--r--kde-base/kwin/files/kwin-4.0.4-memory-leak.patch20
-rw-r--r--kde-base/kwin/files/kwin-4.0.5-no-compositing.patch13
3 files changed, 6 insertions, 34 deletions
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 70ae0dc4ee73..5f7030b82de0 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for kde-base/kwin
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.155 2009/06/14 11:41:59 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.156 2009/06/14 13:23:49 alexxy Exp $
+
+ 14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org>
+ -files/kwin-4.0.4-memory-leak.patch,
+ -files/kwin-4.0.5-no-compositing.patch:
+ Clean unneeded patches
14 Jun 2009; Alexey Shvetsov <alexxy@gentoo.org> -kwin-4.2.3.ebuild:
Drop KDE 4.2.3
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
deleted file mode 100644
index 2b07df24c97a..000000000000
--- a/kde-base/kwin/files/kwin-4.0.4-memory-leak.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/files/kwin-4.0.5-no-compositing.patch b/kde-base/kwin/files/kwin-4.0.5-no-compositing.patch
deleted file mode 100644
index 40de6cbbde0e..000000000000
--- a/kde-base/kwin/files/kwin-4.0.5-no-compositing.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- kdebase/workspace/kwin/lib/kwineffects.cpp 2008/05/08 19:06:28 805574
-+++ kdebase/workspace/kwin/lib/kwineffects.cpp 2008/05/24 08:24:48 811956
-@@ -294,8 +294,10 @@
- {
- switch( compositing_type )
- {
-+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
- case OpenGLCompositing:
- return GLTexture::saturationSupported();
-+#endif
- case XRenderCompositing:
- return false; // never
- default: