Remove unneeded files

Package-Manager: portage-2.2.0_alpha124/cvs/Linux x86_64

11 files changed, 11 insertions, 637 deletions

diff --git a/x11-wm/compiz/ChangeLog b/x11-wm/compiz/ChangeLog
index 6251f2400c27..07666a94988f 100644
--- a/x11-wm/compiz/ChangeLog
+++ b/x11-wm/compiz/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-wm/compiz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.70 2012/09/11 10:03:31 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/compiz/ChangeLog,v 1.71 2012/09/11 10:17:29 pinkbyte Exp $
+
+  11 Sep 2012; Sergey Popov <pinkbyte@gentoo.org>
+  -files/compiz-0.6.2-CVE-2007-3920.patch, -files/compiz-0.7.8-framesvg.patch,
+  -files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch,
+  -files/compiz-0.8.4-crash-on-opening-windows.patch,
+  -files/compiz-0.8.4-gtk+-2.20-build.patch, -files/compiz-0.8.4-kde44.patch,
+  -files/compiz-0.8.4-libpng14.patch, -files/compiz-0.8.4-place-plugin.patch,
+  -files/compiz-0.8.4-window-region-calculation.patch:
+  Remove unneeded files
 
   11 Sep 2012; Sergey Popov <pinkbyte@gentoo.org> -files/0.3.6/compiz-start:
   Remove old script
