rpms/kdebase-workspace/F-9 kdebase-workspace-4.1.3-kwin-kde#174782.patch, NONE, 1.1 kdebase-workspace.spec, 1.119, 1.120

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29809/F-9

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.3-kwin-kde#174782.patch 
Log Message:
Sync from F-10:

* Thu Nov 13 2008 Than Ngo <than at redhat.com> 4.1.3-5
- 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/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- kdebase-workspace.spec	7 Nov 2008 14:50:22 -0000	1.119
+++ kdebase-workspace.spec	14 Nov 2008 02:54:06 -0000	1.120
@@ -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,18 +361,23 @@
 
 
 %changelog
-* Fri Nov 07 2008 Than Ngo <than at redhat.com>  4.1.3-4
+* Thu Nov 13 2008 Than Ngo <than at redhat.com> 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
+
+* Fri Nov 07 2008 Than Ngo <than at redhat.com> 4.1.2-14
 - only omit battery applet when guidance-power-manager is installed
 
-* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.3-3
+* Fri Nov 07 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-13
 - omit battery applet from default panel
 
-* Thu Nov 06 2008 Than Ngo <than at redhat.com> 4.1.3-2
+* Wed Nov 05 2008 Than Ngo <than at redhat.com> 4.1.2-12
 - fix i18n issue in kdm
-- add workaround for ldap issue
 
-* Tue Nov  4 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.3-1
-- KDE 4.1.3
+* Tue Nov 04 2008 Than Ngo <than at redhat.com> 4.1.2-11
+- add workaround for ldap issue
 
 * Sun Nov 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.2-10
 - never touch PATH in startkde, prepending $QTDIR/bin is unnecessary on Fedora