diff options
Diffstat (limited to 'testing/codeblocks/0003-fix-missing-sentinel.patch')
-rw-r--r-- | testing/codeblocks/0003-fix-missing-sentinel.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/testing/codeblocks/0003-fix-missing-sentinel.patch b/testing/codeblocks/0003-fix-missing-sentinel.patch deleted file mode 100644 index 1b80e10033a..00000000000 --- a/testing/codeblocks/0003-fix-missing-sentinel.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/src/sdk/configmanager.cpp -+++ b/src/sdk/configmanager.cpp -@@ -612,7 +612,7 @@ - return wxStandardPathsBase::Get().GetUserDataDir(); - #else - #ifdef __linux__ -- return wxString::FromUTF8(g_build_filename (g_get_user_config_dir(), "codeblocks", NULL)); -+ return wxString::FromUTF8(g_build_filename (g_get_user_config_dir(), "codeblocks", (void *)NULL)); - #else - return wxStandardPathsBase::Get().GetUserDataDir(); - #endif // __linux__ -@@ -1586,7 +1586,7 @@ - wxString dataPathUser = ConfigManager::config_folder + wxFILE_SEP_PATH + _T("share"); - #ifdef __linux__ - if (!has_alternate_user_data_path) -- dataPathUser = wxString::FromUTF8(g_build_filename (g_get_user_data_dir(), NULL)); -+ dataPathUser = wxString::FromUTF8(g_build_filename (g_get_user_data_dir(), (void *)NULL)); - #endif // __linux__ - - ConfigManager::data_path_user = dataPathUser + wxFILE_SEP_PATH + _T("codeblocks"); -@@ -1612,14 +1612,14 @@ - - // ConfigManager::config_folder might be the portable-path but we want to migrate the standard-conform folder, - // but only if it not already exists -- wxString newConfigFolder = wxString::FromUTF8(g_build_filename (g_get_user_config_dir(), "codeblocks", NULL)); -+ wxString newConfigFolder = wxString::FromUTF8(g_build_filename (g_get_user_config_dir(), "codeblocks", (void *)NULL)); - // if the new config folder already exist, we step out immediately - if (wxDirExists(newConfigFolder)) - return; - - wxString oldConfigFolder = wxStandardPaths::Get().GetUserDataDir(); - wxString oldDataFolder = oldConfigFolder + wxFILE_SEP_PATH + _T("share") + wxFILE_SEP_PATH + _T("codeblocks"); -- wxString newDataFolder = wxString::FromUTF8(g_build_filename (g_get_user_data_dir(), NULL)) + wxFILE_SEP_PATH + _T("codeblocks"); -+ wxString newDataFolder = wxString::FromUTF8(g_build_filename (g_get_user_data_dir(), (void *)NULL)) + wxFILE_SEP_PATH + _T("codeblocks"); - wxString msg; - msg = F(_("The places where the configuration files and user-data files are stored\n" - "have been changed to be more standard-conform.\n" |