diff --git a/x11-wm/compiz/Manifest b/x11-wm/compiz/Manifest
index 04edfe3bee45..6aaab670ec9c 100644
--- a/x11-wm/compiz/Manifest
+++ b/x11-wm/compiz/Manifest
@@ -1,12 +1,3 @@
-AUX compiz-0.6.2-CVE-2007-3920.patch 1019 SHA256 63b7dd520b4659f8124e3122ffeb0577c07d90539211f8383037eef744c0e5ee SHA512 e25cdc0f6d2ad798151322240bd59fca87d8358f1de544fede415c8219c4fd197331080e044bbf4da2eeddafb0cff9faac51bc139136a830719b3d62d4ac22ef WHIRLPOOL e69c93676d60cf62415b2a4e0432a12cd6224fad0934378545e8a81a0e675617e69644b31b6134bd1492b414034161ca6a1c607a27915e4864a80178d1c91362
-AUX compiz-0.7.8-framesvg.patch 3119 SHA256 9d323dd2ff10848d3c2cac93b00b67cca878f77942443a96f16b82c649535a21 SHA512 e942aa9b1632c042809eb7866cd27438e526804cb304fc466424f1309b30831f137931609e82295a8ef7183c245b9ac41e308d9b9d62e13ddfbbeb8f36266e13 WHIRLPOOL 6a17ba1c214ef30c79223fa1f4803c16307f032702659ffdd95531994d543a3731287c196e813a3778173998b8dd6ce7cccd21405262508a9fa020a65126d148
-AUX compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch 1118 SHA256 071a9a8032a21cd560cb68eb172b2557bb997cffc750ba8212c2fd88443d9519 SHA512 63658291ce3757e2c357c5660c92157b64170aae5666efd956a32b0b806650622505efb9b57f751e458697ece6ca07a3ded86620ff980514fb571ff22adeac13 WHIRLPOOL 9706351d5c2aa19e3dbe495f1469520339a54185be61bccd322c5b411c26b2d2f6d28349acd54671ea5ce3d1e42baf1f6e6b0286eee8dfe628fa0700131cbbe9
-AUX compiz-0.8.4-crash-on-opening-windows.patch 2018 SHA256 49e7c74ea45a247b203167b9761b977e6faa37e63ccde552823cb6f2df87379c SHA512 cb0fc7cffad5cf1adbf0575547d3b4e70d4362a6d4efdf6ecfe35bf071bdf55832867bce9aa7e8682302cc2f22b35159073f54f9e08d84cbe47ec6e6bda5d623 WHIRLPOOL 6ec421dc9b6b1b1ab609412c264891e0c2eb3902d0bd6bfba346352259ebe128169536905392f9d9119e6d508f2ce89647c1bf9981e3ed56436a44ed249f0d84
-AUX compiz-0.8.4-gtk+-2.20-build.patch 428 SHA256 e53dab667b7cae6815f53bbabd8e45ecdc84bf2e0378ed1036825f0658d27c1b SHA512 a6706a9b20db319da16d8645299e8a542919656c541ab1183280b19c24fb62ceb229f1ff1cd983bd2453070e594fa50c7520b54d3232023a587d06b2083b81d6 WHIRLPOOL 7fd1bd43dee536e92204b15564e51fc0f98359426505593e27306551b105250349a503bcda3180cde6d77a86737f7de2570d334ac63e330a2f2a2a1f665c6640
-AUX compiz-0.8.4-kde44.patch 5885 SHA256 e40e670ce80d6fd6bff933bd235e4f6ad0382d1b29b8e56a2648980824761366 SHA512 f6b7628b45f500ea385529bbe37b1a750d0ecbeeef81aea690a7de43789ce3a3f721eddbd63d4aad6555e693662b62b73509b49899a1d2d517040eae826595f5 WHIRLPOOL 94749414e46d8322b0397dbc9b50e0ef5db1572603a1017b88c4883784eddf98a3ef85d9970d3d8d319c42911a412cac4689f2fd35148ab76fe65c1097770a65
-AUX compiz-0.8.4-libpng14.patch 1079 SHA256 ff335ba40869d5ac11f3f59b0617092581d0032cb2124d0336cac5d962b95dc2 SHA512 409a914174d0f3be4355c9b3914140fab0e3aa092210caa9f362927081e964ad835833cc7a08bdb9b4a7f353cc0172579b23ee9da8b5b170bdaef8c96e0ae84a WHIRLPOOL 6d47a5ab6d1124d21a32a1871fb475d850967e5a675067239cfa84ca02d7928b9c2287993e35824ec03463cafd8fd4e4f04c7c69f5ce8fd7698ab59eb947dee4
-AUX compiz-0.8.4-place-plugin.patch 3674 SHA256 1e6a8b945b20909cb492755fd7732252e506c2ba2136b5253cde5dc59d5375f0 SHA512 27e74769066bae0693169c711badaabb606ddc01e3b671ffaab7b440d6a7882b22a265b456a067bbd77cf79b315ea86878aa214e50734eaa8489e6592a492a97 WHIRLPOOL 6fc36ab14d5c39f75e1b036ab7b18f082f6599887d312205b85a894b5f6a0c4f1f9db0feb931912c0866f2db26a715f55c9dc6fc755e19686553e6de22700af4
-AUX compiz-0.8.4-window-region-calculation.patch 1197 SHA256 b9c64eba865445f4209f6073d1a96ddd110bb012ba9d2701501901d6c791ecfc SHA512 f55d910806959f74de63043e3e692213ec66a3c4694e7f8ddaa780a90c4fe2cc7fd066f4e6a04ac7029aa7d6193a42cf25487920bda4b8426f4ae76010af2f12 WHIRLPOOL f7705e524490166abbf21aea88992fd9c8cde8482076ff9d763721a5af40b5dee57bf9e99fc748932a3caba6e0510738ac33796f30f0895449afcad323761681
 AUX compiz-0.8.6-gdk-display-deprecated.patch 3392 SHA256 a8038d6a80abe7f44f433f6ab0dd0cf39945850564b5da33244b88a099b4efb8 SHA512 49e1d8cda54cd698acfdebd38ac4d5edf10bf41202463ea836eb19b996205207c3000c64789baf8b6de6cd52f9cc9c5a74ac3603401af21b69c4228a141d07b1 WHIRLPOOL 3849521d85186190c88aa028b65c22e206a9eaf764482d1a35b3449b843d09d51368fca9a02b8d68f49bec7f664a8d3a38ab47dc1db10cb578f0331829234e7b
 AUX compiz-0.8.6-r2-fontcorruption.patch 676 SHA256 2c4c42a251c1583a8e7fe468c1868aa42b1318db5ee95189e23ae9be8061cd43 SHA512 b7ac11650ced25e9bb3b5c6a2e5d0d478a4235f5b8b009c7dc08ac314c714c01cbb7485e49f6bcfbdbd995223b25dc3f5d4f3f8b41af2a7772459f7e285e60d2 WHIRLPOOL 46e73c97bb6b6f01e907cf0016bee79da7b2899201e08d4d88d29e6f6a4e4bf983a107b32839a2e2049c893018e12db21380c9b59af449f04ad434763555324e
 AUX compiz-kde-4.8.patch 755 SHA256 4feb22c82d21c9d870d669498badf95c01f735a85f8a5f4d63b4877b6f74df65 SHA512 fccbe0afc6e7c651912dc0e271f3745e96f5562da210934d79f00820e3b94d8340ee62707a840e042d287eba920ff556c36a39032815549d86676cd53e1cbbcc WHIRLPOOL 0d0f015463dfccfec237ce97a781868c6a76a3ab96caa8c5ed656ea0504e425a7490c8289bf56a63c2c2f9cde6bf580c1b56a6a663b3086e9a25a85ff955b48b
@@ -18,5 +9,5 @@ DIST compiz-0.8.6.tar.bz2 1162334 SHA256 c4df69b59b5660a37462de9ff0212af024ccf9c
 DIST compiz-0.8.8.tar.bz2 1123892 SHA256 3ba555b0d6d536850a227d37d6ebc5cd5b15ee5bad83d7956529a27b870977e3 SHA512 6e3bad018835fdbc1b0e5ecb51a46a77a6531d46d77ee3ae4169273632ea9a6839c78300b18e2198c41698517efa65ded75387785b0c5bbbb6da41498451b644 WHIRLPOOL fa1d9b5e443d45a4615201a85a74dd025066620339ebac58b4fd5c71c19db731009c013ceee93f0345b46c413211424bc4c813d48e07d6cea874024a2b562ba2
 EBUILD compiz-0.8.6-r3.ebuild 4030 SHA256 17331b2883d72fcce403c1485dbf408b5dbc8781202c4e285f11e0b8dfcb6d70 SHA512 2072736bce9dd3be5def0f5ab8bea12e027f86dc698aef2cafa9fbb7ce984a288ba9a0711bd8892c37e50b404a759ca90f9223aa5ea137490251302f6fa8c8ee WHIRLPOOL 9c7fb53527a44b0635a888899808071091bb3c1e409fef84440d23384cf6d7ee5d8946e7d3e09c382063bd89c20d23ea806968193a470234360ff777efd4c10c
 EBUILD compiz-0.8.8.ebuild 3844 SHA256 0c4b611221ce6d8000bc0794d53c6d4d9ea435e63513c7bd03df86a4d648089d SHA512 688d091b56762560e81f70198019b1f043db2e8223544b9fd710872630570b23e1dec6d75ac6d01900fe5aeede050e59a5339fe240ad7eea708937b8301a361a WHIRLPOOL add8add692fa5b44170bfe912a80bab83146687fb7430d664d7a62e8bdebc82400a64166bb9edbd5d0ac2541917a8e2d5a09e787948366637a74850fe1b18faa
