rpms/kdebase-workspace/F-10 kdebase-workspace-4.1.3-kwin-kde#174782.patch, NONE, 1.1 kdebase-workspace.spec, 1.141, 1.142

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7915

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.3-kwin-kde#174782.patch 
Log Message:
apply upstream patch to fix X crash when disabling compositing


kdebase-workspace-4.1.3-kwin-kde#174782.patch:

--- NEW FILE kdebase-workspace-4.1.3-kwin-kde#174782.patch ---
Index: workspace/kwin/scene_opengl.cpp
===================================================================
--- workspace/kwin/scene_opengl.cpp	(Revision 882880)
+++ workspace/kwin/scene_opengl.cpp	(Revision 882881)
@@ -184,6 +184,8 @@
     foreach( Window* w, windows )
         delete w;
     // do cleanup after initBuffer()
+    glXMakeCurrent( display(), None, NULL );
+    glXDestroyContext( display(), ctxbuffer );
     if( wspace->overlayWindow())
         {
         if( hasGLXVersion( 1, 3 ))
@@ -205,8 +207,6 @@
             glXDestroyPixmap( display(), last_pixmap );
         glXDestroyContext( display(), ctxdrawable );
         }
-    glXMakeCurrent( display(), None, NULL );
-    glXDestroyContext( display(), ctxbuffer );
     checkGLError( "Cleanup" );
     }
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- kdebase-workspace.spec	11 Nov 2008 23:25:10 -0000	1.141
+++ kdebase-workspace.spec	13 Nov 2008 14:45:53 -0000	1.142
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -43,6 +43,7 @@
 # reenable KWin taskbarthumbnail effect (already done upstream in 4.2, was
 # disabled in 4.1 due to no tooltip support - see also Patch100)
 Patch102: kdebase-workspace-4.1.0-enable-kwin-taskbarthumbnail.patch
+Patch103: kdebase-workspace-4.1.3-kwin-kde#174782.patch
 
 # backport of panel autohide from KDE 4.2
 # from plasma-4.1-openSUSE: http://websvn.kde.org/?view=rev&revision=864493
@@ -215,6 +216,7 @@
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
 %patch102 -p0 -b .kwin-taskbarthumbnail
+%patch103 -p1 -b .opengl
 %patch104 -p0 -b .panel-autohide
 %patch105 -p0 -b .panel-autohide2
 %patch106 -p0 -b .panel-autohide3
@@ -359,6 +361,9 @@
 
 
 %changelog
+* Thu Nov 13 2008  4.1.3-5
+- apply upstream patch to fix X crash when disabling compositing
+
 * Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-4
 - 4.1.3