[kde-doc-english] [kde-runtime/frameworks] /: Merge remote-tracking branch 'origin/master' into frameworks

[David Faure]

Git commit 61f29188be2015bf502cb48ba9a0b82d99a50f09 by David Faure.
Committed on 20/03/2014 at 22:02.
Pushed by dfaure into branch 'frameworks'.

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	CMakeLists.txt
	desktoptheme/* [gone, just translation updates]
	kioslave/trash/CMakeLists.txt [strigi code was deleted]
	kioslave/trash/trashthroughanalyzer.cpp [deleted]
	knotify/hardwarenotifications.notifyrc [deleted]
	knotify/kde.notifyrc [deleted]
	knotify/knotify4.desktop [deleted]
	kwalletd/* [merged into kwallet framework by hand]
	nepomuk/kcm/CMakeLists.txt [deleted]
	nepomuk/kcm/kcm_nepomuk.desktop [deleted]
	nepomuk/kioslaves/tags/CMakeLists.txt [deleted]
	nepomuk/kioslaves/tags/Messages.sh [deleted]
	nepomuk/kioslaves/tags/kio_tags.cpp [deleted]
	nepomuk/kioslaves/tags/nepomuktags.protocol [deleted]
	nepomuk/kioslaves/timeline/CMakeLists.txt [deleted]
	nepomuk/kioslaves/timeline/Messages.sh [deleted]
	nepomuk/kioslaves/timeline/kio_timeline.cpp [deleted]
	nepomuk/kioslaves/timeline/nepomuktimeline.protocol [deleted]
	plasma/**/*.desktop [gone]

M  +1    -1    doc/kcontrol/phonon/index.docbook
M  +0    -2    drkonqi/data/mappings
M  +3    -2    kcontrol/icons/icons.desktop
M  +18   -11   kioslave/man/kio_man.cpp
M  +35   -23   kioslave/sftp/kio_sftp.cpp
M  +0    -19   kioslave/trash/CMakeLists.txt
M  +0    -2    kioslave/trash/tests/CMakeLists.txt

http://commits.kde.org/kde-runtime/61f29188be2015bf502cb48ba9a0b82d99a50f09

diff --cc kioslave/trash/CMakeLists.txt
index 6479ff4,3604089..ff792c1
--- a/kioslave/trash/CMakeLists.txt
+++ b/kioslave/trash/CMakeLists.txt
@@@ -26,65 -13,23 +26,46 @@@ if(WIN32
  else(WIN32)
    set(kio_trash_PART_SRCS kio_trash.cpp ${trashcommon_PART_SRCS})
  endif(WIN32)
 -
 -if(NOT MINGW)
 -kde4_add_plugin(kio_trash ${kio_trash_PART_SRCS})
 -
 -
 -target_link_libraries(kio_trash  ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS})
 -
 +add_library(kio_trash MODULE ${kio_trash_PART_SRCS})
 +
 +# This flag is needed in order to be able to support files > 2GB even on
 +# 32bit platforms. The default is to use the non-64bit aware syscalls on
 +# 32bit platforms, which makes every application to SIGXFSZ (which is
 +# equivalent to a crash) when they see or touch a file > 2GB.
 +check_cxx_source_compiles("
 +#include <sys/types.h>
 +/* Check that off_t can represent 2**63 - 1 correctly.
 +We can't simply define LARGE_OFF_T to be 9223372036854775807,
 +since some C++ compilers masquerading as C compilers
 +incorrectly reject 9223372036854775807.  */
 +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
 +int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1];
 +int main() { return 0; }
 +" _OFFT_IS_64BIT)
 +
 +if (NOT _OFFT_IS_64BIT)
 +  target_compile_definitions(kio_trash PUBLIC -D_FILE_OFFSET_BITS=64)
 +endif ()
 +
 +target_link_libraries(kio_trash
 +	KF5::Solid
 +        KF5::KDE4Support
 +	KF5::KIOCore
 +        Qt5::DBus
 +        KF5::I18n KF5::ConfigCore KF5::ConfigGui 
 +        )
  install(TARGETS kio_trash  DESTINATION ${PLUGIN_INSTALL_DIR} )
 -endif(NOT MINGW)
 -########### next target ###############
  
- ########### next target ###############
- # currently not on win32, TODO!
- if(NOT WIN32 AND STRIGI_FOUND)
-     include_directories(${STRIGI_INCLUDE_DIR})
- 
-     add_library(trash MODULE trashthroughanalyzer.cpp ${trashcommon_PART_SRCS})
-     target_link_libraries(trash
-        KF5::KDE4Support
-        KF5::KIOCore
-        ${STRIGI_STREAMANALYZER_LIBRARY}
-        KF5::Solid
-        KF5::I18n KF5::ConfigCore KF5::ConfigGui
-     )
-     set_target_properties(trash PROPERTIES
-         PREFIX strigita_)
-     #install(TARGETS trash LIBRARY DESTINATION ${LIB_INSTALL_DIR}/strigi)
- endif(NOT WIN32 AND STRIGI_FOUND)
- ########### next target ###############
- 
  set(ktrash_SRCS ktrash.cpp )
  
 +add_executable(ktrash ${ktrash_SRCS})
 +ecm_mark_nongui_executable(ktrash)
  
 -kde4_add_executable(ktrash NOGUI ${ktrash_SRCS})
 -
 -target_link_libraries(ktrash  ${KDE4_KIO_LIBS} )
 +target_link_libraries(ktrash    
 +        KF5::KDE4Support
 +	KF5::KIOCore
 +        KF5::I18n KF5::ConfigCore KF5::ConfigGui
 +        )
  
  install(TARGETS ktrash ${INSTALL_TARGETS_DEFAULT_ARGS})