-MISC ChangeLog 13300 SHA256 418dc7094e99b9101e3273fc37b98b06ad2dd9947d54fda511458f06497741b9 SHA512 558a6f736e3ee1aa14e017049610b13592dab8bc92f0b27e189879f403cb3a0e7c1cb383eff4c333c2973c131af266cfeefec97bc83089f90172629584cf0fb8 WHIRLPOOL 360f5225b66b61eee6ab6e79e274f63e9fc0e6e17bff1dc5ee76e82814bfffec7b8affe7ee83c2fc7a3131aa82cdc77742df8656a76e1f2ae134d38c826155a0
+MISC ChangeLog 13778 SHA256 c325bd7edf337e4e721ec1137fa42b590acca2b14a912c75c59c6d253743f979 SHA512 b9a77783326658a8f9c2e693bc0557ec914207202c5035762f08405df8840373fe0791262383a809828dbd9916d25015d028e83f25e9a8903d2464987d2ecdd8 WHIRLPOOL b99d2cd5bb052beca08cb6187e8ac8bbecf2aa7fc4ad378f934fb054ecacf2c14dbef8435caf5b15076ca7137e99a5f8382765a2422f431c48df0dab7b402256
 MISC metadata.xml 632 SHA256 a0dce016c36d51c1fe13822ed59ba3aef9b8a22fecdb2d3f5360b824ee890bb1 SHA512 46e6acb05014ec6cb5b77b6ff5ae31adff93ded582ad7ca22e90ce16c00f6ce7009fe72e603af83d0e6d5604f177e8eb175cdac2703d715c065e5df2834740a7 WHIRLPOOL 9499ba8dba186cc869cbc34cb7c964655c870318eaa28ca0d7ddef8b473e199edeea48f90f3394ff39334af6b8924f46dae4fa1a43ff9a75d54b0358cea88a2e
