rstudio: update to 1.1.456.
This commit is contained in:
parent
b95c4b85e1
commit
40a5258042
2 changed files with 290 additions and 3 deletions
287
srcpkgs/rstudio/patches/boost-1.68.patch
Normal file
287
srcpkgs/rstudio/patches/boost-1.68.patch
Normal file
|
@ -0,0 +1,287 @@
|
|||
From 8f38ca39566a59c3296fab71a3bbd2ee07232a5b Mon Sep 17 00:00:00 2001
|
||||
From: Gary <gary@rstudio.com>
|
||||
Date: Wed, 7 Mar 2018 15:19:38 -0800
|
||||
Subject: [PATCH] Fix a batch of simple MSVC/Win32 warnings
|
||||
|
||||
Chipping away at Win32 build warnings from MSVC 2015. These are mainly ones where a silent cast was happening, "fixed" by replacing with the equivalent static_cast to make it explicit. This gets warnings down to ones that are increasingly interesting and have some potential to harbor actual issues.
|
||||
---
|
||||
src/cpp/core/DateTime.cpp | 8 ++++----
|
||||
src/cpp/core/file_lock/FileLock.cpp | 10 +++++-----
|
||||
src/cpp/core/file_lock/LinkBasedFileLock.cpp | 2 +-
|
||||
src/cpp/core/http/Response.cpp | 2 +-
|
||||
src/cpp/core/system/Win32PtyTests.cpp | 2 +-
|
||||
src/cpp/desktop/DesktopRVersion.cpp | 4 ++--
|
||||
src/cpp/desktop/DesktopWordViewer.hpp | 4 ++--
|
||||
src/cpp/r/session/graphics/RGraphicsPlotManager.cpp | 8 ++++----
|
||||
.../r/session/graphics/RShadowPngGraphicsHandler.cpp | 8 ++++----
|
||||
src/cpp/session/SessionConsoleProcessSocket.cpp | 4 ++--
|
||||
src/cpp/session/SessionSourceDatabase.cpp | 6 +++---
|
||||
src/cpp/session/modules/SessionMarkers.cpp | 6 +++---
|
||||
src/cpp/session/modules/SessionPackrat.cpp | 4 +++-
|
||||
src/cpp/session/modules/clang/DefinitionIndex.cpp | 6 +++---
|
||||
14 files changed, 38 insertions(+), 36 deletions(-)
|
||||
|
||||
diff --git src/cpp/core/DateTime.cpp src/cpp/core/DateTime.cpp
|
||||
index adac90f6c1..3ba26b0764 100644
|
||||
--- src/cpp/core/DateTime.cpp
|
||||
+++ src/cpp/core/DateTime.cpp
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* DateTime.cpp
|
||||
*
|
||||
- * Copyright (C) 2009-12 by RStudio, Inc.
|
||||
+ * Copyright (C) 2009-18 by RStudio, Inc.
|
||||
*
|
||||
* Unless you have received this program directly from RStudio pursuant
|
||||
* to the terms of a commercial license agreement with RStudio, then
|
||||
@@ -51,7 +51,7 @@ double millisecondsSinceEpoch(const boost::posix_time::ptime& time)
|
||||
|
||||
ptime time_t_epoch(date(1970,1,1));
|
||||
time_duration diff = time - time_t_epoch;
|
||||
- return diff.total_milliseconds();
|
||||
+ return static_cast<double>(diff.total_milliseconds());
|
||||
}
|
||||
|
||||
double millisecondsSinceEpoch(std::time_t time)
|
||||
@@ -65,7 +65,7 @@ boost::posix_time::ptime timeFromSecondsSinceEpoch(double sec)
|
||||
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)
|
||||
@@ -96,7 +96,7 @@ std::string format(const boost::posix_time::ptime& datetime,
|
||||
std::string millisecondsSinceEpochAsString(double ms)
|
||||
{
|
||||
boost::posix_time::ptime time =
|
||||
- date_time::timeFromMillisecondsSinceEpoch(ms);
|
||||
+ date_time::timeFromMillisecondsSinceEpoch(static_cast<int64_t>(ms));
|
||||
|
||||
return date_time::format(time, "%d %b %Y %H:%M:%S");
|
||||
}
|
||||
diff --git src/cpp/core/file_lock/FileLock.cpp src/cpp/core/file_lock/FileLock.cpp
|
||||
index 145fa64ac6..72c5869e80 100644
|
||||
--- src/cpp/core/file_lock/FileLock.cpp
|
||||
+++ src/cpp/core/file_lock/FileLock.cpp
|
||||
@@ -1,7 +1,7 @@
|
||||
/*
|
||||
* FileLock.cpp
|
||||
*
|
||||
- * Copyright (C) 2009-12 by RStudio, Inc.
|
||||
+ * Copyright (C) 2009-18 by RStudio, Inc.
|
||||
*
|
||||
* Unless you have received this program directly from RStudio pursuant
|
||||
* to the terms of a commercial license agreement with RStudio, then
|
||||
@@ -133,11 +133,11 @@ void FileLock::initialize(const Settings& settings)
|
||||
|
||||
// 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 @@ void FileLock::log(const std::string& message)
|
||||
|
||||
// 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 src/cpp/core/file_lock/LinkBasedFileLock.cpp src/cpp/core/file_lock/LinkBasedFileLock.cpp
|
||||
index 3c3784a0f5..84141f6e39 100644
|
||||
--- src/cpp/core/file_lock/LinkBasedFileLock.cpp
|
||||
+++ src/cpp/core/file_lock/LinkBasedFileLock.cpp
|
||||
@@ -166,7 +166,7 @@ bool LinkBasedFileLock::isLockFileStale(const FilePath& lockFilePath)
|
||||
return true;
|
||||
}
|
||||
|
||||
- double seconds = s_timeoutInterval.total_seconds();
|
||||
+ double seconds = static_cast<double>(s_timeoutInterval.total_seconds());
|
||||
double diff = ::difftime(::time(NULL), lockFilePath.lastWriteTime());
|
||||
return diff >= seconds;
|
||||
}
|
||||
diff --git src/cpp/core/http/Response.cpp src/cpp/core/http/Response.cpp
|
||||
index 2a3ff32951..4cb479589d 100644
|
||||
--- src/cpp/core/http/Response.cpp
|
||||
+++ src/cpp/core/http/Response.cpp
|
||||
@@ -77,7 +77,7 @@ void Response::setCacheForeverHeaders(bool publicAccessiblity)
|
||||
setHeader("Expires", http::util::httpDate(expireTime));
|
||||
|
||||
// set Cache-Control header
|
||||
- int durationSeconds = yearDuration.total_seconds();
|
||||
+ auto durationSeconds = yearDuration.total_seconds();
|
||||
std::string accessibility = publicAccessiblity ? "public" : "private";
|
||||
std::string cacheControl(accessibility + ", max-age=" +
|
||||
safe_convert::numberToString(durationSeconds));
|
||||
diff --git src/cpp/core/system/Win32PtyTests.cpp src/cpp/core/system/Win32PtyTests.cpp
|
||||
index e899f01a7b..3f9ab30051 100644
|
||||
--- src/cpp/core/system/Win32PtyTests.cpp
|
||||
+++ src/cpp/core/system/Win32PtyTests.cpp
|
||||
@@ -237,7 +237,7 @@ TEST_CASE("Win32PtyTests")
|
||||
err = pty.setSize(line1.length() * 4, kRows);
|
||||
CHECK(!err);
|
||||
|
||||
- for (int i = 0; i < line1.length(); i++)
|
||||
+ for (size_t i = 0; i < line1.length(); i++)
|
||||
{
|
||||
std::string typeThis;
|
||||
typeThis.push_back(line1[i]);
|
||||
diff --git src/cpp/desktop/DesktopRVersion.cpp src/cpp/desktop/DesktopRVersion.cpp
|
||||
index b3ac7fe942..a2418ec4b3 100644
|
||||
--- src/cpp/desktop/DesktopRVersion.cpp
|
||||
+++ src/cpp/desktop/DesktopRVersion.cpp
|
||||
@@ -241,7 +241,7 @@ void enumRegistry(Architecture architecture, HKEY key, QList<RVersion>* pResults
|
||||
}
|
||||
|
||||
std::vector<std::string> keys = regKey.keyNames();
|
||||
- for (int i = 0; i < keys.size(); i++)
|
||||
+ for (size_t i = 0; i < keys.size(); i++)
|
||||
{
|
||||
RegistryKey verKey;
|
||||
error = verKey.open(regKey.handle(),
|
||||
diff --git src/cpp/desktop/DesktopWordViewer.hpp src/cpp/desktop/DesktopWordViewer.hpp
|
||||
index 54e731a82b..0d22357aad 100644
|
||||
--- src/cpp/desktop/DesktopWordViewer.hpp
|
||||
+++ src/cpp/desktop/DesktopWordViewer.hpp
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <boost/utility.hpp>
|
||||
#include <core/Error.hpp>
|
||||
|
||||
-class IDispatch;
|
||||
+struct IDispatch;
|
||||
|
||||
namespace rstudio {
|
||||
namespace desktop {
|
||||
diff --git src/cpp/r/session/graphics/RGraphicsPlotManager.cpp src/cpp/r/session/graphics/RGraphicsPlotManager.cpp
|
||||
index 807ab0cd47..79d6459656 100644
|
||||
--- src/cpp/r/session/graphics/RGraphicsPlotManager.cpp
|
||||
+++ src/cpp/r/session/graphics/RGraphicsPlotManager.cpp
|
||||
@@ -308,9 +308,9 @@ Error PlotManager::savePlotAsBitmapFile(const FilePath& targetPath,
|
||||
int res = 96;
|
||||
|
||||
// adjust for device pixel ratio
|
||||
- width = width * pixelRatio;
|
||||
- height = height * pixelRatio;
|
||||
- res = res * pixelRatio;
|
||||
+ width = static_cast<int>(width * pixelRatio);
|
||||
+ height = static_cast<int>(height * pixelRatio);
|
||||
+ res = static_cast<int>(res * pixelRatio);
|
||||
|
||||
// optional format specific extra params
|
||||
std::string extraParams;
|
||||
diff --git src/cpp/r/session/graphics/RShadowPngGraphicsHandler.cpp src/cpp/r/session/graphics/RShadowPngGraphicsHandler.cpp
|
||||
index 75a275c67d..d0dfd8c10b 100644
|
||||
--- src/cpp/r/session/graphics/RShadowPngGraphicsHandler.cpp
|
||||
+++ src/cpp/r/session/graphics/RShadowPngGraphicsHandler.cpp
|
||||
@@ -109,9 +109,9 @@ Error shadowDevDesc(DeviceContext* pDC, pDevDesc* pDev)
|
||||
PreserveCurrentDeviceScope preserveCurrentDeviceScope;
|
||||
|
||||
// determine width, height, and res
|
||||
- int width = pDC->width * pDC->devicePixelRatio;
|
||||
- int height = pDC->height * pDC->devicePixelRatio;
|
||||
- int res = 96 * pDC->devicePixelRatio;
|
||||
+ int width = static_cast<int>(pDC->width * pDC->devicePixelRatio);
|
||||
+ int height = static_cast<int>(pDC->height * pDC->devicePixelRatio);
|
||||
+ int res = static_cast<int>(96.0 * pDC->devicePixelRatio);
|
||||
|
||||
// create PNG device (completely bail on error)
|
||||
boost::format fmt("grDevices:::png(\"%1%\", %2%, %3%, res = %4% %5%)");
|
||||
diff --git src/cpp/session/SessionConsoleProcessSocket.cpp src/cpp/session/SessionConsoleProcessSocket.cpp
|
||||
index 2855ad1465..633d3c6f98 100644
|
||||
--- src/cpp/session/SessionConsoleProcessSocket.cpp
|
||||
+++ src/cpp/session/SessionConsoleProcessSocket.cpp
|
||||
@@ -66,7 +66,7 @@ Error ConsoleProcessSocket::ensureServerRunning()
|
||||
// initialize seed for random port selection
|
||||
if (!s_didSeedRand)
|
||||
{
|
||||
- srand(time(NULL));
|
||||
+ srand(static_cast<unsigned int>(time(NULL)));
|
||||
s_didSeedRand = true;
|
||||
}
|
||||
|
||||
diff --git src/cpp/session/SessionSourceDatabase.cpp src/cpp/session/SessionSourceDatabase.cpp
|
||||
index 4bd953f5a2..1d32909da4 100644
|
||||
--- src/cpp/session/SessionSourceDatabase.cpp
|
||||
+++ src/cpp/session/SessionSourceDatabase.cpp
|
||||
@@ -303,7 +303,7 @@ SourceDocument::SourceDocument(const std::string& type)
|
||||
created_ = date_time::millisecondsSinceEpoch();
|
||||
sourceOnSave_ = false;
|
||||
relativeOrder_ = 0;
|
||||
- lastContentUpdate_ = date_time::millisecondsSinceEpoch();
|
||||
+ lastContentUpdate_ = static_cast<std::time_t>(date_time::millisecondsSinceEpoch());
|
||||
}
|
||||
|
||||
|
||||
@@ -334,7 +334,7 @@ void SourceDocument::setContents(const std::string& contents)
|
||||
{
|
||||
contents_ = contents;
|
||||
hash_ = hash::crc32Hash(contents_);
|
||||
- lastContentUpdate_ = date_time::millisecondsSinceEpoch();
|
||||
+ lastContentUpdate_ = static_cast<std::time_t>(date_time::millisecondsSinceEpoch());
|
||||
}
|
||||
|
||||
// set contents from file
|
||||
diff --git src/cpp/session/modules/SessionMarkers.cpp src/cpp/session/modules/SessionMarkers.cpp
|
||||
index 481bb1e738..f236661986 100644
|
||||
--- src/cpp/session/modules/SessionMarkers.cpp
|
||||
+++ src/cpp/session/modules/SessionMarkers.cpp
|
||||
@@ -382,8 +382,8 @@ SEXP rs_sourceMarkers(SEXP nameSEXP,
|
||||
SourceMarker marker(
|
||||
sourceMarkerTypeFromString(type),
|
||||
FilePath(path),
|
||||
- safe_convert::numberTo<int>(line, 1),
|
||||
- safe_convert::numberTo<int>(column, 1),
|
||||
+ safe_convert::numberTo<double, int>(line, 1),
|
||||
+ safe_convert::numberTo<double, int>(column, 1),
|
||||
core::html_utils::HTML(message, messageHTML),
|
||||
true);
|
||||
|
||||
diff --git src/cpp/session/modules/SessionPackrat.cpp src/cpp/session/modules/SessionPackrat.cpp
|
||||
index 756d315395..2a947c7b38 100644
|
||||
--- src/cpp/session/modules/SessionPackrat.cpp
|
||||
+++ src/cpp/session/modules/SessionPackrat.cpp
|
||||
@@ -767,8 +767,10 @@ void onPackratAction(const std::string& project,
|
||||
}
|
||||
|
||||
if (running && (s_runningPackratAction != PACKRAT_ACTION_NONE))
|
||||
+ {
|
||||
PACKRAT_TRACE("warning: '" << action << "' executed while action " <<
|
||||
s_runningPackratAction << " was already running");
|
||||
+ }
|
||||
|
||||
PACKRAT_TRACE("packrat action '" << action << "' " <<
|
||||
(running ? "started" : "finished"));
|
||||
diff --git src/cpp/session/modules/clang/DefinitionIndex.cpp src/cpp/session/modules/clang/DefinitionIndex.cpp
|
||||
index 2e54356136..a67d46ddbe 100644
|
||||
--- src/cpp/session/modules/clang/DefinitionIndex.cpp
|
||||
+++ src/cpp/session/modules/clang/DefinitionIndex.cpp
|
||||
@@ -505,7 +505,7 @@ void loadDefinitionIndex()
|
||||
LOG_ERROR(error);
|
||||
continue;
|
||||
}
|
||||
- definitions.fileLastWrite = numberTo<std::time_t>(fileLastWrite, 0);
|
||||
+ definitions.fileLastWrite = numberTo<double, std::time_t>(fileLastWrite, 0);
|
||||
|
||||
// if the file doesn't exist then bail
|
||||
if (!FilePath::exists(definitions.file))
|
||||
@@ -539,7 +539,7 @@ void saveDefinitionIndex()
|
||||
const CppDefinitions& definitions = defs.second;
|
||||
json::Object definitionsJson;
|
||||
definitionsJson["file"] = definitions.file;
|
||||
- definitionsJson["file_last_write"] = numberTo<double>(
|
||||
+ definitionsJson["file_last_write"] = numberTo<std::time_t, double>(
|
||||
definitions.fileLastWrite, 0);
|
||||
json::Array defsArrayJson;
|
||||
std::transform(definitions.definitions.begin(),
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'rstudio'
|
||||
pkgname=rstudio
|
||||
version=1.1.383
|
||||
revision=2
|
||||
version=1.1.456
|
||||
revision=1
|
||||
only_for_archs="i686 x86_64"
|
||||
build_style=cmake
|
||||
make_install_args="INSTALL_ROOT=${DESTDIR} \
|
||||
|
@ -36,7 +36,7 @@ distfiles="https://github.com/rstudio/rstudio/archive/v${version}.tar.gz
|
|||
${_aws}/rstudio-buildtools/selenium-java-${_selenium_version}.zip
|
||||
${_aws}/rstudio-buildtools/selenium-server-standalone-${_selenium_version}.jar
|
||||
${_aws}/rstudio-buildtools/chromedriver-linux"
|
||||
checksum="6edc85f98366a94f0c9939dde8d25950c65580c9eed7ac245903e0aa1205c818
|
||||
checksum="1362ad0afdb214d85e4edf86a1d42d0f83d0fa91dc4e5079af6424df9b1573d0
|
||||
4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
|
||||
f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
|
||||
aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3
|
||||
|
|
Loading…
Reference in a new issue