6 files changed, 80 insertions, 107 deletions

diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index cfe6154d4b3c..a1ad17ecaaad 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.1.tar.bz2) = dd0d9707296f2be143c28a8be21b6e24
-SIZE (KDE/kdebase-3.3.1.tar.bz2) = 19906317
+MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
+SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index c845a8cbf236..4a3ac236fe1d 100644
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp
new file mode 100644
index 000000000000..553c411983a7
--- /dev/null
+++ b/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-kxkb_rules.cpp b/x11/kdebase4-workspace/files/patch-kxkb_rules.cpp
deleted file mode 100644
index 00122a2b9898..000000000000
--- a/x11/kdebase4-workspace/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/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
new file mode 100644
index 000000000000..f31b6341cf9c
--- /dev/null
+++ b/x11/kdebase4-workspace/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 )
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 0c34371113ce..61e591e3cd68 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -1423,6 +1423,7 @@ share/apps/konqsidebartng/entries/remote.desktop
 share/apps/konqsidebartng/entries/root.desktop
 share/apps/konqsidebartng/entries/services.desktop
 share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
+share/apps/konqsidebartng/kicker_entries/devices.desktop
 share/apps/konqsidebartng/kicker_entries/history.desktop
 share/apps/konqsidebartng/kicker_entries/home.desktop
 share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -3787,8 +3788,6 @@ share/wallpapers/only_k.jpg
 share/wallpapers/seaofconero.jpg
 share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
-@exec /bin/mkdir -p %D/share/templates/.source/emptydir
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
@@ -3806,16 +3805,7 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@exec /bin/mkdir -p %D/share/applnk/Settings/Information
-@dirrm share/wallpapers
 @dirrm share/templates/.source/emptydir
-@dirrm share/templates/.source
-@dirrm share/templates
-@dirrm share/sounds
-@dirrm share/services/useragentstrings
-@dirrm share/services/searchproviders
 @dirrm share/mimelnk/print
 @dirrm share/mimelnk/kdedevice
 @dirrm share/mimelnk/fonts
@@ -4046,20 +4036,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/icons/locolor/32x32/apps
-@dirrm share/icons/locolor/32x32
-@dirrm share/icons/locolor/16x16/apps
-@dirrm share/icons/locolor/16x16
-@dirrm share/icons/locolor
-@dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16
 @dirrm share/icons/crystalsvg/scalable/apps/gnome
-@dirrm share/icons/crystalsvg/scalable/apps
-@dirrm share/icons/crystalsvg/22x22/apps
-@dirrm share/fonts/override
-@dirrm share/fonts
 @dirrm share/doc/kdm
 @dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
@@ -4156,15 +4133,11 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kcontrol/bell
 @dirrm share/doc/HTML/en/kcontrol/background
 @dirrm share/doc/HTML/en/kcontrol/arts
-@dirrm share/doc/HTML/en/kcontrol
 @dirrm share/doc/HTML/en/kate
 @dirrm share/desktop-directories
-@dirrm share/config.kcfg
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
-@dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
@@ -4179,7 +4152,6 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/ksmserver
 @dirrm share/apps/kpersonalizer/pics
 @dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/profiles
 @dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
 @dirrm share/apps/konsole/icons/crystalsvg/32x32
 @dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
@@ -4188,10 +4160,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/konsole/icons/crystalsvg/16x16
 @dirrm share/apps/konsole/icons/crystalsvg
 @dirrm share/apps/konsole/icons
-@dirrm share/apps/konsole
 @dirrm share/apps/konqueror/tiles
-@dirrm share/apps/konqueror/servicemenus
-@dirrm share/apps/konqueror/profiles
 @dirrm share/apps/konqueror/pics
 @dirrm share/apps/konqueror/icons/crystalsvg/16x16/actions
 @dirrm share/apps/konqueror/icons/crystalsvg/16x16
@@ -4200,18 +4169,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/konqueror/dirtree/remote
 @dirrm share/apps/konqueror/dirtree
 @dirrm share/apps/konqueror/about