diff --git a/x11-wm/compiz/files/compiz-0.6.2-CVE-2007-3920.patch b/x11-wm/compiz/files/compiz-0.6.2-CVE-2007-3920.patch
deleted file mode 100644
index e2de8fd8563f..000000000000
--- a/x11-wm/compiz/files/compiz-0.6.2-CVE-2007-3920.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: compiz-0.6.2/src/screen.c
-===================================================================
---- compiz-0.6.2.orig/src/screen.c
-+++ compiz-0.6.2/src/screen.c
-@@ -2244,7 +2244,8 @@ findTopLevelWindowAtScreen (CompScreen *
- 	    for (w = s->windows; w; w = w->next)
- 		if (w->frame == id)
- 		    return w;
--	}
-+	} else if (w->resName && strstr(w->resName,"screensaver"))
-+	    return w;
- 
- 	return NULL;
-     }
-Index: compiz-0.6.2/src/paint.c
-===================================================================
---- compiz-0.6.2.orig/src/paint.c
-+++ compiz-0.6.2/src/paint.c
-@@ -211,7 +211,9 @@ paintOutputRegion (CompScreen	       *sc
- 	    if (count == 0					      &&
- 		!REGION_NOT_EMPTY (tmpRegion)			      &&
- 		screen->opt[COMP_SCREEN_OPTION_UNREDIRECT_FS].value.b &&
--		XEqualRegion (w->region, &screen->region))
-+		XEqualRegion (w->region, &screen->region)             &&
-+		!(w->resName && strcmp(w->resName, "gnome-screensaver") == 0)
-+	       )
- 	    {
- 		unredirectWindow (w);
- 		fullscreenWindow = w;
diff --git a/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch b/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch
deleted file mode 100644
index a3eb30357f99..000000000000
--- a/x11-wm/compiz/files/compiz-0.7.8-framesvg.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -p -up compiz-0.7.8/configure.ac.framesvg compiz-0.7.8/configure.ac
---- compiz-0.7.8/configure.ac.framesvg	2008-11-20 15:58:43.000000000 +0100
-+++ compiz-0.7.8/configure.ac	2008-11-20 16:34:25.000000000 +0100
-@@ -487,7 +487,7 @@ if test "x$use_kde4" = "xyes"; then
-   kde4libs=`kde4-config --install lib --expandvars 2>/dev/null`
-   kde4incs=`kde4-config --install include --expandvars 2>/dev/null`
- 
--  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/panelsvg.h"
-+  kde4_test_includes="kdecoration.h kcommondecoration.h kdecorationbridge.h plasma/framesvg.h"
- 
-   dnl Check for KWin headers
-   AC_MSG_CHECKING([for KWin headers])
-diff -p -up compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp.framesvg compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp
---- compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp.framesvg	2008-08-08 13:20:31.000000000 +0200
-+++ compiz-0.7.8/kde/window-decorator-kde4/switcher.cpp	2008-11-20 16:38:10.000000000 +0100
-@@ -30,7 +30,7 @@
- 
- #include <fixx11h.h>
- 
--#include <KDE/Plasma/PanelSvg>
-+#include <KDE/Plasma/FrameSvg>
- #include <KDE/Plasma/Theme>
- 
- #include <kwindowsystem.h>
-@@ -46,9 +46,9 @@ mId (id)
-     QColor   color;
-     color = Plasma::Theme::defaultTheme ()->color (Plasma::Theme::TextColor);
- 
--    mBackground = new Plasma::PanelSvg();
-+    mBackground = new Plasma::FrameSvg();
-     mBackground->setImagePath ("dialogs/background");
--    mBackground->setEnabledBorders(Plasma::PanelSvg::AllBorders);
-+    mBackground->setEnabledBorders(Plasma::FrameSvg::AllBorders);
- 
-     mBorder.left   = mBackground->marginSize(Plasma::LeftMargin);
-     mBorder.right  = mBackground->marginSize(Plasma::RightMargin);
-@@ -131,8 +131,8 @@ KWD::Switcher::redrawPixmap ()
-     p.setCompositionMode (QPainter::CompositionMode_Source);
-     p.setRenderHint (QPainter::SmoothPixmapTransform);
- 
--    mBackground->resizePanel (QSizeF (contentWidth, contentHeight));
--    mBackground->paintPanel (&p, QRect (0, 0, contentWidth,
-+    mBackground->resizeFrame (QSizeF (contentWidth, contentHeight));
-+    mBackground->paintFrame (&p, QRect (0, 0, contentWidth,
- 			contentHeight));
- 
-     mBackgroundPixmap = mPixmap.copy (mBorder.left, mBorder.top,
-@@ -168,7 +168,7 @@ KWD::Switcher::update ()
-     p.setCompositionMode (QPainter::CompositionMode_Source);
- 
- 
--    mBackground->paintPanel (&p, QRect (mBorder.left, mBorder.top +
-+    mBackground->paintFrame (&p, QRect (mBorder.left, mBorder.top +
- 			mGeometry.height () + 5, mGeometry.width (),
- 			fm.height ()));
- 
-diff -p -up compiz-0.7.8/kde/window-decorator-kde4/switcher.h.framesvg compiz-0.7.8/kde/window-decorator-kde4/switcher.h
---- compiz-0.7.8/kde/window-decorator-kde4/switcher.h.framesvg	2008-08-08 13:20:31.000000000 +0200
-+++ compiz-0.7.8/kde/window-decorator-kde4/switcher.h	2008-11-20 16:36:22.000000000 +0100
-@@ -30,7 +30,7 @@
- 
- namespace Plasma
- {
--class PanelSvg;
-+class FrameSvg;
- }
- 
- class QSpacerItem;
-@@ -70,7 +70,7 @@ class Switcher
- 
- 	QRect mGeometry;
- 
--	Plasma::PanelSvg *mBackground;
-+	Plasma::FrameSvg *mBackground;
- 	QPixmap mPixmap;
- 	QPixmap mBackgroundPixmap;
- 
diff --git a/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch b/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch
deleted file mode 100644
index e9888c3ff2c7..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.2-gtk-gnome-missing-gconf-flags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Author: Romain Perier <mrpouet@gentoo.org>
-Subject: Missing gconf flags for gnome plugin, fix bug #282807
-Date: 2009-08-29 12:25
-
----
- gtk/gnome/Makefile.am |    7 ++++---
- 1 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/gtk/gnome/Makefile.am b/gtk/gnome/Makefile.am
-index 208318a..d0a7c54 100644
---- a/gtk/gnome/Makefile.am
-+++ b/gtk/gnome/Makefile.am
-@@ -2,7 +2,7 @@ moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
- 
- if USE_GNOME
- libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
--libcompiz_la_LIBADD  = @GNOME_WINDOW_SETTINGS_LIBS@
-+libcompiz_la_LIBADD  = @GNOME_WINDOW_SETTINGS_LIBS@ @GCONF_LIBS@
- libcompiz_la_SOURCES = 		\
- 	compiz-window-manager.c	\
- 	compiz-window-manager.h
-@@ -76,8 +76,9 @@ if USE_GNOME_KEYBINDINGS
- endif
- endif
- 
--INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@			   \
--	-DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \
-+INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@				\
-+	@GCONF_CFLAGS@							\
-+	-DMETACITY_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" 	\
- 	-DLOCALEDIR="\"@datadir@/locale"\"
- 
- noinst_LTLIBRARIES = \
diff --git a/x11-wm/compiz/files/compiz-0.8.4-crash-on-opening-windows.patch b/x11-wm/compiz/files/compiz-0.8.4-crash-on-opening-windows.patch
deleted file mode 100644
index 17a0c70a0fd1..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.4-crash-on-opening-windows.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 43c269a377e7b446fb1bb70732835b7395ce9524 Mon Sep 17 00:00:00 2001
-From: Danny Baumann <dannybaumann@web.de>
-Date: Mon, 25 Jan 2010 06:28:34 +0000
-Subject: Fix crash on opening windows.
-
-We must defer match evaluation until window initialization has finished
-for all plugins as match evaluation means wrapped function calls.
----
-diff --git a/plugins/obs.c b/plugins/obs.c
-index a8d67f1..0f5b9d0 100644
---- a/plugins/obs.c
-+++ b/plugins/obs.c
-@@ -88,6 +88,8 @@ typedef struct _ObsWindow
- {
-     int customFactor[MODIFIER_COUNT];
-     int matchFactor[MODIFIER_COUNT];
-+
-+    CompTimeoutHandle updateHandle;
- } ObsWindow;
- 
- #define GET_OBS_DISPLAY(d) \
-@@ -323,6 +325,22 @@ obsMatchPropertyChanged (CompDisplay *d,
-     WRAP (od, d, matchPropertyChanged, obsMatchPropertyChanged);
- }
- 
-+static Bool
-+obsUpdateWindow (void *closure)
-+{
-+    CompWindow *w = (CompWindow *) closure;
-+    int        i;
-+
-+    OBS_WINDOW (w);
-+
-+    for (i = 0; i < MODIFIER_COUNT; i++)
-+	updatePaintModifier (w, i);
-+
-+    ow->updateHandle = 0;
-+
-+    return FALSE;
-+}
-+
- static CompOption *
- obsGetDisplayOptions (CompPlugin  *p,
- 		      CompDisplay *display,
-@@ -628,8 +646,8 @@ static CompBool
- obsInitWindow (CompPlugin *p,
- 	       CompWindow *w)
- {
--    ObsWindow    *ow;
--    int          i;
-+    ObsWindow *ow;
-+    int       i;
- 
-     OBS_SCREEN (w->screen);
- 
-@@ -643,10 +661,11 @@ obsInitWindow (CompPlugin *p,
- 	ow->matchFactor[i]  = 100;
-     }
- 
--    w->base.privates[os->windowPrivateIndex].ptr = ow;
-+    /* defer initializing the factors from window matches as match evalution
-+       means wrapped function calls */
-+    ow->updateHandle = compAddTimeout (0, 0, obsUpdateWindow, w);
- 
--    for (i = 0; i < MODIFIER_COUNT; i++)
--	updatePaintModifier (w, i);
-+    w->base.privates[os->windowPrivateIndex].ptr = ow;
- 
-     return TRUE;
- }
-@@ -657,6 +676,9 @@ obsFiniWindow (CompPlugin *p,
- {
-     OBS_WINDOW (w);
- 
-+    if (ow->updateHandle)
-+	compRemoveTimeout (ow->updateHandle);
-+
-     free (ow);
- }
- 
---
-cgit v0.8.2
diff --git a/x11-wm/compiz/files/compiz-0.8.4-gtk+-2.20-build.patch b/x11-wm/compiz/files/compiz-0.8.4-gtk+-2.20-build.patch
deleted file mode 100644
index 7da8f30a2d4c..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.4-gtk+-2.20-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c.old	2010-03-28 13:01:58.639940630 +0200
-+++ compiz-0.8.4/gtk/window-decorator/gtk-window-decorator.c	2010-03-28 13:02:30.580354171 +0200
-@@ -4233,7 +4233,7 @@
- static void
- hide_tooltip (void)
- {
--    if (GTK_WIDGET_VISIBLE (tip_window))
-+    if (gtk_widget_get_visible (tip_window))
- 	g_get_current_time (&tooltip_last_popdown);
- 
-     gtk_widget_hide (tip_window);
diff --git a/x11-wm/compiz/files/compiz-0.8.4-kde44.patch b/x11-wm/compiz/files/compiz-0.8.4-kde44.patch
deleted file mode 100644
index bc466035ab9e..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.4-kde44.patch
+++ /dev/null
@@ -1,225 +0,0 @@
-From 04c6a44893a00088c63acd3ba327022f8aa551cc Mon Sep 17 00:00:00 2001
-From: Dennis Kasprzyk <onestone@compiz-fusion.org>
-Date: Fri, 12 Feb 2010 20:07:41 +0000
-Subject: Kde 4.4 support.
-
----
-diff --git a/kde/window-decorator-kde4/window.cpp b/kde/window-decorator-kde4/window.cpp
-index a7cd2d4..99c502d 100644
---- a/kde/window-decorator-kde4/window.cpp
-+++ b/kde/window-decorator-kde4/window.cpp
-@@ -486,31 +486,39 @@ KWD::Window::showWindowMenu (const QRect &pos)
-     showWindowMenu (pos.bottomLeft ());
- }
- 
--void
--KWD::Window::processMousePressEvent (QMouseEvent *qme)
-+KWD::Options::MouseCommand
-+KWD::Window::buttonToCommand (Qt::MouseButtons button)
- {
-     Options::MouseCommand com = Options::MouseNothing;
--    bool		  active = isActive ();
-+    bool                  active = isActive ();
- 
-     if (!mSupportTakeFocus)
--	active = TRUE;
-+	active = true;
- 
--    switch (qme->button ()) {
-+    switch (button) {
-     case Qt::LeftButton:
- 	com = active ? Decorator::options ()->commandActiveTitlebar1 () :
--	Decorator::options()->commandInactiveTitlebar1 ();
-+	               Decorator::options()->commandInactiveTitlebar1 ();
- 	break;
-     case Qt::MidButton:
- 	com = active ? Decorator::options ()->commandActiveTitlebar2 () :
--	Decorator::options()->commandInactiveTitlebar2 ();
-+	               Decorator::options()->commandInactiveTitlebar2 ();
- 	break;
-     case Qt::RightButton:
- 	com = active ? Decorator::options ()->commandActiveTitlebar3 () :
--	Decorator::options()->commandInactiveTitlebar3 ();
-+	               Decorator::options()->commandInactiveTitlebar3 ();
-     default:
- 	break;
-     }
- 
-+    return com;
-+}
-+
-+void
-+KWD::Window::processMousePressEvent (QMouseEvent *qme)
-+{
-+    Options::MouseCommand com = buttonToCommand (qme->button ());
-+
-     if (qme->button () == Qt::LeftButton)
-     {
- 	// actions where it's not possible to get the matching release event
-@@ -752,6 +760,96 @@ KWD::Window::compositingActive (void) const
-     return true;
- }
- 
-+#if KDE_IS_VERSION(4,3,90)
-+
-+QRect
-+KWD::Window::transparentRect () const
-+{
-+    return QRect ();
-+}
-+
-+bool
-+KWD::Window::isClientGroupActive ()
-+{
-+    return false;
-+}
-+
-+QList<ClientGroupItem>
-+KWD::Window::clientGroupItems () const
-+{
-+    QList<ClientGroupItem> items;
-+
-+    QIcon icon (mIcon);
-+    icon.addPixmap (mMiniIcon);
-+
-+    items.append (ClientGroupItem (mName, icon));
-+
-+    return items;
-+}
-+
-+long
-+KWD::Window::itemId (int index)
-+{
-+    return (long) mClientId;
-+}
-+
-+int
-+KWD::Window::visibleClientGroupItem ()
-+{
-+    return 0;
-+}
-+
-+void
-+KWD::Window::setVisibleClientGroupItem (int index)
-+{
-+}
-+
-+void
-+KWD::Window::moveItemInClientGroup (int index, int before)
-+{
-+}
-+
-+void
-+KWD::Window::moveItemToClientGroup (long itemId, int before)
-+{
-+}
-+
-+void
-+KWD::Window::removeFromClientGroup (int index, const QRect& newGeom)
-+{
-+}
-+
-+void
-+KWD::Window::closeClientGroupItem (int index)
-+{
-+    closeWindow ();
-+}
-+
-+void
-+KWD::Window::closeAllInClientGroup ()
-+{
-+    closeWindow ();
-+}
-+
-+void
-+KWD::Window::displayClientMenu (int index, const QPoint& pos)
-+{
-+    showWindowMenu (pos);
-+}
-+
-+KDecorationDefines::WindowOperation
-+KWD::Window::buttonToWindowOperation(Qt::MouseButtons button)
-+{
-+    Options::MouseCommand com = buttonToCommand (button);
-+
-+    if (com == Options::MouseOperationsMenu)
-+	return KDecorationDefines::OperationsOp;
-+
-+    return KDecorationDefines::NoOp;
-+}
-+
-+#endif
-+
- void
- KWD::Window::createDecoration (void)
- {
-@@ -1466,7 +1564,7 @@ KWD::Window::moveWindow (QMouseEvent *qme)
-     NET::Direction direction;
- 
-     direction = positionToDirection (mDecor->mousePosition (qme->pos ()));
--    
-+
-     QPoint p (mGeometry.x () - mExtents.left, mGeometry.y () - mExtents.top);
-     p += qme->pos ();
- 
-@@ -1476,7 +1574,7 @@ KWD::Window::moveWindow (QMouseEvent *qme)
-     Decorator::rootInfo ()->restackRequest (mClientId, NET::FromApplication,
- 			 		    None, Above,
- 					    QX11Info::appTime());
--					    
-+
-     Decorator::rootInfo ()->moveResizeRequest (mClientId,
- 					       p.x (),
- 					       p.y (),
-diff --git a/kde/window-decorator-kde4/window.h b/kde/window-decorator-kde4/window.h
-index 40a5076..c2b274b 100644
---- a/kde/window-decorator-kde4/window.h
-+++ b/kde/window-decorator-kde4/window.h
-@@ -26,6 +26,7 @@
- 
- #include <kdecorationbridge.h>
- #include <KDE/KActionCollection>
-+#include <kdeversion.h>
- 
- #include <qpixmap.h>
- #include <qwidget.h>
-@@ -111,7 +112,24 @@ class Window: public QObject, public KDecorationBridgeUnstable {
- 
- 	/* unstable API */
- 	virtual bool compositingActive () const;
--	
-+#if KDE_IS_VERSION(4,3,90)
-+	virtual QRect transparentRect () const;
-+
-+	virtual bool isClientGroupActive ();
-+	virtual QList<ClientGroupItem> clientGroupItems () const;
-+	virtual long itemId (int index);
-+	virtual int visibleClientGroupItem ();
-+	virtual void setVisibleClientGroupItem (int index);
-+	virtual void moveItemInClientGroup (int index, int before);
-+	virtual void moveItemToClientGroup (long itemId, int before);
-+	virtual void removeFromClientGroup (int index, const QRect& newGeom);
-+	virtual void closeClientGroupItem (int index);
-+	virtual void closeAllInClientGroup ();
-+	virtual void displayClientMenu (int index, const QPoint& pos);
-+
-+	virtual WindowOperation
-+	    buttonToWindowOperation(Qt::MouseButtons button);
-+#endif
- 	virtual bool eventFilter (QObject* o, QEvent* e);
- 
- 	void handleActiveChange (void);
-@@ -191,8 +209,10 @@ class Window: public QObject, public KDecorationBridgeUnstable {
- 				 int rightOffset);
- 	void updateProperty (void);
- 	void getWindowProtocols (void);
-+
-+	Options::MouseCommand buttonToCommand (Qt::MouseButtons button);
- 	void performMouseCommand (KWD::Options::MouseCommand command,
--				  QMouseEvent		     *qme);
-+				  QMouseEvent                *qme);
- 	NET::Direction positionToDirection (int pos);
- 	Cursor positionToCursor (QPoint pos);
- 
---
-cgit v0.8.2
diff --git a/x11-wm/compiz/files/compiz-0.8.4-libpng14.patch b/x11-wm/compiz/files/compiz-0.8.4-libpng14.patch
deleted file mode 100644
index fb9a89782303..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.4-libpng14.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -uNr compiz-0.8.4.old/plugins/png.c compiz-0.8.4/plugins/png.c
---- compiz-0.8.4.old/plugins/png.c	2009-09-01 07:38:22.000000000 +0200
-+++ compiz-0.8.4/plugins/png.c	2010-02-15 22:16:30.000000000 +0100
-@@ -102,7 +102,7 @@
- 
-     /* expand gray bit depth if needed */
-     if (color_type == PNG_COLOR_TYPE_GRAY && depth < 8)
--	png_set_gray_1_2_4_to_8 (png);
-+	png_set_expand_gray_1_2_4_to_8 (png);
- 
-     /* transform transparency to alpha */
-     if (png_get_valid(png, info, PNG_INFO_tRNS))
-@@ -167,7 +167,7 @@
-     Bool	  status;
- 
-     sig_bytes = fread (png_sig, 1, PNG_SIG_SIZE, file);
--    if (png_check_sig (png_sig, sig_bytes) == 0)
-+    if (png_sig_cmp (png_sig, 0, sig_bytes) != 0)
- 	return FALSE;
- 
-     png = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-@@ -218,7 +218,7 @@
-     Bool		status;
- 
-     memcpy (png_sig, buffer, PNG_SIG_SIZE);
--    if (png_check_sig (png_sig, PNG_SIG_SIZE) == 0)
-+    if (png_sig_cmp (png_sig, 0, PNG_SIG_SIZE) != 0)
- 	return FALSE;
- 
-     png = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
diff --git a/x11-wm/compiz/files/compiz-0.8.4-place-plugin.patch b/x11-wm/compiz/files/compiz-0.8.4-place-plugin.patch
deleted file mode 100644
index ee258eb09714..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.4-place-plugin.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From db88fb6f3f6c0fa3c81bc04a2a3468252d49f098 Mon Sep 17 00:00:00 2001
-From: Danny Baumann <dannybaumann@web.de>
-Date: Sun, 31 Jan 2010 12:36:42 +0000
-Subject: Fix handling of windows that have a server border set.
-
-Also handle windows that have a server border set properly in pointer
-(placement mode)
-
----
-diff --git a/plugins/place.c b/plugins/place.c
-index d59de33..a54e60a 100644
---- a/plugins/place.c
-+++ b/plugins/place.c
-@@ -131,12 +131,15 @@ typedef enum {
- 
- /* helper macros to get the full dimensions of a window,
-    including decorations */
-+#define BORDER_WIDTH(w)  ((w)->input.left + (w)->input.right + \
-+			  2 * (w)->serverBorderWidth)
-+#define BORDER_HEIGHT(w) ((w)->input.top + (w)->input.bottom + \
-+			  2 * (w)->serverBorderWidth)
-+
- #define WIN_FULL_X(w) ((w)->serverX - (w)->input.left)
- #define WIN_FULL_Y(w) ((w)->serverY - (w)->input.top)
--#define WIN_FULL_W(w) ((w)->serverWidth + 2 * (w)->serverBorderWidth + \
--		       (w)->input.left + (w)->input.right)
--#define WIN_FULL_H(w) ((w)->serverHeight + 2 * (w)->serverBorderWidth + \
--		       (w)->input.top + (w)->input.bottom)
-+#define WIN_FULL_W(w) ((w)->serverWidth + BORDER_WIDTH (w))
-+#define WIN_FULL_H(w) ((w)->serverHeight + BORDER_HEIGHT (w))
- 
- static Bool
- placeMatchXYValue (CompWindow *w,
-@@ -1216,8 +1219,8 @@ placeConstrainToWorkarea (CompWindow *w,
- 
-     extents.left   = *x - w->input.left;
-     extents.top    = *y - w->input.top;
--    extents.right  = *x + w->serverWidth + w->input.right;
--    extents.bottom = *y + w->serverHeight + w->input.bottom;
-+    extents.right  = extents.left + WIN_FULL_W (w);
-+    extents.bottom = extents.top + WIN_FULL_H (w);
- 
-     delta = workArea->x + workArea->width - extents.right;
-     if (delta < 0)
-@@ -1419,9 +1422,9 @@ placeDoValidateWindowResizeRequest (CompWindow     *w,
-     }
- 
-     left   = x - w->input.left;
--    right  = x + xwc->width + w->input.right;
-+    right  = left + xwc->width + BORDER_WIDTH (w);
-     top    = y - w->input.top;
--    bottom = y + xwc->height + w->input.bottom;
-+    bottom = top + xwc->height + BORDER_HEIGHT (w);
- 
-     output = outputDeviceForGeometry (s,
- 				      xwc->x, xwc->y,
-@@ -1484,9 +1487,9 @@ placeDoValidateWindowResizeRequest (CompWindow     *w,
- 
-     /* bring left/right/top/bottom to actual window coordinates */
-     left   += w->input.left;
--    right  -= w->input.right;
-+    right  -= w->input.right + 2 * w->serverBorderWidth;
-     top    += w->input.top;
--    bottom -= w->input.bottom;
-+    bottom -= w->input.bottom + 2 * w->serverBorderWidth;
- 
-     if ((right - left) != xwc->width)
-     {
-@@ -1886,17 +1889,13 @@ placeDoHandleScreenSizeChange (CompScreen *s,
- 		{
- 		    mask |= CWX | CWWidth;
- 		    xwc.x = vpX * s->width + workArea.x + w->input.left;
--		    xwc.width = workArea.width -
--			(2 * w->serverBorderWidth +
--			 w->input.left + w->input.right);
-+		    xwc.width = workArea.width - BORDER_WIDTH (w);
- 		}
- 		if (w->state & CompWindowStateMaximizedVertMask)
- 		{
- 		    mask |= CWY | CWHeight;
- 		    xwc.y = vpY * s->height + workArea.y + w->input.top;
--		    xwc.height = workArea.height -
--			(2 * w->serverBorderWidth +
--			 w->input.top + w->input.bottom);
-+		    xwc.height = workArea.height - BORDER_HEIGHT (w);
- 		}
- 	    }
- 	}
---- a/plugins/place.c
-+++ b/plugins/place.c
-@@ -847,8 +847,8 @@ placePointer (CompWindow *w,
- 
-     if (placeGetPointerPosition (w->screen, &xPointer, &yPointer))
-     {
--	*x = xPointer - (w->serverWidth / 2);
--	*y = yPointer - (w->serverHeight / 2);
-+	*x = xPointer - (w->serverWidth / 2) - w->serverBorderWidth;
-+	*y = yPointer - (w->serverHeight / 2) - w->serverBorderWidth;
-     }
-     else
-     {
---
-cgit v0.8.2
diff --git a/x11-wm/compiz/files/compiz-0.8.4-window-region-calculation.patch b/x11-wm/compiz/files/compiz-0.8.4-window-region-calculation.patch
deleted file mode 100644
index c4e26a2a7de5..000000000000
--- a/x11-wm/compiz/files/compiz-0.8.4-window-region-calculation.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 79a275b240a98d9f64c8dd1e799e5d469ec8f204 Mon Sep 17 00:00:00 2001
-From: Danny Baumann <dannybaumann@web.de>
-Date: Wed, 20 Jan 2010 14:05:10 +0000
-Subject: Fix window region calculation for windows that have border width set.
-
----
-diff --git a/src/window.c b/src/window.c
-index 90922d1..e7bb987 100644
---- a/src/window.c
-+++ b/src/window.c
-@@ -1701,8 +1701,8 @@ updateWindowRegion (CompWindow *w)
-     {
- 	r.x      = -w->attrib.border_width;
- 	r.y      = -w->attrib.border_width;
--	r.width  = w->width;
--	r.height = w->height;
-+	r.width  = w->attrib.width + w->attrib.border_width;
-+	r.height = w->attrib.height + w->attrib.border_width;
- 
- 	rects = &r;
- 	n = 1;
-@@ -1719,8 +1719,10 @@ updateWindowRegion (CompWindow *w)
-     {
- 	rect.extents.x1 = rects[i].x + w->attrib.border_width;
- 	rect.extents.y1 = rects[i].y + w->attrib.border_width;
--	rect.extents.x2 = rect.extents.x1 + rects[i].width;
--	rect.extents.y2 = rect.extents.y1 + rects[i].height;
-+	rect.extents.x2 = rect.extents.x1 + rects[i].width +
-+			  w->attrib.border_width;
-+	rect.extents.y2 = rect.extents.y1 + rects[i].height +
-+			  w->attrib.border_width;
- 
- 	if (rect.extents.x1 < 0)
- 	    rect.extents.x1 = 0;
---
-cgit v0.8.2