Update KDE to 4.2.1.

multimedia/phonon port has been split into phonon itself, phonon-xine
and phono-gstreamer backends. After updating phonon port you have
to install at least one backend. phonon-xine backend is recommended
for KDE.

8 files changed, 24 insertions, 163 deletions

diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index cd7b63248e9f..9380d226f5fb 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -58,9 +58,6 @@ post-extract:
 pre-configure:
 	${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|'\
 		${WRKSRC}/../kwin/effects/thumbnailaside.h
-	${REINPLACE_CMD} -e 's|<qdir.h>|<QDir>|'\
-		-e 's|<qfile.h>|<QFile>|'\
-		${WRKSRC}/../kwin/effects/videorecord.cpp
 .for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp\
 		laptop/laptopclient.cpp modernsystem/modernsys.cpp\
 		redmond/redmond.cpp
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 89497e8c976b..845540ffcd1f 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.2.0.tar.bz2) = 193e30b9ed0b55b0196289d9df43a904
-SHA256 (KDE/kdebase-workspace-4.2.0.tar.bz2) = e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
-SIZE (KDE/kdebase-workspace-4.2.0.tar.bz2) = 50724381
+MD5 (KDE/kdebase-workspace-4.2.1.tar.bz2) = 5659e3c7c992fab38223b0a467377495
+SHA256 (KDE/kdebase-workspace-4.2.1.tar.bz2) = fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98
+SIZE (KDE/kdebase-workspace-4.2.1.tar.bz2) = 50777207
diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..25851f037692
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ../CMakeLists.txt.orig	2009-01-01 19:26:09.000000000 +0300
++++ ../CMakeLists.txt	2009-03-07 10:02:36.000000000 +0300
+@@ -220,7 +220,7 @@
+ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake 
+                                      ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
+ 
+-set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
++set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake)
+ # places where find_package() looks for FooConfig.cmake files:
+ # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
+ # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
diff --git a/x11/kde4-workspace/files/patch-kdm_config.def b/x11/kde4-workspace/files/patch-kdm_config.def
deleted file mode 100644
index d099b948a4ff..000000000000
--- a/x11/kde4-workspace/files/patch-kdm_config.def
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../kdm/config.def.orig	2008-08-02 16:58:49.000000000 +0200
-+++ ../kdm/config.def	2008-08-02 16:59:49.000000000 +0200
-@@ -35,8 +35,8 @@
- #ifdef _AIX
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
--#elif defined(BSD)
--# define HALT_CMD	"/sbin/shutdown -h now"
-+#elif defined(__FreeBSD__)
-+# define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/x11/kde4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc b/x11/kde4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc
deleted file mode 100644
index 835260b86eff..000000000000
--- a/x11/kde4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../krunner/lock/lockprocess.cc	(revision 916963)
-+++ ../krunner/lock/lockprocess.cc	(revision 916964)
-@@ -1104,7 +1104,6 @@
-         return; // no resuming with dialog visible or when not visible
-     if( mSuspended && mHackProc.state() == QProcess::Running )
-     {
--        XForceScreenSaver(QX11Info::display(), ScreenSaverReset );
-         QPainter p( this );
-         p.drawPixmap( 0, 0, mSavedScreen );
-         p.end();
diff --git a/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp b/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp
deleted file mode 100644
index 4f49a3d0463b..000000000000
--- a/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- ../krunner/screensaver/saverengine.cpp	(revision 916963)
-+++ ../krunner/screensaver/saverengine.cpp	(revision 916964)
-@@ -46,7 +46,11 @@
-     // Save X screensaver parameters
-     XGetScreenSaver(QX11Info::display(), &mXTimeout, &mXInterval,
-                     &mXBlanking, &mXExposures);
--    // ... and disable it
-+    // And disable it. The internal X screensaver is not used at all, but we use its
-+    // internal idle timer (and it is also used by DPMS support in X). This timer must not
-+    // be altered by this code, since e.g. resetting the counter after activating our
-+    // screensaver would prevent DPMS from activating. We use the timer merely to detect
-+    // user activity.
-     XSetScreenSaver(QX11Info::display(), 0, mXInterval, mXBlanking, mXExposures);
- 
-     mState = Waiting;
-@@ -87,7 +91,6 @@
- 
- void SaverEngine::Lock()
- {
--    bool ok = true;
-     if (mState == Waiting)
-     {
-         startLockProcess( ForceLock );
-@@ -125,6 +128,7 @@
- 
- void SaverEngine::SimulateUserActivity()
- {
-+    XForceScreenSaver( QX11Info::display(), ScreenSaverReset );
-     if ( mXAutoLock && mState == Waiting )
-     {
-         mXAutoLock->resetTrigger();
-@@ -323,6 +327,8 @@
- //
- void SaverEngine::idleTimeout()
- {
-+    if( mState != Waiting )
-+        return; // already saving
-     startLockProcess( DefaultLock );
- }
- 
diff --git a/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp b/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp
deleted file mode 100644
index fac3a214f2d1..000000000000
--- a/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
---- ../krunner/screensaver/xautolock.cpp	(revision 916963)
-+++ ../krunner/screensaver/xautolock.cpp	(revision 916964)
-@@ -83,8 +83,10 @@
-     mActive = false;
- 
-     mTimerId = startTimer( CHECK_INTERVAL );
-+    // This is an internal clock timer (in seconds), used instead of querying system time.
-+    // It is incremented manually, preventing from problems with clock jumps.
-+    // In other words, this is the 'now' time and the reference point for other times here.
-     mElapsed = 0;
--
- }
- 
- //---------------------------------------------------------------------------
-@@ -126,8 +128,6 @@
- {
-     mActive = true;
-     resetTrigger();
--    XSetScreenSaver(QX11Info::display(), mTimeout + 10, 100, PreferBlanking, DontAllowExposures); // We'll handle blanking
--    kDebug() << "XSetScreenSaver" << mTimeout + 10;
- }
- 
- //---------------------------------------------------------------------------
-@@ -138,8 +138,6 @@
- {
-     mActive = false;
-     resetTrigger();
--    XSetScreenSaver(QX11Info::display(), 0, 100, PreferBlanking, DontAllowExposures); // No blanking at all
--    kDebug() << "XSetScreenSaver 0";
- }
- 
- //---------------------------------------------------------------------------
-@@ -148,12 +146,15 @@
- //
- void XAutoLock::resetTrigger()
- {
-+    // Time of the last user activity (used only when the internal XScreensaver
-+    // idle counter is not available).
-     mLastReset = mElapsed;
-+    // Time when screensaver should be activated.
-     mTrigger = mElapsed + mTimeout;
- #ifdef HAVE_XSCREENSAVER
-     mLastIdle = 0;
- #endif
--    XForceScreenSaver( QX11Info::display(), ScreenSaverReset );
-+    // Do not reset the internal X screensaver here (no XForceScreenSaver())
- }
- 
- //---------------------------------------------------------------------------
-@@ -205,6 +206,9 @@
-     if (mMitInfo)
-     {
-         Display *d = QX11Info::display();
-+        // Check user idle time. If it is smaller than before, it is either
-+        // clock jump or user activity, so reset the trigger time. Checking whether
-+        // there is user inactivity timeout is done below using mTrigger and mElapsed.
-         XScreenSaverQueryInfo(d, DefaultRootWindow(d), mMitInfo);
-         if (mLastIdle < mMitInfo->idle)
-             mLastIdle = mMitInfo->idle;
-@@ -218,12 +222,11 @@
- 
-     bool activate = false;
- 
--    // kDebug() << now << mTrigger;
-+    // This is the test whether to activate screensaver. If we have reached the time
-+    // and for the whole timeout period there was no activity (which would change mTrigger
-+    // again), activate.
-     if (mElapsed >= mTrigger)
--    {
--        resetTrigger();
-         activate = true;
--    }
- 
- #ifdef HAVE_DPMS
-     BOOL on;
-@@ -237,6 +240,8 @@
-     // that is always smaller than DPMS timeout (X bug I guess). So if DPMS
-     // saving is active, simply always activate our saving too, otherwise
-     // this could prevent locking from working.
-+    // X.Org 7.4: With this version activating DPMS resets the screensaver idle timer,
-+    // so keep this. It probably makes sense to always do this anyway.
-     if(state == DPMSModeStandby || state == DPMSModeSuspend || state == DPMSModeOff)
-         activate = true;
-     // If we are DPMS-dependent and either DPMS is turned off completely or all
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 0f53efd5db76..3cc33f7bb322 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -137,10 +137,10 @@ include/taskmanager/taskgroup.h
 include/taskmanager/taskitem.h
 include/taskmanager/taskmanager.h
 include/taskmanager/taskmanager_export.h
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceConfig.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceConfigVersion.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceLibraryTargets-%%KDE4_BUILD_TYPE%%.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceLibraryTargets.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceConfig.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceConfigVersion.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets-release.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets.cmake
 lib/kconf_update_bin/khotkeys_update
 lib/kconf_update_bin/krdb_clearlibrarypath
 lib/kconf_update_bin/kwin_update_default_rules
@@ -761,9 +761,9 @@ share/doc/HTML/en/kcontrol/kwindecoration/main.png
 share/doc/HTML/en/kcontrol/mouse/common
 share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
 share/doc/HTML/en/kcontrol/mouse/index.docbook
-share/doc/HTML/en/kcontrol/powerdevilconfig/common
-share/doc/HTML/en/kcontrol/powerdevilconfig/index.cache.bz2
-share/doc/HTML/en/kcontrol/powerdevilconfig/index.docbook
+share/doc/HTML/en/kcontrol/powerdevil/common
+share/doc/HTML/en/kcontrol/powerdevil/index.cache.bz2
+share/doc/HTML/en/kcontrol/powerdevil/index.docbook
 share/doc/HTML/en/kcontrol/screensaver/common
 share/doc/HTML/en/kcontrol/screensaver/index.cache.bz2
 share/doc/HTML/en/kcontrol/screensaver/index.docbook
@@ -2001,7 +2001,7 @@ share/wallpapers/default_blue.jpg.desktop
 @dirrm share/doc/HTML/en/kcontrol/windowbehaviour
 @dirrm share/doc/HTML/en/kcontrol/splashscreen
 @dirrm share/doc/HTML/en/kcontrol/screensaver
-@dirrm share/doc/HTML/en/kcontrol/powerdevilconfig
+@dirrm share/doc/HTML/en/kcontrol/powerdevil
 @dirrm share/doc/HTML/en/kcontrol/mouse
 @dirrm share/doc/HTML/en/kcontrol/kwindecoration
 @dirrm share/doc/HTML/en/kcontrol/kwincompositing
@@ -2089,8 +2089,8 @@ share/wallpapers/default_blue.jpg.desktop
 @dirrm share/apps/doc
 @dirrm share/apps/desktoptheme/default/system-monitor
 @dirrm share/apps/desktoptheme/default/calendar
-@dirrm lib/KDE4Workspace-%%KDE4_VERSION%%/cmake
-@dirrm lib/KDE4Workspace-%%KDE4_VERSION%%
+@dirrm lib/KDE4Workspace/cmake
+@dirrm lib/KDE4Workspace
 @dirrm include/taskmanager
 @dirrm include/solid/control/ifaces
 @dirrm include/solid/control