rpms/kdebase/devel kdebase-3.4.2-kdesktop-konsole.patch, NONE, 1.1 kdebase-3.4.2-kinfocenter.patch, NONE, 1.1 kdebase.spec, 1.121, 1.122 kdebase-3.4.0-kdesktop-konsole.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23992

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.4.2-kdesktop-konsole.patch 
	kdebase-3.4.2-kinfocenter.patch 
Removed Files:
	kdebase-3.4.0-kdesktop-konsole.patch 
Log Message:
apply upstream patch to fix kinfocenter opengl DRI/GLX crash


kdebase-3.4.2-kdesktop-konsole.patch:
 krootwm.cc |   19 +++++++++++++++++++
 krootwm.h  |    1 +
 2 files changed, 20 insertions(+)

--- NEW FILE kdebase-3.4.2-kdesktop-konsole.patch ---
--- kdebase-3.4.2/kdesktop/krootwm.h.kdestop-konsole	2005-05-23 14:14:38.000000000 +0200
+++ kdebase-3.4.2/kdesktop/krootwm.h	2005-07-26 22:22:46.000000000 +0200
@@ -117,6 +117,7 @@
   void slotSessionActivated( int );
   void slotNewSession();
   void slotLockNNewSession();
+  void slotOpenTerminal();
 
 private:
   KDesktop* m_pDesktop;
--- kdebase-3.4.2/kdesktop/krootwm.cc.kdestop-konsole	2005-07-20 12:03:58.000000000 +0200
+++ kdebase-3.4.2/kdesktop/krootwm.cc	2005-09-05 14:41:33.000000000 +0200
@@ -50,6 +50,7 @@
 #include <kuser.h>
 #include <qfile.h>
 
+#include <kprocess.h>
 #include "krootwm.h"
 #include "kdiconview.h"
 #include "desktop.h"
@@ -79,6 +80,9 @@
   customMenu2 = 0;
 
 
+  new KAction(i18n("Konsole..." ), "openterm", 0, this, SLOT( slotOpenTerminal() ),
+               m_actionCollection, "open_terminal" );
+
   // Creates the new menu
   menuBar = 0; // no menubar yet
   menuNew = 0;
@@ -131,6 +135,7 @@
   {
      new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, SLOT( slotExecuteCommand() ), m_actionCollection, "exec" );
   }
+
   if (!KGlobal::config()->isImmutable())
   {
      new KAction(i18n("Configure Desktop..."), "configure", 0, this, SLOT( slotConfigureDesktop() ),
@@ -366,6 +371,13 @@
     desktopMenu->disconnect( this );
     bool needSeparator = false;
 
+    action = m_actionCollection->action("open_terminal");
+    if (action)
+    {
+       action->plug( desktopMenu );
+       needSeparator = true;
+    }
+
     if (menuNew)
     {
        menuNew->plug( desktopMenu );
@@ -693,6 +705,13 @@
   return args;
 }
 
+void KRootWm::slotOpenTerminal()
+{
+  KProcess proc;
+  proc << locate("exe", "konsole");
+  proc.start(KProcess::DontCare);
+}
+
 void KRootWm::slotConfigureDesktop() {
   QStringList args = configModules();
   args.prepend(i18n("Desktop"));

kdebase-3.4.2-kinfocenter.patch:
 opengl.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-3.4.2-kinfocenter.patch ---
--- kdebase-3.4.2/kcontrol/info/opengl.cpp.tn	2005-09-05 14:15:26.000000000 +0200
+++ kdebase-3.4.2/kcontrol/info/opengl.cpp	2005-09-05 14:17:42.000000000 +0200
@@ -235,6 +235,9 @@
       GL_COMPRESSED_TEXTURE_FORMATS
 */
 
+  if (!glExtensions)
+	return;
+
   struct token_name {
       GLuint type;  // count and flags, !!! count must be <=2 for now
       GLenum token;
@@ -429,12 +432,12 @@
 	for (cur_token = groups[i].group; cur_token->type; cur_token++) {
 
    		bool tfloat = cur_token->type & KCMGL_FLOAT;
-   		bool tprog = cur_token->type & KCMGL_PROG;
 		int count = KCMGL_COUNT_MASK(cur_token->type);
 		GLint max[2]={0,0};
    		GLfloat fmax[2]={0.0,0.0};
 
 #if defined(PFNGLGETPROGRAMIVARBPROC) && defined(GL_ARB_vertex_program)
+   		bool tprog = cur_token->type & KCMGL_PROG;
 		if (tprog && kcm_glGetProgramivARB)
 			kcm_glGetProgramivARB(groups[i].type, cur_token->token, max);
 		else


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- kdebase.spec	5 Sep 2005 12:11:04 -0000	1.121
+++ kdebase.spec	5 Sep 2005 13:54:55 -0000	1.122
@@ -59,10 +59,13 @@
 Patch87: kdebase-3.3.1-man.patch
 Patch89: kdebase-3.3.92-servicebutton-saveas.patch
 Patch90: kdebase-3.4.0rc1-konsole-keymap.patch
-Patch91: kdebase-3.4.0-kdesktop-konsole.patch
+Patch91: kdebase-3.4.2-kdesktop-konsole.patch
 Patch92: kdebase-3.4.0-xdg.patch
 Patch93: kdebase-3.4.1-pam.patch
 
+# upstream patches
+Patch150: kdebase-3.4.2-kinfocenter.patch
+
 # KDE Security Advisory: kcheckpass local root vulnerability CAN-2005-2494
 Patch200: post-3.4.2-kdebase-kcheckpass.diff
 
@@ -154,6 +157,8 @@
 %patch92 -p1 -b .xdg
 %patch93 -p1 -b .loginuid
 
+%patch150 -p1 -b .kinfocenter
+
 pushd kcheckpass
 %patch200 -p0 -b .CAN-2005-2494
 popd
@@ -448,6 +453,7 @@
 %changelog
 * Mon Sep 05 2005 Than Ngo <than at redhat.com> 6:3.4.2-4
 - apply patch to fix local root vulnerability in kcheckpass CAN-2005-2494, #166997
+- apply upstream patch to fix kinfocenter opengl DRI/GLX crash
 
 * Thu Aug 18 2005 Than Ngo <than at redhat.com> 6:3.4.2-3 
 - update config files


--- kdebase-3.4.0-kdesktop-konsole.patch DELETED ---