Remove old.

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

5 files changed, 6 insertions, 215 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index e1b7ecfac1e4..3504c402aaa9 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.263 2012/02/21 12:52:36 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.264 2012/02/21 15:34:52 johu Exp $
+
+  21 Feb 2012; Johannes Huber <johu@gentoo.org>
+  -files/kwin-4.6.3-desktopnames.patch, -files/kwin-4.6.5-mesadri.patch,
+  -files/kwin-4.6.5-performance.patch, -files/kwin-fix-opengl.patch:
+  Remove old.
 
   20 Feb 2012; Johannes Huber <johu@gentoo.org> -kwin-4.6.3-r1.ebuild:
   Remove KDE SC 4.6.3
diff --git a/kde-base/kwin/files/kwin-4.6.3-desktopnames.patch b/kde-base/kwin/files/kwin-4.6.3-desktopnames.patch
deleted file mode 100644
index ec2b3642ac50..000000000000
--- a/kde-base/kwin/files/kwin-4.6.3-desktopnames.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit a2d4c3ebdf7137f3543c88245f0bfd3dba308ebf
-Author: Thomas Lübking <thomas.luebking@gmail.com>
-Date:   Sun May 8 16:27:31 2011 +0200
-
-    Don't store virtual desktop settings while loading them
-    
-    BUG: 272666
-    FIXED-IN: 4.6.4
-
-diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
-index 3033e65..f5df9d9 100644
---- a/kwin/workspace.cpp
-+++ b/kwin/workspace.cpp
-@@ -1229,8 +1229,10 @@ void Workspace::slotReinitCompositing()
-         }
-     }
- 
-+static bool _loading_desktop_settings = false;
- void Workspace::loadDesktopSettings()
-     {
-+    _loading_desktop_settings = true;
-     KSharedConfig::Ptr c = KGlobal::config();
-     QString groupname;
-     if( screen_number == 0 )
-@@ -1246,10 +1248,13 @@ void Workspace::loadDesktopSettings()
-         rootInfo->setDesktopName( i, s.toUtf8().data() );
-         desktop_focus_chain[i-1] = i;
-         }
-+    _loading_desktop_settings = false;
-     }
- 
- void Workspace::saveDesktopSettings()
-     {
-+    if (_loading_desktop_settings)
-+        return;
-     KSharedConfig::Ptr c = KGlobal::config();
-     QString groupname;
-     if (screen_number == 0)
diff --git a/kde-base/kwin/files/kwin-4.6.5-mesadri.patch b/kde-base/kwin/files/kwin-4.6.5-mesadri.patch
deleted file mode 100644
index 41af096feac8..000000000000
--- a/kde-base/kwin/files/kwin-4.6.5-mesadri.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit afe966579d56f85444c432a3a6adf026d2941bd5
-Author: Martin Gräßlin <mgraesslin@kde.org>
-Date:   Sun May 1 11:49:26 2011 +0200
-
-    Enable direct rendering for all Mesa drivers
-    
-    As KWin requires at least Mesa 7.10 for OpenGL we can be sure
-    that all Mesa drivers support DRI2 and can enable direct rendering
-    for it.
-    
-    Parsing the version string to identify if it is a mesa driver.
-    This can cause breakage again in future versions of Mesa.
-    Unfortunately version, vendor and renderer are the only information
-    queryable just with OpenGL API.
-    BUG: 270942
-    FIXED-IN: 4.7.0
-
-diff --git a/kwin/opengltest/opengltest.cpp b/kwin/opengltest/opengltest.cpp
-index d2d8f70..eda7b51 100644
---- a/kwin/opengltest/opengltest.cpp
-+++ b/kwin/opengltest/opengltest.cpp
-@@ -81,16 +81,9 @@ int main(int argc, char *argv[])
-     if ((major == 1 && minor < 3) && !strstr(glxExtensions, "GLX_EXT_texture_from_pixmap"))
-         return 1;
- 
--    // Assume that direct rendering works with DRI2 drivers
--    const GLubyte *renderer = glGetString(GL_RENDERER);
--    if (strstr((const char *)renderer, "DRI2"))
--        return 0;
--
--    // The Intel driver doesn't have DRI2 in the renderer string
--    if (strstr((const char *)renderer, "GEM"))
--        return 0;
--
--    if (strstr((const char *)renderer, "Gallium"))
-+    // Assume that all Mesa drivers support direct rendering
-+    const GLubyte *version = glGetString(GL_VERSION);
-+    if (strstr((const char *)version, "Mesa"))
-         return 0;
- 
-     // Direct contexts also work with the NVidia driver
diff --git a/kde-base/kwin/files/kwin-4.6.5-performance.patch b/kde-base/kwin/files/kwin-4.6.5-performance.patch
deleted file mode 100644
index a706370d9232..000000000000
--- a/kde-base/kwin/files/kwin-4.6.5-performance.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ruN kwin-4.6.5.orig/kwin/effects.cpp kwin-4.6.5/kwin/effects.cpp
---- kwin-4.6.5.orig/kwin/effects.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ kwin-4.6.5/kwin/effects.cpp	2011-09-13 22:25:18.943156120 +0200
-@@ -156,7 +156,7 @@
-     {
-     if( current_paint_screen < loaded_effects.size())
-         {
--        loaded_effects[current_paint_screen++].second->prePaintScreen( data, time );
-+        loaded_effects.at(current_paint_screen++).second->prePaintScreen( data, time );
-         --current_paint_screen;
-         }
-     // no special final code
-@@ -166,7 +166,7 @@
-     {
-     if( current_paint_screen < loaded_effects.size())
-         {
--        loaded_effects[current_paint_screen++].second->paintScreen( mask, region, data );
-+        loaded_effects.at(current_paint_screen++).second->paintScreen( mask, region, data );
-         --current_paint_screen;
-         }
-     else
-@@ -177,7 +177,7 @@
-     {
-     if( current_paint_screen < loaded_effects.size())
-         {
--        loaded_effects[current_paint_screen++].second->postPaintScreen();
-+        loaded_effects.at(current_paint_screen++).second->postPaintScreen();
-         --current_paint_screen;
-         }
-     // no special final code
-@@ -187,7 +187,7 @@
-     {
-     if( current_paint_window < loaded_effects.size())
-         {
--        loaded_effects[current_paint_window++].second->prePaintWindow( w, data, time );
-+        loaded_effects.at(current_paint_window++).second->prePaintWindow( w, data, time );
-         --current_paint_window;
-         }
-     // no special final code
-@@ -197,7 +197,7 @@
-     {
-     if( current_paint_window < loaded_effects.size())
-         {
--        loaded_effects[current_paint_window++].second->paintWindow( w, mask, region, data );
-+        loaded_effects.at(current_paint_window++).second->paintWindow( w, mask, region, data );
-         --current_paint_window;
-         }
-     else
-@@ -208,7 +208,7 @@
-     {
-     if( current_paint_effectframe < loaded_effects.size())
-         {
--        loaded_effects[current_paint_effectframe++].second->paintEffectFrame( frame, region, opacity, frameOpacity );
-+        loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame( frame, region, opacity, frameOpacity );
-         --current_paint_effectframe;
-         }
-     else
-@@ -222,7 +222,7 @@
-     {
-     if( current_paint_window < loaded_effects.size())
-         {
--        loaded_effects[current_paint_window++].second->postPaintWindow( w );
-+        loaded_effects.at(current_paint_window++).second->postPaintWindow( w );
-         --current_paint_window;
-         }
-     // no special final code
-@@ -240,7 +240,7 @@
-     {
-     if( current_draw_window < loaded_effects.size())
-         {
--        loaded_effects[current_draw_window++].second->drawWindow( w, mask, region, data );
-+        loaded_effects.at(current_draw_window++).second->drawWindow( w, mask, region, data );
-         --current_draw_window;
-         }
-     else
-@@ -251,7 +251,7 @@
-     {
-     if( current_build_quads < loaded_effects.size())
-         {
--        loaded_effects[current_build_quads++].second->buildQuads( w, quadList );
-+        loaded_effects.at(current_build_quads++).second->buildQuads( w, quadList );
-         --current_build_quads;
-         }
-     }
diff --git a/kde-base/kwin/files/kwin-fix-opengl.patch b/kde-base/kwin/files/kwin-fix-opengl.patch
deleted file mode 100644
index 245aced289c2..000000000000
--- a/kde-base/kwin/files/kwin-fix-opengl.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -urN kdebase-workspace-4.6.2/kwin/compositingprefs.cpp kdebase-workspace-4.6.2.new/kwin/compositingprefs.cpp
---- kdebase-workspace-4.6.2/kwin/compositingprefs.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ kdebase-workspace-4.6.2.new/kwin/compositingprefs.cpp	2011-04-07 19:37:28.637388362 +0200
-@@ -241,6 +241,7 @@
- // See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work.
- void CompositingPrefs::applyDriverSpecificOptions()
-     {
-+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
-     // Always recommend
-     mRecommendCompositing = true;
- 
-@@ -248,6 +249,7 @@
-     mStrictBinding = !gl->supports( LooseBinding );
-     if ( gl->driver() == Driver_Intel )
-         mEnableVSync = false;
-+#endif
-     }
- 
- 
-diff -urN kdebase-workspace-4.6.2/kwin/effects/logout/logout.cpp kdebase-workspace-4.6.2.new/kwin/effects/logout/logout.cpp
---- kdebase-workspace-4.6.2/kwin/effects/logout/logout.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ kdebase-workspace-4.6.2.new/kwin/effects/logout/logout.cpp	2011-04-07 19:50:58.355265494 +0200
-@@ -338,7 +338,9 @@
- 
- void LogoutEffect::windowDeleted( EffectWindow* w )
-     {
-+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
-     windows.removeAll( w );
-+#endif
-     ignoredWindows.removeAll( w );
-     if( w == logoutWindow )
-         logoutWindow = NULL;
-diff -urN kdebase-workspace-4.6.2/kwin/options.cpp kdebase-workspace-4.6.2.new/kwin/options.cpp
---- kdebase-workspace-4.6.2/kwin/options.cpp	2011-02-25 23:10:02.000000000 +0100
-+++ kdebase-workspace-4.6.2.new/kwin/options.cpp	2011-04-07 19:43:34.358816214 +0200
-@@ -57,6 +57,7 @@
-     int rate = -1;
-     if( options->refreshRate > 0 ) // use manually configured refresh rate
-         rate = options->refreshRate;
-+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
-     else if ( GLPlatform::instance()->driver() == Driver_NVidia )
-         {
-         QProcess nvidia_settings;
-@@ -73,6 +74,7 @@
-                 rate = qRound(frate);
-             }
-         }
-+#endif
- #ifdef HAVE_XRANDR
-     else if( Extensions::randrAvailable() )
-         {