Fix kwin[-opengl]. Per bug #353048.

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

3 files changed, 58 insertions, 2 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 6b7298a71d54..5ea6f59a80b7 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.217 2011/04/06 14:19:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.218 2011/04/07 17:57:54 scarabeus Exp $
+
+  07 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> kwin-4.6.2.ebuild,
+  +files/kwin-fix-opengl.patch:
+  Fix kwin[-opengl]. Per bug #353048.
 
 *kwin-4.6.2 (06 Apr 2011)
 
diff --git a/kde-base/kwin/files/kwin-fix-opengl.patch b/kde-base/kwin/files/kwin-fix-opengl.patch
new file mode 100644
index 000000000000..245aced289c2
--- /dev/null
+++ b/kde-base/kwin/files/kwin-fix-opengl.patch
@@ -0,0 +1,51 @@
+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() )
+         {
diff --git a/kde-base/kwin/kwin-4.6.2.ebuild b/kde-base/kwin/kwin-4.6.2.ebuild
index d6f2a6c6ee1f..3653456951b4 100644
--- a/kde-base/kwin/kwin-4.6.2.ebuild
+++ b/kde-base/kwin/kwin-4.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.6.2.ebuild,v 1.1 2011/04/06 14:19:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.6.2.ebuild,v 1.2 2011/04/07 17:57:54 scarabeus Exp $
 
 EAPI=3
 
@@ -45,6 +45,7 @@ KMEXTRACTONLY="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-fix-opengl.patch"
 )
 
 src_prepare() {