Hello,
I've have problems to compile in Mac OS X 10.6 in src/util/sanbox.cpp.
There is couple of Classes that doesn't appear in 10.6 but they are
available on 10.7. This is corner case because mostly noone uses 10.6
but I test my FFMPEG stuff on it. It's synced with current master..
I made small patch to get over this
diff --git a/src/util/sandbox.cpp b/src/util/sandbox.cpp
index 249ef10..64ba0f6 100644
--- a/src/util/sandbox.cpp
+++ b/src/util/sandbox.cpp
@@ -156,6 +156,7 @@ bool Sandbox::createSecurityToken(const QString&
canonicalPath,
return false;
}
+#if MAC_OS_X_VERSION_10_7 == 1070
#ifdef Q_OS_MAC
CFURLRef url = CFURLCreateWithFileSystemPath(
kCFAllocatorDefault, QStringToCFString(canonicalPath),
@@ -191,6 +192,7 @@ bool Sandbox::createSecurityToken(const QString&
canonicalPath,
}
}
#endif
+#endif
return false;
}
@@ -321,6 +323,7 @@ SecurityTokenPointer
Sandbox::openSecurityToken(const QDir& dir, bool create) {
SecurityTokenPointer Sandbox::openTokenFromBookmark(const QString&
canonicalPath,
const QString&
bookmarkBase64) {
#ifdef Q_OS_MAC
+#if MAC_OS_X_VERSION_10_7 == 1070
QByteArray bookmarkBA = QByteArray::fromBase64(bookmarkBase64.toLatin1());
if (!bookmarkBA.isEmpty()) {
CFDataRef bookmarkData = CFDataCreate(
@@ -358,10 +361,12 @@ SecurityTokenPointer
Sandbox::openTokenFromBookmark(const QString& canonicalPath
}
}
#endif
+#endif
return SecurityTokenPointer();
}
#ifdef Q_OS_MAC
+#if MAC_OS_X_VERSION_10_7 == 1070
SandboxSecurityToken::SandboxSecurityToken(const QString& path, CFURLRef url)
: m_path(path),
m_url(url) {
@@ -372,9 +377,11 @@ SandboxSecurityToken::SandboxSecurityToken(const
QString& path, CFURLRef url)
}
}
#endif
+#endif
SandboxSecurityToken::~SandboxSecurityToken() {
#ifdef Q_OS_MAC
+#if MAC_OS_X_VERSION_10_7 == 1070
if (sDebug) {
qDebug() << "~SandboxSecurityToken" << m_path;
}
@@ -384,4 +391,5 @@ SandboxSecurityToken::~SandboxSecurityToken() {
m_url = 0;
}
#endif
+#endif
}
It's just solving the case for compiling not for real usage stuff but
you can see where problem lays..
Thanks,
Tuukka
------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works.
Faster operations. Version large binaries. Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Get Mixxx, the #1 Free MP3 DJ Mixing software Today
http://mixxx.org
Mixxx-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mixxx-devel
