diff options
Diffstat (limited to 'x11')
35 files changed, 92 insertions, 828 deletions
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo index 8da5f818e6ed..ce2af62525a6 100644 --- a/x11/kde4-baseapps/distinfo +++ b/x11/kde4-baseapps/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-4.2.0.tar.bz2) = da86a8ad624e86eda3a7509f39272060 -SHA256 (KDE/kdebase-4.2.0.tar.bz2) = 51694794fd90883f45456c8bf694feb9c0eafef1b267377c586c417913b0dd88 -SIZE (KDE/kdebase-4.2.0.tar.bz2) = 4249816 +MD5 (KDE/kdebase-4.2.1.tar.bz2) = a8f391db7b98feaa6ae81b8f1e99ed5a +SHA256 (KDE/kdebase-4.2.1.tar.bz2) = 05c2111bcd0b5809f212c7f8f0e8b401bd68b4e684843c9dcd3658ba294482c1 +SIZE (KDE/kdebase-4.2.1.tar.bz2) = 4255541 diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index d6a2f78a3236..b37826a60f10 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo index 94fa7bb63013..93e4d6a3947a 100644 --- a/x11/kde4-runtime/distinfo +++ b/x11/kde4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 8ef48aae16a6dddb3055d81d7e5c375f -SHA256 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 5bb18a691915f42dc2a836422ce913405b5c51463caa236f2474293feead51d8 -SIZE (KDE/kdebase-runtime-4.2.0.tar.bz2) = 69901790 +MD5 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 93ef480ed5376ce02324d1b85b8bae0f +SHA256 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 0eba1fd2f9b453b4e60033ff4f969218ed3c42c71a37277ac88c4f3e6f7edd14 +SIZE (KDE/kdebase-runtime-4.2.1.tar.bz2) = 70247291 diff --git a/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake b/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake deleted file mode 100644 index a71e40083978..000000000000 --- a/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake +++ /dev/null @@ -1,29 +0,0 @@ ---- ../cmake/modules/FindPulseAudio.cmake.orig 2008-09-03 11:24:24.000000000 +0000 -+++ ../cmake/modules/FindPulseAudio.cmake 2008-12-27 14:20:09.000000000 +0000 -@@ -16,16 +16,16 @@ - set(PULSEAUDIO_FIND_QUIETLY TRUE) - endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) - --if (NOT WIN32) -- include(FindPkgConfig) -- pkg_check_modules(PULSEAUDIO libpulse) -- if(PULSEAUDIO_FOUND) -- set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library") -- set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes") -- # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio -- # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS}) -- endif(PULSEAUDIO_FOUND) --endif (NOT WIN32) -+# if (NOT WIN32) -+# include(FindPkgConfig) -+# pkg_check_modules(PULSEAUDIO libpulse) -+# if(PULSEAUDIO_FOUND) -+# set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library") -+# set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes") -+# # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio -+# # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS}) -+# endif(PULSEAUDIO_FOUND) -+# endif (NOT WIN32) - - if (NOT PULSEAUDIO_INCLUDE_DIR) - FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h) diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist index 0083d1aa44fa..50e29ca19d03 100644 --- a/x11/kde4-runtime/pkg-plist +++ b/x11/kde4-runtime/pkg-plist @@ -44,7 +44,6 @@ lib/kde4/kcm_knotify.so lib/kde4/kcm_locale.so lib/kde4/kcm_nepomuk.so lib/kde4/kcm_phonon.so -lib/kde4/kcm_phononxine.so lib/kde4/kcm_trash.so lib/kde4/kcmspellchecking.so lib/kde4/kded_desktopnotifier.so @@ -839,6 +838,7 @@ share/icons/oxygen/128x128/apps/preferences-system-windows.png share/icons/oxygen/128x128/apps/preferences-web-browser-identification.png share/icons/oxygen/128x128/apps/scribus.png share/icons/oxygen/128x128/apps/semn.png +share/icons/oxygen/128x128/apps/showfoto.png share/icons/oxygen/128x128/apps/strigi.png share/icons/oxygen/128x128/apps/system-diagnosis.png share/icons/oxygen/128x128/apps/system-file-manager.png @@ -1678,6 +1678,7 @@ share/icons/oxygen/16x16/apps/preferences-web-browser-shortcuts.png share/icons/oxygen/16x16/apps/preferences-web-browser-stylesheets.png share/icons/oxygen/16x16/apps/scribus.png share/icons/oxygen/16x16/apps/semn.png +share/icons/oxygen/16x16/apps/showfoto.png share/icons/oxygen/16x16/apps/strigi.png share/icons/oxygen/16x16/apps/system-file-manager.png share/icons/oxygen/16x16/apps/system-software-update.png @@ -2553,6 +2554,7 @@ share/icons/oxygen/22x22/apps/preferences-web-browser-shortcuts.png share/icons/oxygen/22x22/apps/preferences-web-browser-stylesheets.png share/icons/oxygen/22x22/apps/scribus.png share/icons/oxygen/22x22/apps/semn.png +share/icons/oxygen/22x22/apps/showfoto.png share/icons/oxygen/22x22/apps/strigi.png share/icons/oxygen/22x22/apps/system-file-manager.png share/icons/oxygen/22x22/apps/system-software-update.png @@ -3440,6 +3442,7 @@ share/icons/oxygen/32x32/apps/preferences-web-browser-shortcuts.png share/icons/oxygen/32x32/apps/preferences-web-browser-stylesheets.png share/icons/oxygen/32x32/apps/scribus.png share/icons/oxygen/32x32/apps/semn.png +share/icons/oxygen/32x32/apps/showfoto.png share/icons/oxygen/32x32/apps/strigi.png share/icons/oxygen/32x32/apps/system-file-manager.png share/icons/oxygen/32x32/apps/system-software-update.png @@ -4315,6 +4318,7 @@ share/icons/oxygen/48x48/apps/preferences-web-browser-shortcuts.png share/icons/oxygen/48x48/apps/preferences-web-browser-stylesheets.png share/icons/oxygen/48x48/apps/scribus.png share/icons/oxygen/48x48/apps/semn.png +share/icons/oxygen/48x48/apps/showfoto.png share/icons/oxygen/48x48/apps/strigi.png share/icons/oxygen/48x48/apps/system-file-manager.png share/icons/oxygen/48x48/apps/system-software-update.png @@ -4942,6 +4946,7 @@ share/icons/oxygen/64x64/apps/preferences-system-windows-move.png share/icons/oxygen/64x64/apps/preferences-system-windows.png share/icons/oxygen/64x64/apps/scribus.png share/icons/oxygen/64x64/apps/semn.png +share/icons/oxygen/64x64/apps/showfoto.png share/icons/oxygen/64x64/apps/strigi.png share/icons/oxygen/64x64/apps/system-file-manager.png share/icons/oxygen/64x64/apps/system-software-update.png @@ -6220,6 +6225,7 @@ share/icons/oxygen/scalable/apps/preferences-web-browser-shortcuts.svgz share/icons/oxygen/scalable/apps/preferences-web-browser-stylesheets.svgz share/icons/oxygen/scalable/apps/scribus.svgz share/icons/oxygen/scalable/apps/semn.svg +share/icons/oxygen/scalable/apps/showfoto.svgz share/icons/oxygen/scalable/apps/small/16x16/accessories-calculator.svgz share/icons/oxygen/scalable/apps/small/16x16/accessories-character-map.svgz share/icons/oxygen/scalable/apps/small/16x16/accessories-dictionary.svgz @@ -7442,7 +7448,6 @@ share/kde4/services/jpegthumbnail.desktop share/kde4/services/kcm_kdnssd.desktop share/kde4/services/kcm_nepomuk.desktop share/kde4/services/kcm_phonon.desktop -share/kde4/services/kcm_phononxine.desktop share/kde4/services/kcmcgi.desktop share/kde4/services/kcmkded.desktop share/kde4/services/kcmnotify.desktop 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 diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index d6a2f78a3236..b37826a60f10 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -8,7 +8,6 @@ PORTNAME= kdebase-runtime PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo index 94fa7bb63013..93e4d6a3947a 100644 --- a/x11/kdebase4-runtime/distinfo +++ b/x11/kdebase4-runtime/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 8ef48aae16a6dddb3055d81d7e5c375f -SHA256 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 5bb18a691915f42dc2a836422ce913405b5c51463caa236f2474293feead51d8 -SIZE (KDE/kdebase-runtime-4.2.0.tar.bz2) = 69901790 +MD5 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 93ef480ed5376ce02324d1b85b8bae0f +SHA256 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 0eba1fd2f9b453b4e60033ff4f969218ed3c42c71a37277ac88c4f3e6f7edd14 +SIZE (KDE/kdebase-runtime-4.2.1.tar.bz2) = 70247291 diff --git a/x11/kdebase4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake b/x11/kdebase4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake deleted file mode 100644 index a71e40083978..000000000000 --- a/x11/kdebase4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake +++ /dev/null @@ -1,29 +0,0 @@ ---- ../cmake/modules/FindPulseAudio.cmake.orig 2008-09-03 11:24:24.000000000 +0000 -+++ ../cmake/modules/FindPulseAudio.cmake 2008-12-27 14:20:09.000000000 +0000 -@@ -16,16 +16,16 @@ - set(PULSEAUDIO_FIND_QUIETLY TRUE) - endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY) - --if (NOT WIN32) -- include(FindPkgConfig) -- pkg_check_modules(PULSEAUDIO libpulse) -- if(PULSEAUDIO_FOUND) -- set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library") -- set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes") -- # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio -- # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS}) -- endif(PULSEAUDIO_FOUND) --endif (NOT WIN32) -+# if (NOT WIN32) -+# include(FindPkgConfig) -+# pkg_check_modules(PULSEAUDIO libpulse) -+# if(PULSEAUDIO_FOUND) -+# set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library") -+# set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes") -+# # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio -+# # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS}) -+# endif(PULSEAUDIO_FOUND) -+# endif (NOT WIN32) - - if (NOT PULSEAUDIO_INCLUDE_DIR) - FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h) diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist index 0083d1aa44fa..50e29ca19d03 100644 --- a/x11/kdebase4-runtime/pkg-plist +++ b/x11/kdebase4-runtime/pkg-plist @@ -44,7 +44,6 @@ lib/kde4/kcm_knotify.so lib/kde4/kcm_locale.so lib/kde4/kcm_nepomuk.so lib/kde4/kcm_phonon.so -lib/kde4/kcm_phononxine.so lib/kde4/kcm_trash.so lib/kde4/kcmspellchecking.so lib/kde4/kded_desktopnotifier.so @@ -839,6 +838,7 @@ share/icons/oxygen/128x128/apps/preferences-system-windows.png share/icons/oxygen/128x128/apps/preferences-web-browser-identification.png share/icons/oxygen/128x128/apps/scribus.png share/icons/oxygen/128x128/apps/semn.png +share/icons/oxygen/128x128/apps/showfoto.png share/icons/oxygen/128x128/apps/strigi.png share/icons/oxygen/128x128/apps/system-diagnosis.png share/icons/oxygen/128x128/apps/system-file-manager.png @@ -1678,6 +1678,7 @@ share/icons/oxygen/16x16/apps/preferences-web-browser-shortcuts.png share/icons/oxygen/16x16/apps/preferences-web-browser-stylesheets.png share/icons/oxygen/16x16/apps/scribus.png share/icons/oxygen/16x16/apps/semn.png +share/icons/oxygen/16x16/apps/showfoto.png share/icons/oxygen/16x16/apps/strigi.png share/icons/oxygen/16x16/apps/system-file-manager.png share/icons/oxygen/16x16/apps/system-software-update.png @@ -2553,6 +2554,7 @@ share/icons/oxygen/22x22/apps/preferences-web-browser-shortcuts.png share/icons/oxygen/22x22/apps/preferences-web-browser-stylesheets.png share/icons/oxygen/22x22/apps/scribus.png share/icons/oxygen/22x22/apps/semn.png +share/icons/oxygen/22x22/apps/showfoto.png share/icons/oxygen/22x22/apps/strigi.png share/icons/oxygen/22x22/apps/system-file-manager.png share/icons/oxygen/22x22/apps/system-software-update.png @@ -3440,6 +3442,7 @@ share/icons/oxygen/32x32/apps/preferences-web-browser-shortcuts.png share/icons/oxygen/32x32/apps/preferences-web-browser-stylesheets.png share/icons/oxygen/32x32/apps/scribus.png share/icons/oxygen/32x32/apps/semn.png +share/icons/oxygen/32x32/apps/showfoto.png share/icons/oxygen/32x32/apps/strigi.png share/icons/oxygen/32x32/apps/system-file-manager.png share/icons/oxygen/32x32/apps/system-software-update.png @@ -4315,6 +4318,7 @@ share/icons/oxygen/48x48/apps/preferences-web-browser-shortcuts.png share/icons/oxygen/48x48/apps/preferences-web-browser-stylesheets.png share/icons/oxygen/48x48/apps/scribus.png share/icons/oxygen/48x48/apps/semn.png +share/icons/oxygen/48x48/apps/showfoto.png share/icons/oxygen/48x48/apps/strigi.png share/icons/oxygen/48x48/apps/system-file-manager.png share/icons/oxygen/48x48/apps/system-software-update.png @@ -4942,6 +4946,7 @@ share/icons/oxygen/64x64/apps/preferences-system-windows-move.png share/icons/oxygen/64x64/apps/preferences-system-windows.png share/icons/oxygen/64x64/apps/scribus.png share/icons/oxygen/64x64/apps/semn.png +share/icons/oxygen/64x64/apps/showfoto.png share/icons/oxygen/64x64/apps/strigi.png share/icons/oxygen/64x64/apps/system-file-manager.png share/icons/oxygen/64x64/apps/system-software-update.png @@ -6220,6 +6225,7 @@ share/icons/oxygen/scalable/apps/preferences-web-browser-shortcuts.svgz share/icons/oxygen/scalable/apps/preferences-web-browser-stylesheets.svgz share/icons/oxygen/scalable/apps/scribus.svgz share/icons/oxygen/scalable/apps/semn.svg +share/icons/oxygen/scalable/apps/showfoto.svgz share/icons/oxygen/scalable/apps/small/16x16/accessories-calculator.svgz share/icons/oxygen/scalable/apps/small/16x16/accessories-character-map.svgz share/icons/oxygen/scalable/apps/small/16x16/accessories-dictionary.svgz @@ -7442,7 +7448,6 @@ share/kde4/services/jpegthumbnail.desktop share/kde4/services/kcm_kdnssd.desktop share/kde4/services/kcm_nepomuk.desktop share/kde4/services/kcm_phonon.desktop -share/kde4/services/kcm_phononxine.desktop share/kde4/services/kcmcgi.desktop share/kde4/services/kcmkded.desktop share/kde4/services/kcmnotify.desktop diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index cd7b63248e9f..9380d226f5fb 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-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/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo index 89497e8c976b..845540ffcd1f 100644 --- a/x11/kdebase4-workspace/distinfo +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-CMakeLists.txt b/x11/kdebase4-workspace/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..25851f037692 --- /dev/null +++ b/x11/kdebase4-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/kdebase4-workspace/files/patch-kdm_config.def b/x11/kdebase4-workspace/files/patch-kdm_config.def deleted file mode 100644 index d099b948a4ff..000000000000 --- a/x11/kdebase4-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/kdebase4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc b/x11/kdebase4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc deleted file mode 100644 index 835260b86eff..000000000000 --- a/x11/kdebase4-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/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp b/x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp deleted file mode 100644 index 4f49a3d0463b..000000000000 --- a/x11/kdebase4-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/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp b/x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp deleted file mode 100644 index fac3a214f2d1..000000000000 --- a/x11/kdebase4-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/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist index 0f53efd5db76..3cc33f7bb322 100644 --- a/x11/kdebase4-workspace/pkg-plist +++ b/x11/kdebase4-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 diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo index 8da5f818e6ed..ce2af62525a6 100644 --- a/x11/kdebase4/distinfo +++ b/x11/kdebase4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdebase-4.2.0.tar.bz2) = da86a8ad624e86eda3a7509f39272060 -SHA256 (KDE/kdebase-4.2.0.tar.bz2) = 51694794fd90883f45456c8bf694feb9c0eafef1b267377c586c417913b0dd88 -SIZE (KDE/kdebase-4.2.0.tar.bz2) = 4249816 +MD5 (KDE/kdebase-4.2.1.tar.bz2) = a8f391db7b98feaa6ae81b8f1e99ed5a +SHA256 (KDE/kdebase-4.2.1.tar.bz2) = 05c2111bcd0b5809f212c7f8f0e8b401bd68b4e684843c9dcd3658ba294482c1 +SIZE (KDE/kdebase-4.2.1.tar.bz2) = 4255541 diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index 612408102bb4..4473e34eb737 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/kdelibs-4.2.0.tar.bz2) = 2d830a922195fefe6e073111850247ac -SHA256 (KDE/kdelibs-4.2.0.tar.bz2) = d66da8881f4d347a2140ce19e87dacf48809c02823f87cece680148f2b2ed665 -SIZE (KDE/kdelibs-4.2.0.tar.bz2) = 10033136 +MD5 (KDE/kdelibs-4.2.1.tar.bz2) = fa4206dd747890c4e4283c8adb831e6c +SHA256 (KDE/kdelibs-4.2.1.tar.bz2) = 25ee5be213c4f1ccaf6f19a1a2375c3b23f6e2b4602a45542758e58782a0864d +SIZE (KDE/kdelibs-4.2.1.tar.bz2) = 10049614 diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake new file mode 100644 index 000000000000..1562c5409d20 --- /dev/null +++ b/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake @@ -0,0 +1,11 @@ +--- ../cmake/modules/FindLibKonq.cmake.orig 2009-01-07 03:13:55.000000000 +0300 ++++ ../cmake/modules/FindLibKonq.cmake 2009-03-06 22:06:02.000000000 +0300 +@@ -19,7 +19,7 @@ + else(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) + find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h ) + +- find_library(LIBKONQ_LIBRARY konq) ++ find_library(LIBKONQ_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH) + + if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY) + set(LIBKONQ_FOUND TRUE) diff --git a/x11/kdelibs4/files/patch-kded-kded.cpp b/x11/kdelibs4/files/patch-kded-kded.cpp deleted file mode 100644 index af0ff725708f..000000000000 --- a/x11/kdelibs4/files/patch-kded-kded.cpp +++ /dev/null @@ -1,68 +0,0 @@ ---- ../kded/kded.cpp (revision 918837) -+++ ../kded/kded.cpp (revision 918838) -@@ -115,9 +115,8 @@ - KToolInvocation::kdeinitExecWait( "kdontchangethehostname", args ); - } - --Kded::Kded(bool checkUpdates) -- : b_checkUpdates(checkUpdates), -- m_needDelayedCheck(false) -+Kded::Kded() -+ : m_needDelayedCheck(false) - { - _self = this; - -@@ -280,7 +279,7 @@ - KSharedConfig::Ptr config = KGlobal::config(); - // Ensure the service exists. - KService::Ptr service = KService::serviceByDesktopPath("kded/"+obj+".desktop"); -- if (!service) -+ if (!service) - return; - KConfigGroup cg(config, QString("Module-%1").arg(service->desktopEntryName())); - cg.writeEntry("autoload", autoload); -@@ -290,7 +289,7 @@ - bool Kded::isModuleAutoloaded(const QString &obj) const - { - KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop"); -- if (!s) -+ if (!s) - return false; - return isModuleAutoloaded(s); - } -@@ -307,7 +306,7 @@ - bool Kded::isModuleLoadedOnDemand(const QString &obj) const - { - KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop"); -- if (!s) -+ if (!s) - return false; - return isModuleLoadedOnDemand(s); - } -@@ -446,7 +445,7 @@ - - void Kded::updateDirWatch() - { -- if (!b_checkUpdates) return; -+ if (!bCheckUpdates) return; - - delete m_pDirWatch; - m_pDirWatch = new KDirWatch; -@@ -471,7 +470,7 @@ - { - delete KSycoca::self(); - -- if (!b_checkUpdates) return; -+ if (!bCheckUpdates) return; - - if (delayedCheck) return; - -@@ -921,7 +920,7 @@ - checkStamps = cg.readEntry("CheckFileStamps", true); - delayedCheck = cg.readEntry("DelayedCheck", false); - -- Kded *kded = new Kded(false); // Build data base -+ Kded *kded = new Kded(); // Build data base - - KDE_signal(SIGTERM, sighandler); - KDE_signal(SIGHUP, sighandler); diff --git a/x11/kdelibs4/files/patch-kded-kded.h b/x11/kdelibs4/files/patch-kded-kded.h deleted file mode 100644 index b5459c80193e..000000000000 --- a/x11/kdelibs4/files/patch-kded-kded.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ../kded/kded.h (revision 918837) -+++ ../kded/kded.h (revision 918838) -@@ -41,7 +41,7 @@ - { - Q_OBJECT - public: -- Kded(bool checkUpdates); -+ Kded(); - virtual ~Kded(); - - static Kded *self() { return _self;} -@@ -186,8 +186,6 @@ - */ - KDirWatch* m_pDirWatch; - -- bool b_checkUpdates; -- - /** - * When a desktop file is updated, a timer is started (5 sec) - * before rebuilding the binary - so that multiple updates result diff --git a/x11/kdelibs4/files/patch-kinit-klauncher.cpp b/x11/kdelibs4/files/patch-kinit-klauncher.cpp deleted file mode 100644 index bd4e42526602..000000000000 --- a/x11/kdelibs4/files/patch-kinit-klauncher.cpp +++ /dev/null @@ -1,199 +0,0 @@ -diff -u ../kinit/klauncher.cpp ../kinit/klauncher.cpp ---- ../kinit/klauncher.cpp (revision 918403) -+++ ../kinit/klauncher.cpp (revision 918654) -@@ -58,6 +58,9 @@ - - // #define KLAUNCHER_VERBOSE_OUTPUT - -+static const char* const s_DBusStartupTypeToString[] = -+ { "DBusNone", "DBusUnique", "DBusMulti", "DBusWait", "ERROR" }; -+ - using namespace KIO; - - IdleSlave::IdleSlave(QObject *parent) -@@ -167,7 +170,7 @@ - - KLauncher::KLauncher(int _kdeinitSocket) - : QObject(0), -- kdeinitSocket(_kdeinitSocket), dontBlockReading(false) -+ kdeinitSocket(_kdeinitSocket) - { - #ifdef Q_WS_X11 - mCached_dpy = NULL; -@@ -276,8 +279,24 @@ - { - ssize_t result; - int bytes_left = len; -- while ( bytes_left > 0) -- { -+ while (bytes_left > 0) { -+ // in case we get a request to start an application and data arrive -+ // to kdeinitSocket at the same time, requestStart() will already -+ // call slotKDEInitData(), so we must check there's still something -+ // to read, otherwise this would block -+ -+ // Same thing if kdeinit dies without warning. -+ -+ fd_set in; -+ timeval tm = { 30, 0 }; // 30 seconds timeout, so we're not stuck in case kdeinit dies on us -+ FD_ZERO ( &in ); -+ FD_SET( sock, &in ); -+ select( sock + 1, &in, 0, 0, &tm ); -+ if( !FD_ISSET( sock, &in )) { -+ kDebug(7016) << "read_socket" << sock << "nothing to read, kdeinit4 must be dead"; -+ return -1; -+ } -+ - result = read(sock, buffer, bytes_left); - if (result > 0) - { -@@ -298,21 +317,7 @@ - { - klauncher_header request_header; - QByteArray requestData; -- if( dontBlockReading ) -- { -- // in case we get a request to start an application and data arrive -- // to kdeinitSocket at the same time, requestStart() will already -- // call slotKDEInitData(), so we must check there's still something -- // to read, otherwise this would block -- fd_set in; -- timeval tm = { 0, 0 }; -- FD_ZERO ( &in ); -- FD_SET( kdeinitSocket, &in ); -- select( kdeinitSocket + 1, &in, 0, 0, &tm ); -- if( !FD_ISSET( kdeinitSocket, &in )) -- return; -- } -- dontBlockReading = false; -+ - int result = read_socket(kdeinitSocket, (char *) &request_header, - sizeof( request_header)); - if (result == -1) -@@ -391,15 +396,19 @@ - if (request->pid == pid) - { - if (request->dbus_startup_type == KService::DBusWait) -- request->status = KLaunchRequest::Done; -+ request->status = KLaunchRequest::Done; - else if ((request->dbus_startup_type == KService::DBusUnique) -- && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) -- request->status = KLaunchRequest::Running; -- else -- request->status = KLaunchRequest::Error; -+ && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) { -+ request->status = KLaunchRequest::Running; - #ifdef KLAUNCHER_VERBOSE_OUTPUT -- kDebug(7016) << pid << "died, requestDone. status=" << request->status; -+ kDebug(7016) << pid << "running as a unique app"; - #endif -+ } else { -+ request->status = KLaunchRequest::Error; -+#ifdef KLAUNCHER_VERBOSE_OUTPUT -+ kDebug(7016) << pid << "died, requestDone. status=" << request->status; -+#endif -+ } - requestDone(request); - return; - } -@@ -444,19 +453,29 @@ - if (request->status != KLaunchRequest::Launching) - continue; - -+#ifdef KLAUNCHER_VERBOSE_OUTPUT -+ kDebug(7016) << "had pending request" << request->name << s_DBusStartupTypeToString[request->dbus_startup_type] << "dbus_name" << request->dbus_name << request->tolerant_dbus_name; -+#endif - // For unique services check the requested service name first -- if ((request->dbus_startup_type == KService::DBusUnique) && -- ((appId == request->dbus_name) || -- QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name))) -- { -- request->status = KLaunchRequest::Running; -- requestDone(request); -- continue; -+ if (request->dbus_startup_type == KService::DBusUnique) { -+ if ((appId == request->dbus_name) || // just started -+ QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) { // was already running -+ request->status = KLaunchRequest::Running; -+#ifdef KLAUNCHER_VERBOSE_OUTPUT -+ kDebug(7016) << "OK, unique app" << request->dbus_name << "is running"; -+#endif -+ requestDone(request); -+ continue; -+ } else { -+#ifdef KLAUNCHER_VERBOSE_OUTPUT -+ kDebug(7016) << "unique app" << request->dbus_name << "not running yet"; -+#endif -+ } - } - -- const QString rAppId = request->dbus_name; -+ const QString rAppId = !request->tolerant_dbus_name.isEmpty() ? request->tolerant_dbus_name : request->dbus_name; - #ifdef KLAUNCHER_VERBOSE_OUTPUT -- kDebug(7016) << "had pending request" << rAppId; -+ //kDebug(7016) << "using" << rAppId << "for matching"; - #endif - if (rAppId.isEmpty()) - continue; -@@ -647,17 +666,21 @@ - request_header.cmd = LAUNCHER_EXEC_NEW; - #endif - request_header.arg_length = requestData.length(); -+ -+#ifdef KLAUNCHER_VERBOSE_OUTPUT -+ kDebug(7016) << "Asking kdeinit to start" << request->name << request->arg_list -+ << "cmd=" << commandToString(request_header.cmd); -+#endif -+ - write(kdeinitSocket, &request_header, sizeof(request_header)); - write(kdeinitSocket, requestData.data(), requestData.length()); - - // Wait for pid to return. - lastRequest = request; -- dontBlockReading = false; - do { - slotKDEInitData( kdeinitSocket ); - } - while (lastRequest != 0); -- dontBlockReading = true; - #endif - } - -@@ -812,11 +835,18 @@ - request->dbus_name = v.toString().toUtf8(); - } - if (request->dbus_name.isEmpty()) { -- request->dbus_name = "*." + QFile::encodeName(KRun::binaryName(service->exec(), true)); -+ const QString binName = KRun::binaryName(service->exec(), true); -+ request->dbus_name = "org.kde." + binName; -+ request->tolerant_dbus_name = "*." + binName; - } - } - } - -+#ifdef KLAUNCHER_VERBOSE_OUTPUT -+ kDebug(7016) << "name=" << request->name << "dbus_name=" << request->dbus_name -+ << "startup type=" << s_DBusStartupTypeToString[request->dbus_startup_type]; -+#endif -+ - request->pid = 0; - request->envs = envs; - send_service_startup_info( request, service, startup_id, envs ); -@@ -932,7 +962,7 @@ - request->arg_list.append(arg.toLocal8Bit()); - } - -- request->name = app.toLocal8Bit(); -+ request->name = app; - - if (wait) - request->dbus_startup_type = KService::DBusWait; -@@ -1107,7 +1137,7 @@ - } - if (mSlaveValgrind == arg1) - { -- arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name.toLocal8Bit()))); -+ arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name))); - arg_list.prepend(QFile::encodeName(KStandardDirs::locate("exe", "kioslave"))); - name = "valgrind"; - if (!mSlaveValgrindSkin.isEmpty()) { diff --git a/x11/kdelibs4/files/patch-kinit-klauncher.h b/x11/kdelibs4/files/patch-kinit-klauncher.h deleted file mode 100644 index bc0b14f52f45..000000000000 --- a/x11/kdelibs4/files/patch-kinit-klauncher.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ../kinit/klauncher.h (revision 918653) -+++ ../kinit/klauncher.h (revision 918654) -@@ -87,6 +87,7 @@ - QString name; - QStringList arg_list; - QString dbus_name; -+ QString tolerant_dbus_name; - enum status_t { Init = 0, Launching, Running, Error, Done }; - pid_t pid; - status_t status; diff --git a/x11/kdelibs4/files/patch-kio-kio-copyjob.cpp b/x11/kdelibs4/files/patch-kio-kio-copyjob.cpp deleted file mode 100644 index 9ab742f74206..000000000000 --- a/x11/kdelibs4/files/patch-kio-kio-copyjob.cpp +++ /dev/null @@ -1,116 +0,0 @@ ---- ../kio/kio/copyjob.cpp (revision 917169) -+++ ../kio/kio/copyjob.cpp (revision 917170) -@@ -153,7 +153,7 @@ - QList<CopyInfo> dirs; - KUrl::List dirsToRemove; - KUrl::List m_srcList; -- KUrl::List m_skippedSourceUrls; -+ KUrl::List m_successSrcList; - KUrl::List::const_iterator m_currentStatSrc; - bool m_bCurrentSrcIsDir; - bool m_bCurrentOperationIsLink; -@@ -770,10 +770,6 @@ - - void CopyJobPrivate::skip( const KUrl & sourceUrl ) - { -- // If this is one if toplevel sources, -- // remove it from d->m_srcList, for a correct FilesRemoved() signal -- // But don't do it right away, we have iterators into that list (#157601) -- m_skippedSourceUrls.append( sourceUrl ); - dirsToRemove.removeAll( sourceUrl ); - } - -@@ -857,6 +853,7 @@ - { - //this is required for the undo feature - emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, true, false ); -+ m_successSrcList.append((*it).uSource); - m_directoriesCopied.append( *it ); - dirs.erase( it ); - } -@@ -1118,6 +1115,7 @@ - emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, false, false ); - if (m_mode == CopyJob::Move) - org::kde::KDirNotify::emitFileMoved( (*it).uSource.url(), (*it).uDest.url() ); -+ m_successSrcList.append((*it).uSource); - } - // remove from list, to move on to next file - files.erase( it ); -@@ -1372,7 +1370,7 @@ - KIO::Job * newjob = 0; - if ( m_mode == CopyJob::Link ) { - // User requested that a symlink be made -- JobFlags flags = bOverwrite ? Overwrite : DefaultFlags; -+ const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags; - newjob = linkNextFile(uSource, uDest, flags); - if (!newjob) - return; -@@ -1384,7 +1382,7 @@ - (uSource.pass() == uDest.pass())) - // Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link), - { -- JobFlags flags = bOverwrite ? Overwrite : DefaultFlags; -+ const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags; - KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, uDest, flags | HideProgressInfo /*no GUI*/ ); - Scheduler::scheduleJob(newJob); - newjob = newJob; -@@ -1509,23 +1507,6 @@ - // but then we need to jump to the else part below. Maybe with a recursive call? - #endif - } else { -- // Finished - tell the world -- if ( !m_bOnlyRenames ) -- { -- KUrl url( m_globalDest ); -- if ( m_globalDestinationState != DEST_IS_DIR || m_asMethod ) -- url.setPath( url.directory() ); -- //kDebug(7007) << "KDirNotify'ing FilesAdded " << url; -- org::kde::KDirNotify::emitFilesAdded( url.url() ); -- -- Q_FOREACH(const KUrl& url, m_skippedSourceUrls) -- m_srcList.removeAll(url); -- -- if ( m_mode == CopyJob::Move && !m_srcList.isEmpty() ) { -- //kDebug(7007) << "KDirNotify'ing FilesRemoved " << m_srcList.toStringList(); -- org::kde::KDirNotify::emitFilesRemoved( m_srcList.toStringList() ); -- } -- } - if (m_reportTimer) - m_reportTimer->stop(); - --m_processedFiles; // undo the "start at 1" hack -@@ -1535,6 +1516,27 @@ - } - } - -+void CopyJob::emitResult() -+{ -+ Q_D(CopyJob); -+ // Before we go, tell the world about the changes that were made. -+ // Even if some error made us abort midway, we might still have done -+ // part of the job so we better update the views! (#118583) -+ if (!d->m_bOnlyRenames) { -+ KUrl url(d->m_globalDest); -+ if (d->m_globalDestinationState != DEST_IS_DIR || d->m_asMethod) -+ url.setPath(url.directory()); -+ //kDebug(7007) << "KDirNotify'ing FilesAdded " << url; -+ org::kde::KDirNotify::emitFilesAdded( url.url() ); -+ -+ if (d->m_mode == CopyJob::Move && !d->m_successSrcList.isEmpty()) { -+ kDebug(7007) << "KDirNotify'ing FilesRemoved" << d->m_successSrcList.toStringList(); -+ org::kde::KDirNotify::emitFilesRemoved(d->m_successSrcList.toStringList()); -+ } -+ } -+ Job::emitResult(); -+} -+ - void CopyJobPrivate::slotProcessedSize( KJob*, qulonglong data_size ) - { - Q_Q(CopyJob); -@@ -1801,6 +1803,7 @@ - kDebug(7007) << "Renaming succeeded, move on"; - ++m_processedFiles; - emit q->copyingDone( q, *m_currentStatSrc, dest, -1 /*mtime unknown, and not needed*/, true, true ); -+ m_successSrcList.append(*m_currentStatSrc); - statNextSrc(); - } - } diff --git a/x11/kdelibs4/files/patch-kio-kio-copyjob.h b/x11/kdelibs4/files/patch-kio-kio-copyjob.h deleted file mode 100644 index e42e30810389..000000000000 --- a/x11/kdelibs4/files/patch-kio-kio-copyjob.h +++ /dev/null @@ -1,10 +0,0 @@ ---- ../kio/kio/copyjob.h (revision 917169) -+++ ../kio/kio/copyjob.h (revision 917170) -@@ -245,6 +245,7 @@ - - protected: - CopyJob(CopyJobPrivate &dd); -+ void emitResult(); - - private: - Q_PRIVATE_SLOT(d_func(), void slotStart()) diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist index c84d936d548d..375c7fae40aa 100644 --- a/x11/kdelibs4/pkg-plist +++ b/x11/kdelibs4/pkg-plist @@ -29,6 +29,7 @@ include/KDE/DNSSD/RemoteService include/KDE/DNSSD/ServiceBase include/KDE/DNSSD/ServiceBrowser include/KDE/DNSSD/ServiceModel +include/KDE/DNSSD/ServiceTypeBrowser include/KDE/DOM/AbstractView include/KDE/DOM/Attr include/KDE/DOM/CDATASection @@ -1886,6 +1887,7 @@ share/apps/katepart/katepartui.rc share/apps/katepart/script/cstyle.js share/apps/katepart/script/jstest.js share/apps/katepart/script/lisp.js +share/apps/katepart/script/lilypond.js share/apps/katepart/script/python.js share/apps/katepart/script/ruby.js share/apps/katepart/script/sort.js @@ -2054,6 +2056,8 @@ share/apps/kcharselect/kcharselect-data share/apps/kcm_componentchooser/kcm_instantmessenger.desktop share/apps/kcm_componentchooser/kcm_ktexteditor.desktop share/apps/kconf_update/kcookiescfg.upd +share/apps/kconf_update/ksslcertificatemanager.upd +share/apps/kconf_update/ksslcertificatemanager.upd.sh share/apps/kconf_update/kded.upd share/apps/kconf_update/kio_help.upd share/apps/kconf_update/kioslave.upd |