6 files changed, 4 insertions, 292 deletions

diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index de56b213ce41..4747e8238169 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 5e51bc436b6b..f19401f591dd 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-3.5.7.tar.bz2) = b421e01b3ee712549ee967f58ed24de0
-SHA256 (KDE/kdebase-3.5.7.tar.bz2) = 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d
-SIZE (KDE/kdebase-3.5.7.tar.bz2) = 24395088
+MD5 (KDE/kdebase-3.5.8.tar.bz2) = 9990c669229daaaa8fca4c5e354441fd
+SHA256 (KDE/kdebase-3.5.8.tar.bz2) = 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493
+SIZE (KDE/kdebase-3.5.8.tar.bz2) = 24200172
diff --git a/x11/kde4-workspace/files/patch-konsole-konsole-main.cpp b/x11/kde4-workspace/files/patch-konsole-konsole-main.cpp
deleted file mode 100644
index 3a858b6494fd..000000000000
--- a/x11/kde4-workspace/files/patch-konsole-konsole-main.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
---- konsole/konsole/main.cpp	2007/03/13 12:29:16	642131
-+++ konsole/konsole/main.cpp	2007/05/29 14:32:54	669488
-@@ -46,18 +46,15 @@
- 
- #include "konsole.h"
- 
--// COMPOSITE disabled by default because the QApplication constructor
--// needed to enable the ARGB32 visual has undesired side effects.
--//#if 0
- #if defined(Q_WS_X11) && defined(HAVE_XRENDER) && QT_VERSION >= 0x030300
- #define COMPOSITE
- #endif
--//#endif
- 
- #ifdef COMPOSITE
- # include <X11/Xlib.h>
- # include <X11/extensions/Xrender.h>
- # include <fixx11h.h>
-+# include <dlfcn.h>
- #endif
- 
- static const char description[] =
-@@ -255,47 +252,62 @@
-   if( qtargs->isSet("font") )
-       kdWarning() << "The Qt option -fn, --font has no effect." << endl;
- 
-+  KApplication* a = NULL;
- #ifdef COMPOSITE
--  char *display = 0;
--  if ( qtargs->isSet("display"))
--    display = qtargs->getOption( "display" ).data();
--
--  Display *dpy = XOpenDisplay( display );
--  if ( !dpy ) {
--    kdError() << "cannot connect to X server " << display << endl;
--    exit( 1 );
--  }
--
--  int screen = DefaultScreen( dpy );
--  Colormap colormap = 0;
--  Visual *visual = 0;
--  int event_base, error_base;
--
--  if ( args->isSet("real-transparency") && XRenderQueryExtension( dpy, &event_base, &error_base ) )
--  {
--    int nvi;
--    XVisualInfo templ;
--    templ.screen  = screen;
--    templ.depth   = 32;
--    templ.c_class = TrueColor;
--    XVisualInfo *xvi = XGetVisualInfo( dpy, VisualScreenMask | VisualDepthMask
--		  | VisualClassMask, &templ, &nvi );
--
--    for ( int i = 0; i < nvi; i++ ) {
--      XRenderPictFormat *format = XRenderFindVisualFormat( dpy, xvi[i].visual );
--      if ( format->type == PictTypeDirect && format->direct.alphaMask ) {
--        visual = xvi[i].visual;
--        colormap = XCreateColormap( dpy, RootWindow( dpy, screen ), visual, AllocNone );
--        kdDebug() << "found visual with alpha support" << endl;
--        argb_visual = true;
--        break;
-+  if ( args->isSet("real-transparency")) {
-+    char *display = 0;
-+    if ( qtargs->isSet("display"))
-+      display = qtargs->getOption( "display" ).data();
-+
-+    Display *dpy = XOpenDisplay( display );
-+    if ( !dpy ) {
-+      kdError() << "cannot connect to X server " << display << endl;
-+      exit( 1 );
-+    }
-+
-+    int screen = DefaultScreen( dpy );
-+    Colormap colormap = 0;
-+    Visual *visual = 0;
-+    int event_base, error_base;
-+
-+    if ( XRenderQueryExtension( dpy, &event_base, &error_base ) ) {
-+      int nvi;
-+      XVisualInfo templ;
-+      templ.screen  = screen;
-+      templ.depth   = 32;
-+      templ.c_class = TrueColor;
-+      XVisualInfo *xvi = XGetVisualInfo( dpy, VisualScreenMask | VisualDepthMask
-+		    | VisualClassMask, &templ, &nvi );
-+
-+      for ( int i = 0; i < nvi; i++ ) {
-+        XRenderPictFormat *format = XRenderFindVisualFormat( dpy, xvi[i].visual );
-+        if ( format->type == PictTypeDirect && format->direct.alphaMask ) {
-+          visual = xvi[i].visual;
-+          colormap = XCreateColormap( dpy, RootWindow( dpy, screen ), visual, AllocNone );
-+          kdDebug() << "found visual with alpha support" << endl;
-+          argb_visual = true;
-+          break;
-+        }
-       }
-     }
--  }
-+    // The QApplication ctor used is normally intended for applications not using Qt
-+    // as the primary toolkit (e.g. Motif apps also using Qt), with some slightly
-+    // unpleasant side effects (e.g. #83974). This code checks if qt-copy patch #0078
-+    // is applied, which allows turning this off.
-+    bool* qt_no_foreign_hack = static_cast< bool* >( dlsym( RTLD_DEFAULT, "qt_no_foreign_hack" ));
-+    if( qt_no_foreign_hack )
-+        *qt_no_foreign_hack = true;
-+    // else argb_visual = false ... ? *shrug*
- 
--  KApplication a( dpy, Qt::HANDLE( visual ), Qt::HANDLE( colormap ) );
-+    if( argb_visual )
-+      a = new KApplication( dpy, Qt::HANDLE( visual ), Qt::HANDLE( colormap ) );
-+    else
-+      XCloseDisplay( dpy );
-+  }
-+  if( a == NULL )
-+      a = new KApplication;
- #else
--  KApplication a;
-+  KApplication* a = new KApplication;
- #endif
- 
-   QString dataPathBase = KStandardDirs::kde_default("data").append("konsole/");
-@@ -351,7 +363,7 @@
-   fixed_size = !args->isSet("resize");
- 
-   if (!full_script)
--	a.dcopClient()->setQtBridgeEnabled(false);
-+	a->dcopClient()->setQtBridgeEnabled(false);
- 
-   QCString type = "";
- 
-@@ -467,13 +479,13 @@
-   putenv((char*)"COLORTERM="); // to trigger mc's color detection
-   KonsoleSessionManaged ksm;
- 
--  if (a.isRestored() || !profile.isEmpty())
-+  if (a->isRestored() || !profile.isEmpty())
-   {
-     if (!shell)
-        shell = konsole_shell(eargs);
- 
-     if (profile.isEmpty())
--      sessionconfig = a.sessionConfig();
-+      sessionconfig = a->sessionConfig();
-     sessionconfig->setDesktopGroup();
-     int n = 1;
- 
-@@ -629,7 +641,7 @@
-     m->setAutoClose(auto_close);
-   }
- 
--  int ret = a.exec();
-+  int ret = a->exec();
- 
-  //// Temporary code, waiting for Qt to do this properly
- 
-@@ -654,6 +666,8 @@
-      delete w;
-   }
-   delete list;
-+  
-+  delete a;
- 
-   return ret;
- }
diff --git a/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp b/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp
deleted file mode 100644
index e81392e29477..000000000000
--- a/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- nsplugins/pluginscan.cpp.orig	Sat Mar 13 21:07:58 2004
-+++ nsplugins/pluginscan.cpp	Sat Mar 13 21:08:50 2004
-@@ -457,6 +457,9 @@
- 	paths.append("/usr/lib64/netscape/plugins");
- 	paths.append("/usr/lib64/mozilla/plugins");
-         paths.append("$MOZILLA_HOME/plugins");
-+	paths.append("/usr/local/lib/linux-flashplugin6");
-+	paths.append("/usr/X11R6/lib/linux-flashplugin6");
-+	paths.append("/usr/local/lib/npapi/linux-flashplugin/");
-         config->writeEntry( "scanPaths", paths );
-     }
- 
diff --git a/x11/kde4-workspace/files/patch-post-3.5.7-kdebase-kdm.diff b/x11/kde4-workspace/files/patch-post-3.5.7-kdebase-kdm.diff
deleted file mode 100644
index 40b6abb8ec0e..000000000000
--- a/x11/kde4-workspace/files/patch-post-3.5.7-kdebase-kdm.diff
+++ /dev/null
@@ -1,63 +0,0 @@
---- kdm/backend/session.c
-+++ kdm/bakcend/session.c
-@@ -121,8 +121,9 @@
- static void
- DoAutoLogon( void )
- {
--	StrDup( &curuser, td->autoUser );
--	StrDup( &curpass, td->autoPass );
-+	ReStr( &curuser, td->autoUser );
-+	ReStr( &curpass, td->autoPass );
-+	ReStr( &curtype, "classic" );
- 	cursource = PWSRC_AUTOLOGIN;
- }
- 
-@@ -141,7 +142,9 @@
- 		td->hstent->npass = 0;
- 		newdmrc = td->hstent->nargs;
- 		td->hstent->nargs = 0;
-+		ReStr( &curtype, "classic" );
- 		cursource = (td->hstent->rLogin == 1) ? PWSRC_RELOGIN : PWSRC_MANUAL;
-+		return 1;
- 	} else if (*td->autoUser && !td->autoDelay && (tdiff > 0 || td->autoAgain))
- 	{
- 		unsigned int lmask;
-@@ -153,11 +156,9 @@
- 		if (lmask & ShiftMask)
- 			return 0;
- 		DoAutoLogon();
--	} else {
--		cursource = PWSRC_MANUAL;
--		return 0;
-+		return 1;
- 	}
--	return 1;
-+	return 0;
- }
- 
- 
-@@ -369,6 +370,7 @@
- 			if (curtype) free( curtype );
- 			curtype = GRecvStr();
- 			Debug( " type %\"s\n", curtype );
-+			cursource = PWSRC_MANUAL;
- 			if (Verify( conv_interact, rootok )) {
- 				Debug( " -> return success\n" );
- 				GSendInt( V_OK );
-@@ -378,7 +380,6 @@
- 		case G_AutoLogin:
- 			Debug( "G_AutoLogin\n" );
- 			DoAutoLogon();
--			StrDup( &curtype, "classic" );
- 			if (Verify( conv_auto, FALSE )) {
- 				Debug( " -> return success\n" );
- 				GSendInt( V_OK );
-@@ -565,7 +566,7 @@
- 	tdiff = td->autoAgain ? 
- 	           1 : time( 0 ) - td->hstent->lastExit - td->openDelay;
- 	if (AutoLogon( tdiff )) {
--		if (!StrDup( &curtype, "classic" ) || !Verify( conv_auto, FALSE ))
-+		if (!Verify( conv_auto, FALSE ))
- 			goto gcont;
- 		if (greeter)
- 			GSendInt( V_OK );
diff --git a/x11/kde4-workspace/files/patch-post-3.5.7-kdebase-konqueror-2.diff b/x11/kde4-workspace/files/patch-post-3.5.7-kdebase-konqueror-2.diff
deleted file mode 100644
index 0d6e44ef4f82..000000000000
--- a/x11/kde4-workspace/files/patch-post-3.5.7-kdebase-konqueror-2.diff
+++ /dev/null
@@ -1,49 +0,0 @@
---- konqueror/konq_combo.cc
-+++ konqueror/konq_combo.cc
-@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
-         kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
-                                   "addToCombo(QString,QCString)", data);
-     }
-+    // important security consideration: always display the beginning
-+    // of the url rather than its end to prevent spoofing attempts.
-+    lineEdit()->setCursorPosition( 0 );
- }
- 
- void KonqCombo::setTemporary( const QString& text )
---- konqueror/konq_mainwindow.cc
-+++ konqueror/konq_mainwindow.cc
-@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
-   }
-   else // no known serviceType, use KonqRun
-   {
--      if ( ( view && view == m_currentView ) ||
--              ( !view && !req.newTab ) ) // startup with argument
-+      if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument
-       {
-           // Show it for now in the location bar, but we'll need to store it in the view
-           // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called).
--          kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
-+          kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl;
-           setLocationBarURL( url );
-       }
- 
-@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
-         if ( childView )
-         {
-             enableAllActions( true );
--
--            m_pViewManager->setActivePart( childView->part() );
-             m_currentView = childView;
-         }
-       }
---- konqueror/konq_viewmgr.cc
-+++ konqueror/konq_viewmgr.cc
-@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
- 
- void KonqViewManager::emitActivePartChanged()
- {
-+    // prevent unnecessary multiple calls to slotPartActivated:
-+    m_activePartChangedTimer->stop();
-     m_pMainWindow->slotPartActivated( activePart() );
- }
-