casa-mp-base

Index: kdelibs-4.3.2/kinit/kinit.cpp

===================================================================

--- kdelibs-4.3.2.orig/kinit/kinit.cpp  2009-10-14 18:47:04.000000000 +0200

+++ kdelibs-4.3.2/kinit/kinit.cpp   2009-10-14 19:10:14.000000000 +0200

@@ -489,6 +489,14 @@

       init_startup_info( startup_id, name, envc, envs );

 #endif

+  // Don't run this inside the child process, it crashes on OS/X 10.6

+  const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());

+  const QString helperpath = s_instance->dirs()->findExe(QString::fromLatin1("kdeinit4_helper"));

+#ifdef Q_WS_MAC

+  const QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(execpath));

+  const QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(_name));

+#endif

+

   d.errorMsg = 0;

   d.fork = fork();

   switch(d.fork) {

@@ -513,7 +521,6 @@

      if (cwd && *cwd) {

          (void)chdir(cwd);

      } else {

-         const QByteArray docPath = QFile::encodeName(KGlobalSettings::documentPath());

          (void)chdir(docPath.constData());

      }

@@ -549,10 +556,9 @@

      {

        int r;

        QByteArray procTitle;

-       d.argv = (char **) malloc(sizeof(char *) * (argc+1));

+       d.argv = (char **) malloc(sizeof(char *) * (argc+2));

        d.argv[0] = (char *) _name;

 #ifdef Q_WS_MAC

-       QString argvexe = s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0]));

        if (!argvexe.isEmpty()) {

           QByteArray cstr = argvexe.toLocal8Bit();

           kDebug(7016) << "kdeinit4: launch() setting argv: " << cstr.data();

@@ -628,7 +634,6 @@

         QByteArray executable = execpath;

 #ifdef Q_WS_MAC

-        QString bundlepath = s_instance->dirs()->findExe(QFile::decodeName(executable));

         if (!bundlepath.isEmpty())

            executable = QFile::encodeName(bundlepath);

 #endif

@@ -642,25 +647,13 @@

         exit(255);

      }

-     void * sym = l.resolve( "kdeinitmain");

-     if (!sym )

-        {

-        sym = l.resolve( "kdemain" );

-        if ( !sym )

-           {

-            QString ltdlError = l.errorString();

-            fprintf(stderr, "Could not find kdemain: %s\n", qPrintable(ltdlError) );

-              QString errorMsg = i18n("Could not find 'kdemain' in '%1'.\n%2",

-                                      libpath, ltdlError);

-              exitWithErrorMsg(errorMsg);

-           }