Update to KDE 3.3.2

4 files changed, 77 insertions, 34 deletions

diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,5 +1,5 @@
---- kdm/kfrontend/genkdmconf.c.orig	Sun Oct  3 09:11:07 2004
-+++ kdm/kfrontend/genkdmconf.c	Thu Nov 11 20:47:01 2004
+--- kdm/kfrontend/genkdmconf.c.orig	Sun Nov 28 18:26:14 2004
++++ kdm/kfrontend/genkdmconf.c	Thu Dec  2 00:41:46 2004
 @@ -578,7 +578,7 @@
  "# by Xsetup usually.\n"
  "# This is not required if you use PAM with the pam_console module.\n"
@@ -20,12 +20,14 @@
  "\n"
  #ifdef _AIX
  "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -668,7 +668,7 @@
+@@ -667,7 +667,9 @@
+ "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
  "    # Note that sourcing csh.login after .cshrc is non-standard.\n"
- "    set -a\n"
--"    eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c set | egrep -v \"^(BASH_VERSINFO|EUID|PPID|UID|GROUPS|SHELLOPTS|_)=\"'`\n"
+-"    eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login > /dev/null; if (-f ~/.login) source ~/.login > /dev/null; /bin/sh -c export'`\n"
++"    set -a\n"
 +"    eval `$SHELL -c 'if (-f /etc/csh.login) source /etc/csh.login >& /dev/null; if (-f ~/.login) source ~/.login >& /dev/null; printenv | egrep -v \"^(TERM|SHLVL)=\"'`\n"
- "    set +a\n"
++"    set +a\n"
  "    ;;\n"
  "  *) # Plain sh, ksh, and anything we don't know.\n"
+ "    [ -f /etc/profile ] && . /etc/profile\n"
diff --git a/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp b/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp
@@ -0,0 +1,30 @@
+--- konsole/konsole/konsole.cpp	16 Nov 2004 16:46:00 -0000	1.472.2.6
++++ konsole/konsole/konsole.cpp	1 Dec 2004 17:05:30 -0000	1.472.2.7
+@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
+     createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
+     setSchema(s->schemaNo());
+     tabwidget->setCurrentPage(tabwidget->count()-1);
+-      disableMasterModeConnections(); // no duplicate connections, remove old
+-      enableMasterModeConnections();
+-    }
+-    if( tabwidget )
+-    m_removeSessionButton->setEnabled(tabwidget->count()>1);
++    disableMasterModeConnections(); // no duplicate connections, remove old
++    enableMasterModeConnections();
++    if(m_removeSessionButton)
++      m_removeSessionButton->setEnabled(tabwidget->count()>1);
++  }
+ }
+ 
+ QString Konsole::currentSession()
+@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
+       rootxpms.remove(s->widget());
+     }
+     delete s->widget();
+-    if( tabwidget )
+-    m_removeSessionButton->setEnabled(tabwidget->count()>1);
++    if (m_removeSessionButton)
++      m_removeSessionButton->setEnabled(tabwidget->count()>1);
+   }
+   session2action.remove(s);
+   action2session.remove(ra);
diff --git a/x11/kde4-runtime/files/patch-kxkb_rules.cpp b/x11/kde4-runtime/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kde4-runtime/files/patch-kxkb_rules.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- kxkb/rules.cpp	2004/06/28 14:19:03	1.38
-+++ kxkb/rules.cpp	2004/10/10 22:59:59	1.38.2.1
-@@ -1,3 +1,4 @@
-+#include <qwindowdefs.h>
- #include <qfile.h>
- #include <qtextstream.h>
- #include <qregexp.h>
-@@ -42,11 +43,19 @@ KeyRules::KeyRules():
-   }
- 
-   QString rulesFile;
--  for(int ii=0; ii<2; ii++)
-+  Display *dpy = qt_xdisplay();
-+  XkbRF_VarDefsRec vd;
-+  char *tmp= NULL;
-+  if (XkbRF_GetNamesProp(dpy,&tmp,&vd) && tmp) 
-+    rulesFile = X11_DIR + QString("xkb/rules/%1").arg(tmp);
-+  else {
-+    // old way
-+    for(int ii=0; ii<2; ii++)
-     if( QFile(X11_DIR + QString(rulesFileList[ii])).exists() ) {
- 	rulesFile = X11_DIR + rulesFileList[ii];
- 	break;
-     }
-+  }
- 
-   if( rulesFile.isEmpty() ) {
-     kdDebug() << "Cannot find rules file in " << X11_DIR << endl;
diff --git a/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
@@ -0,0 +1,39 @@
+Index: konq_mainwindow.cc
+===================================================================
+RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
+retrieving revision 1.1342.2.14
+diff -u -p -r1.1342.2.14 konq_mainwindow.cc
+--- konqueror/konq_mainwindow.cc	24 Nov 2004 18:29:51 -0000	1.1342.2.14
++++ konqueror/konq_mainwindow.cc	12 Dec 2004 15:54:46 -0000
+@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
+     QString viewName = view->viewName();
+     kdDebug() << "       - viewName=" << viewName << "   "
+               << "frame names:" << view->frameNames().join( "," ) << endl;
++
++    // First look for a hostextension containing this frame name
++    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
++    if ( ext )
++    {
++      ext = ext->findFrameParent(callingPart, name);
++      kdDebug() << "BrowserHostExtension found part " << ext << endl;
++      if (!ext)
++         continue; // Don't use this window
++    }
++
+     if ( !viewName.isEmpty() && viewName == name )
+     {
+       kdDebug() << "found existing view by name: " << view << endl;
+@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
+       return view;
+     }
+ 
+-    // First look for a hostextension containing this frame name
+-    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
+-    if ( ext )
+-    {
+-      ext = ext->findFrameParent(callingPart, name);
+-    }
+-
+ //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
+ 
+     if ( ext )