-@dirrm share/apps/konqueror
 @dirrm share/apps/konqsidebartng/websidebar
-@dirrm share/apps/konqsidebartng/virtual_folders/services
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/web
-@dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
-@dirrm share/apps/konqsidebartng/virtual_folders/remote
-@dirrm share/apps/konqsidebartng/virtual_folders
 @dirrm share/apps/konqsidebartng/kicker_entries
-@dirrm share/apps/konqsidebartng/entries
-@dirrm share/apps/konqsidebartng/dirtree
-@dirrm share/apps/konqsidebartng/add
-@dirrm share/apps/konqsidebartng
 @dirrm share/apps/konqlistview/kpartplugins
 @dirrm share/apps/konqlistview
 @dirrm share/apps/konqiconview/kpartplugins
@@ -4230,11 +4189,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kio_info
 @dirrm share/apps/kio_finger
 @dirrm share/apps/kinfocenter
-@dirrm share/apps/kicker/wallpapers
-@dirrm share/apps/kicker/tiles
-@dirrm share/apps/kicker/pics
 @dirrm share/apps/kicker/menuext/find
-@dirrm share/apps/kicker/menuext
 @dirrm share/apps/kicker/icons/locolor/16x16/actions
 @dirrm share/apps/kicker/icons/locolor/16x16
 @dirrm share/apps/kicker/icons/locolor
@@ -4242,16 +4197,11 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kicker/icons/crystalsvg/16x16
 @dirrm share/apps/kicker/icons/crystalsvg
 @dirrm share/apps/kicker/icons
-@dirrm share/apps/kicker/extensions
-@dirrm share/apps/kicker/applets
-@dirrm share/apps/kicker
 @dirrm share/apps/khotkeys
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
 @dirrm share/apps/khelpcenter/plugins/Applications
-@dirrm share/apps/khelpcenter/plugins
-@dirrm share/apps/khelpcenter
 @dirrm share/apps/kfontview
 @dirrm share/apps/kfindpart/icons/locolor/22x22/actions
 @dirrm share/apps/kfindpart/icons/locolor/22x22
@@ -4268,11 +4218,6 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kdisplay
 @dirrm share/apps/kdewizard/pics
 @dirrm share/apps/kdewizard
-@dirrm share/apps/kdesktop/programs
-@dirrm share/apps/kdesktop/pics
-@dirrm share/apps/kdesktop/patterns
-@dirrm share/apps/kdesktop/DesktopLinks
-@dirrm share/apps/kdesktop
 @dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16/actions
 @dirrm share/apps/kdeprintfax/icons/crystalsvg/16x16
 @dirrm share/apps/kdeprintfax/icons/crystalsvg
@@ -4300,7 +4245,6 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcminput
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kbookmark
-@dirrm share/apps/kate/scripts
 @dirrm share/apps/kate/plugins/katedefaultproject
 @dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
@@ -4314,7 +4258,6 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kate/icons/crystalsvg/16x16
 @dirrm share/apps/kate/icons/crystalsvg
 @dirrm share/apps/kate/icons
-@dirrm share/apps/kate
 @dirrm share/apps/kappfinder/apps/Utilities/XUtilities
 @dirrm share/apps/kappfinder/apps/Utilities
 @dirrm share/apps/kappfinder/apps/Toys
@@ -4342,19 +4285,6 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/drkonqi
 @dirrm share/apps/clockapplet/pics
 @dirrm share/apps/clockapplet
-@dirrm share/applnk/Utilities
-@dirrm share/applnk/Toys
-@dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System
-@dirrm share/applnk/Settingsmenu
-@dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/LookNFeel/Themes
-@dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings
-@dirrm share/applnk/Internet
-@dirrm share/applnk/.hidden
-@dirrm share/applnk
 @dirrm lib/kconf_update_bin
 @dirrm include/kwin
 @dirrm include/ksplash