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

2 files changed, 21 insertions, 6 deletions

diff --git a/kdoctools/Makefile.am b/kdoctools/Makefile.am
index 08498bbf4..608f95b6b 100644
--- a/kdoctools/Makefile.am
+++ b/kdoctools/Makefile.am
@@ -5,18 +5,17 @@ AM_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
 noinst_LTLIBRARIES = libkbzipfilter_dummy.la
 
 libkbzipfilter_dummy_la_SOURCES = kbzip2filter.cpp
-libkbzipfilter_dummy_la_LIBADD = $(LIB_KIO) $(LIBBZ2)
 
 ####### Files
 
 kde_module_LTLIBRARIES = kio_help.la kio_ghelp.la
 
 kio_help_la_SOURCES = kio_help.cpp main.cpp xslt.cpp
-kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la
+kio_help_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)  libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
 kio_help_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 kio_ghelp_la_SOURCES = kio_help.cpp main_ghelp.cpp xslt.cpp
-kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la
+kio_ghelp_la_LIBADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS) libkbzipfilter_dummy.la $(LIB_KIO) $(LIBBZ2) $(LIB_QT) $(LIB_KDECORE)
 kio_ghelp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 noinst_HEADERS = kio_help.h
@@ -25,7 +24,7 @@ kdelnk_DATA = help.protocol ghelp.protocol
 kdelnkdir = $(kde_servicesdir)
 
 bin_PROGRAMS = meinproc 
-meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) 
+meinproc_LDADD = xslt_pure.o libkbzipfilter_dummy.la $(LIBXSLT_LIBS) $(LIBXML_LIBS) $(LIB_KIO) $(LIBBZ2) $(LIB_KDECORE)
 meinproc_SOURCES = meinproc.cpp
 
 xslt_pure.o: xslt.cpp
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index f6796194d..c48706451 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -136,9 +136,18 @@ int main(int argc, char **argv) {
     }
 
     if ( args->isSet( "check" ) ) {
+#if !defined(PATH_MAX) && defined(__GLIBC__)
+        char *pwd_buffer;
+#else
         char pwd_buffer[PATH_MAX];
+#endif
         QFileInfo file( QFile::decodeName(args->arg( 0 )) );
-        if ( !getcwd( pwd_buffer, sizeof(pwd_buffer) - 1 ) ) {
+#if !defined(PATH_MAX) && defined(__GLIBC__)
+        if ( !(pwd_buffer = getcwd( NULL, 0 ) ) )
+#else
+        if ( !getcwd( pwd_buffer, sizeof(pwd_buffer) - 1 ) )
+#endif
+	{
 	     kdError() << "getcwd failed." << endl;
              return 2;
 	}
@@ -175,11 +184,18 @@ int main(int argc, char **argv) {
             }
             pclose( xmllint );
             chdir( pwd_buffer );
-            if ( !noout )
+            if ( !noout ) {
+#if !defined(PATH_MAX) && defined(__GLIBC__)
+                free( pwd_buffer );
+#endif
                 return 1;
+            }
         } else {
             kdWarning() << "couldn't find xmllint" << endl;
         }
+#if !defined(PATH_MAX) && defined(__GLIBC__)
+        free( pwd_buffer );
+#endif
     }
 
     xmlSubstituteEntitiesDefault(1);