kdelibs update to Trinity v3.5.11

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 18 insertions, 10 deletions

diff --git a/kioslave/bzip2/Makefile.am b/kioslave/bzip2/Makefile.am
index bb5ca3dc5..9efd77a4c 100644
--- a/kioslave/bzip2/Makefile.am
+++ b/kioslave/bzip2/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kbzip2filter.la
 
 kbzip2filter_la_SOURCES = kbzip2filter.cpp
-kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2)
+kbzip2filter_la_LIBADD = $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
 kbzip2filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kde_services_DATA = kbzip2filter.desktop
diff --git a/kioslave/file/Makefile.am b/kioslave/file/Makefile.am
index 0dd7a760f..7cafcb339 100644
--- a/kioslave/file/Makefile.am
+++ b/kioslave/file/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = $(all_includes)
 kde_module_LTLIBRARIES = kio_file.la
 
 kio_file_la_SOURCES = file.cc
-kio_file_la_LIBADD = $(LIB_KIO)
+kio_file_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(ACL_LIBS)
 kio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 noinst_HEADERS = file.h
 
diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc
index 718d42125..c24413cc7 100644
--- a/kioslave/file/file.cc
+++ b/kioslave/file/file.cc
@@ -1234,8 +1234,13 @@ void FileProtocol::listDir( const KURL& url)
        directories we keep as active directory. And
        as the slave runs in the background, it's hard
        to see for the user what the problem would be */
+#if !defined(PATH_MAX) && defined(__GLIBC__)
+    char *path_buffer;
+    path_buffer = getcwd(NULL, 0);
+#else
     char path_buffer[PATH_MAX];
     (void) getcwd(path_buffer, PATH_MAX - 1);
+#endif
     if ( chdir( _path.data() ) )  {
         if (errno == EACCES)
             error(ERR_ACCESS_DENIED, _path);
@@ -1261,6 +1266,9 @@ void FileProtocol::listDir( const KURL& url)
     kdDebug(7101) << "============= COMPLETED LIST ============" << endl;
 
     chdir(path_buffer);
+#if !defined(PATH_MAX) && defined(__GLIBC__)
+    free(path_buffer);
+#endif
 
     finished();
 }
diff --git a/kioslave/ftp/Makefile.am b/kioslave/ftp/Makefile.am
index cfa3de6ad..eeb5f061c 100644
--- a/kioslave/ftp/Makefile.am
+++ b/kioslave/ftp/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= $(all_includes)
 kde_module_LTLIBRARIES = kio_ftp.la
 
 kio_ftp_la_SOURCES = ftp.cc
-kio_ftp_la_LIBADD  = $(LIB_KIO)
+kio_ftp_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
 kio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 
 noinst_HEADERS = ftp.h
diff --git a/kioslave/gzip/Makefile.am b/kioslave/gzip/Makefile.am
index 2b290c206..193b8beb0 100644
--- a/kioslave/gzip/Makefile.am
+++ b/kioslave/gzip/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kgzipfilter.la
 
 kgzipfilter_la_SOURCES = kgzipfilter.cpp
-kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ)
+kgzipfilter_la_LIBADD = $(LIB_KIO) $(LIBZ) $(LIB_QT) $(LIB_KDECORE)
 kgzipfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kde_services_DATA = kgzipfilter.desktop
diff --git a/kioslave/http/Makefile.am b/kioslave/http/Makefile.am
index a29e06e9e..2e4f027dc 100644
--- a/kioslave/http/Makefile.am
+++ b/kioslave/http/Makefile.am
@@ -15,11 +15,11 @@ kde_module_LTLIBRARIES = kio_http.la
 
 kio_http_la_SOURCES = http.cc
 kio_http_la_METASOURCES = AUTO
-kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(top_builddir)/kio/misc/kntlm/libkntlm.la
-kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
+kio_http_la_LIBADD = $(LIB_KIO) $(top_builddir)/kio/httpfilter/libhttpfilter.la $(top_builddir)/kio/misc/kntlm/libkntlm.la $(LIB_QT) $(LIB_KDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la
+kio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) -lgssapi_krb5
 
 kio_http_cache_cleaner_la_SOURCES = http_cache_cleaner.cpp
-kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO)
+kio_http_cache_cleaner_la_LIBADD  = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la
 kio_http_cache_cleaner_la_LDFLAGS = -module -avoid-version
 
 noinst_HEADERS = http.h
diff --git a/kioslave/http/kcookiejar/Makefile.am b/kioslave/http/kcookiejar/Makefile.am
index 933de5e13..c1c586b94 100644
--- a/kioslave/http/kcookiejar/Makefile.am
+++ b/kioslave/http/kcookiejar/Makefile.am
@@ -13,12 +13,12 @@ kde_module_LTLIBRARIES = kded_kcookiejar.la
 kcookiejar_la_SOURCES = main.cpp
 METASOURCES = AUTO
 kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kcookiejar_la_LIBADD = $(LIB_KDECORE)
+kcookiejar_la_LIBADD = $(LIB_KDECORE) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la
 
 kded_kcookiejar_la_SOURCES = kcookiejar.cpp kcookieserver.cpp \
 			kcookieserver.skel kcookiewin.cpp 
 kded_kcookiejar_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_kcookiejar_la_LIBADD = $(LIB_KIO) $(LIB_KDED)
+kded_kcookiejar_la_LIBADD = $(LIB_KDED) $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDECORE) $(LIB_X11) $(LIB_KDEUI) $(top_builddir)/kded/libkdeinit_kded.la
 
 kded_DATA = kcookiejar.desktop
 kdeddir = $(kde_servicesdir)/kded
diff --git a/kioslave/metainfo/Makefile.am b/kioslave/metainfo/Makefile.am
index 6807019f4..e1c0b3382 100644
--- a/kioslave/metainfo/Makefile.am
+++ b/kioslave/metainfo/Makefile.am
@@ -8,7 +8,7 @@ METASOURCES = AUTO
 kde_module_LTLIBRARIES = kio_metainfo.la
 
 kio_metainfo_la_SOURCES = metainfo.cpp
-kio_metainfo_la_LIBADD = $(LIB_KIO)
+kio_metainfo_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
 kio_metainfo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = metainfo.h