[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kinit] src: Build on Mac OS X
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2014-02-13 7:53:28
Message-ID: E1WDr6u-00064J-Ro () scm ! kde ! org
[Download RAW message or body]

Git commit 7687848f6bbafcd30652066f4962aac1c90c6387 by Harald Fernengel.
Committed on 13/02/2014 at 07:52.
Pushed by harald into branch 'master'.

Build on Mac OS X

Restored some code that was lost in the transition

R  +0    -0    src/kdeinit/Info.plist.template [from: Info.plist.template - 100% similarity]
M  +2    -0    src/kdeinit/kinit.cpp
M  +6    -0    src/klauncher/klauncher_main.cpp

http://commits.kde.org/kinit/7687848f6bbafcd30652066f4962aac1c90c6387

diff --git a/Info.plist.template b/src/kdeinit/Info.plist.template
similarity index 100%
rename from Info.plist.template
rename to src/kdeinit/Info.plist.template
diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
index e07bd8d..a91a09d 100644
--- a/src/kdeinit/kinit.cpp
+++ b/src/kdeinit/kinit.cpp
@@ -69,6 +69,8 @@
 #include <CoreFoundation/CFBundle.h>
 #include <CoreFoundation/CFString.h>
 #include <CoreFoundation/CFURL.h>
+#include <crt_externs.h> // for _NSGetArgc and friends
+#include <mach-o/dyld.h> // for _NSGetExecutablePath
 #endif
 
 #include <kinit_version.h>
diff --git a/src/klauncher/klauncher_main.cpp b/src/klauncher/klauncher_main.cpp
index 06b1bc0..266b5d3 100644
--- a/src/klauncher/klauncher_main.cpp
+++ b/src/klauncher/klauncher_main.cpp
@@ -31,6 +31,7 @@
 
 #include "klauncher_cmds.h"
 #include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
 #include <QDebug>
 #include <QDBusConnectionInterface>
 
@@ -72,6 +73,11 @@ bool mac_set_dbus_address(QString value)
 
 void mac_initialize_dbus()
 {
+    enum
+    {
+        timeout = 3000 // msec. Copied from old kdecore/kernel/kkernel_mac.cpp
+    };
+
     if (dbus_initialized) {
         return;
     }
[prev in list] [next in list] [prev in thread] [next in thread]