diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-10 10:24:33 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-10-10 10:24:33 +0200 |
commit | 052c8c9fdcadd52f9eecc4de036b7afdf7f4942f (patch) | |
tree | cae9794f96e99ade789e0ebc1e05a0e7a4ae11a0 /package/xbmc/patches/patch-xbmc_Application_cpp | |
parent | 763a7d577807bd623434caf64de151635e3537cb (diff) | |
parent | fe63f19bc969871820b61846b3301c15a269b553 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xbmc/patches/patch-xbmc_Application_cpp')
-rw-r--r-- | package/xbmc/patches/patch-xbmc_Application_cpp | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/package/xbmc/patches/patch-xbmc_Application_cpp b/package/xbmc/patches/patch-xbmc_Application_cpp new file mode 100644 index 000000000..587456a07 --- /dev/null +++ b/package/xbmc/patches/patch-xbmc_Application_cpp @@ -0,0 +1,41 @@ +--- xbmc-12.2.orig/xbmc/Application.cpp 2013-05-03 07:57:41.000000000 +0200 ++++ xbmc-12.2/xbmc/Application.cpp 2013-10-08 13:55:01.000000000 +0200 +@@ -615,7 +615,7 @@ bool CApplication::Create() + + if (!CLog::Init(CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str())) + { +- fprintf(stderr,"Could not init logging classes. Permission errors on ~/.xbmc (%s)\n", ++ fprintf(stderr,"Could not init logging classes. Permission errors on %s\n", + CSpecialProtocol::TranslatePath(g_settings.m_logFolder).c_str()); + return false; + } +@@ -966,10 +966,13 @@ bool CApplication::InitDirectoriesLinux( + userName = "root"; + + CStdString userHome; ++ userHome = "/etc/xbmc"; ++/* + if (getenv("HOME")) + userHome = getenv("HOME"); + else + userHome = "/root"; ++*/ + + CStdString xbmcBinPath, xbmcPath; + CUtil::GetHomePath(xbmcBinPath, "XBMC_BIN_HOME"); +@@ -1001,11 +1004,11 @@ bool CApplication::InitDirectoriesLinux( + // map our special drives + CSpecialProtocol::SetXBMCBinPath(xbmcBinPath); + CSpecialProtocol::SetXBMCPath(xbmcPath); +- CSpecialProtocol::SetHomePath(userHome + "/.xbmc"); +- CSpecialProtocol::SetMasterProfilePath(userHome + "/.xbmc/userdata"); ++ CSpecialProtocol::SetHomePath(userHome); ++ CSpecialProtocol::SetMasterProfilePath(userHome + "/userdata"); + +- CStdString strTempPath = userHome; +- strTempPath = URIUtils::AddFileToFolder(strTempPath, ".xbmc/temp"); ++ CStdString strTempPath = "/tmp"; ++ strTempPath = URIUtils::AddFileToFolder(strTempPath, "/.xbmc/temp"); + if (getenv("XBMC_TEMP")) + strTempPath = getenv("XBMC_TEMP"); + CSpecialProtocol::SetTempPath(strTempPath); |