diff options
author | Mark Wright <gienah@gentoo.org> | 2018-07-03 12:09:07 +1000 |
---|---|---|
committer | Mark Wright <gienah@gentoo.org> | 2018-07-03 12:38:40 +1000 |
commit | 07ba37d27c35a88152a5f413289892c47b8325c6 (patch) | |
tree | 4ad7908632c38d3d87246290c664c2ebad0db97a /sci-mathematics/rstudio/files | |
parent | app-arch/p7zip: remove old (diff) | |
download | gentoo-07ba37d27c35a88152a5f413289892c47b8325c6.tar.gz gentoo-07ba37d27c35a88152a5f413289892c47b8325c6.tar.bz2 gentoo-07ba37d27c35a88152a5f413289892c47b8325c6.zip |
sci-mathematics/rstudio: Bump to 1.1.453
Thanks to John Dough for reporting 652116.
Thanks to Harris Landgarten for reporting 626056.
Closes https://bugs.gentoo.org/652116
Closes https://bugs.gentoo.org/626056
Diffstat (limited to 'sci-mathematics/rstudio/files')
-rw-r--r-- | sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch | 38 | ||||
-rw-r--r-- | sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch | 143 |
2 files changed, 181 insertions, 0 deletions
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch new file mode 100644 index 000000000000..760c9b561055 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch @@ -0,0 +1,38 @@ +--- rstudio-1.1.453-orig/src/cpp/core/DateTime.cpp 2018-05-15 04:19:30.000000000 +1000 ++++ rstudio-1.1.453/src/cpp/core/DateTime.cpp 2018-07-02 16:19:21.335703471 +1000 +@@ -65,7 +65,7 @@ + using namespace boost::posix_time; + + ptime time_t_epoch(date(1970,1,1)); +- return time_t_epoch + seconds(sec); ++ return time_t_epoch + seconds(static_cast<long>(sec)); + } + + boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms) +--- rstudio-1.1.453-orig/src/cpp/core/file_lock/FileLock.cpp 2018-05-15 04:19:30.000000000 +1000 ++++ rstudio-1.1.453/src/cpp/core/file_lock/FileLock.cpp 2018-07-02 17:00:35.915695201 +1000 +@@ -133,11 +133,11 @@ + + // timeout interval + double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval); +- FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval); ++ FileLock::s_timeoutInterval = boost::posix_time::seconds(static_cast<long>(timeoutInterval)); + + // refresh rate + double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate); +- FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate); ++ FileLock::s_refreshRate = boost::posix_time::seconds(static_cast<long>(refreshRate)); + + // logging + bool loggingEnabled = settings.getBool("enable-logging", false); +@@ -212,8 +212,8 @@ + + // default values for static members + FileLock::LockType FileLock::s_defaultType(FileLock::LOCKTYPE_LINKBASED); +-boost::posix_time::seconds FileLock::s_timeoutInterval(kDefaultTimeoutInterval); +-boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate); ++boost::posix_time::seconds FileLock::s_timeoutInterval(static_cast<long>(kDefaultTimeoutInterval)); ++boost::posix_time::seconds FileLock::s_refreshRate(static_cast<long>(kDefaultRefreshRate)); + bool FileLock::s_loggingEnabled(false); + bool FileLock::s_isLoadBalanced(false); + FilePath FileLock::s_logFile; diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch new file mode 100644 index 000000000000..641f7710167a --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch @@ -0,0 +1,143 @@ +--- rstudio-1.1.453-orig/src/cpp/session/SessionClientInit.cpp 2018-05-15 04:19:30.000000000 +1000 ++++ rstudio-1.1.453/src/cpp/session/SessionClientInit.cpp 2018-07-02 20:21:41.595654877 +1000 +@@ -105,7 +105,7 @@ + } + + // prepare session info +- json::Object sessionInfo ; ++ core::json::Object sessionInfo ; + sessionInfo["clientId"] = clientId; + sessionInfo["mode"] = options.programMode(); + +@@ -119,8 +119,8 @@ + } + + // temp dir +- FilePath tempDir = rstudio::r::session::utils::tempDir(); +- Error error = tempDir.ensureDirectory(); ++ core::FilePath tempDir = rstudio::r::session::utils::tempDir(); ++ core::Error error = tempDir.ensureDirectory(); + if (error) + LOG_ERROR(error); + sessionInfo["temp_dir"] = tempDir.absolutePath(); +@@ -132,12 +132,12 @@ + sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt"); + + // client state +- json::Object clientStateObject; ++ core::json::Object clientStateObject; + rstudio::r::session::clientState().currentState(&clientStateObject); + sessionInfo["client_state"] = clientStateObject; + + // source documents +- json::Array jsonDocs; ++ core::json::Array jsonDocs; + error = modules::source::clientInitDocuments(&jsonDocs); + if (error) + LOG_ERROR(error); +@@ -159,7 +159,7 @@ + if (resumed) + { + // console actions +- json::Object actionsObject; ++ core::json::Object actionsObject; + consoleActions.asJson(&actionsObject); + sessionInfo["console_actions"] = actionsObject; + } +@@ -211,12 +211,12 @@ + } + else + { +- sessionInfo["active_project_file"] = json::Value(); +- sessionInfo["project_ui_prefs"] = json::Value(); +- sessionInfo["project_open_docs"] = json::Value(); ++ sessionInfo["active_project_file"] = core::json::Value(); ++ sessionInfo["project_ui_prefs"] = core::json::Value(); ++ sessionInfo["project_open_docs"] = core::json::Value(); + sessionInfo["project_supports_sharing"] = false; + sessionInfo["project_owned_by_user"] = false; +- sessionInfo["project_user_data_directory"] = json::Value(); ++ sessionInfo["project_user_data_directory"] = core::json::Value(); + } + + sessionInfo["system_encoding"] = std::string(::locale2charset(NULL)); +@@ -253,20 +253,20 @@ + sessionInfo["build_tools_bookdown_website"] = + module_context::isBookdownWebsite(); + +- FilePath buildTargetDir = projects::projectContext().buildTargetPath(); ++ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath(); + if (!buildTargetDir.empty()) + { + sessionInfo["build_target_dir"] = module_context::createAliasedPath( + buildTargetDir); +- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) && ++ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) && + buildTargetDir.childPath("src").exists(); + sessionInfo["has_pkg_vig"] = +- (type == r_util::kBuildTypePackage) && ++ (type == core::r_util::kBuildTypePackage) && + buildTargetDir.childPath("vignettes").exists(); + } + else + { +- sessionInfo["build_target_dir"] = json::Value(); ++ sessionInfo["build_target_dir"] = core::json::Value(); + sessionInfo["has_pkg_src"] = false; + sessionInfo["has_pkg_vig"] = false; + } +@@ -274,9 +274,9 @@ + } + else + { +- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone; ++ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone; + sessionInfo["build_tools_bookdown_website"] = false; +- sessionInfo["build_target_dir"] = json::Value(); ++ sessionInfo["build_target_dir"] = core::json::Value(); + sessionInfo["has_pkg_src"] = false; + sessionInfo["has_pkg_vig"] = false; + } +@@ -285,7 +285,7 @@ + sessionInfo["presentation_commands"] = options.allowPresentationCommands(); + + sessionInfo["tutorial_api_available"] = false; +- sessionInfo["tutorial_api_client_origin"] = json::Value(); ++ sessionInfo["tutorial_api_client_origin"] = core::json::Value(); + + sessionInfo["build_state"] = modules::build::buildStateAsJson(); + sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled(); +@@ -296,7 +296,7 @@ + + // console history -- we do this at the end because + // restoreBuildRestartContext may have reset it +- json::Array historyArray; ++ core::json::Array historyArray; + rstudio::r::session::consoleHistory().asJson(&historyArray); + sessionInfo["console_history"] = historyArray; + sessionInfo["console_history_capacity"] = +@@ -364,13 +364,13 @@ + + sessionInfo["multi_session"] = options.multiSession(); + +- json::Object rVersionsJson; ++ core::json::Object rVersionsJson; + rVersionsJson["r_version"] = module_context::rVersion(); + rVersionsJson["r_home_dir"] = module_context::rHomeDir(); + sessionInfo["r_versions_info"] = rVersionsJson; + + sessionInfo["show_user_home_page"] = options.showUserHomePage(); +- sessionInfo["user_home_page_url"] = json::Value(); ++ sessionInfo["user_home_page_url"] = core::json::Value(); + + sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson(); + sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload(); +@@ -394,7 +394,7 @@ + + // send response (we always set kEventsPending to false so that the client + // won't poll for events until it is ready) +- json::JsonRpcResponse jsonRpcResponse ; ++ core::json::JsonRpcResponse jsonRpcResponse ; + jsonRpcResponse.setField(kEventsPending, "false"); + jsonRpcResponse.setResult(sessionInfo) ; + ptrConnection->sendJsonRpcResponse(jsonRpcResponse); |