rstudio: update to 1.2.1335.

2019-07-31 00:10:59 +02:00 · 2019-07-31 00:10:59 +02:00 · 69d394a142
commit 69d394a142
parent c9f062f21a
6 changed files with 70 additions and 1159 deletions
--- a/srcpkgs/rstudio/patches/0001-boost-1.68.patch
+++ b/srcpkgs/rstudio/patches/0001-boost-1.68.patch
@ -1,287 +0,0 @@
-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(),
--- a/srcpkgs/rstudio/patches/0005-boost-1.70.patch
+++ b/srcpkgs/rstudio/patches/0005-boost-1.70.patch
@ -0,0 +1,62 @@
+https://github.com/zaphoyd/websocketpp/issues/794
+
+--- src/cpp/ext/websocketpp/transport/asio/connection.hpp.orig	2019-03-05 23:41:04 UTC
+++ src/cpp/ext/websocketpp/transport/asio/connection.hpp
+@@ -296,7 +296,7 @@ class connection : public config::socket_type::socket_
+      */
+     timer_ptr set_timer(long duration, timer_handler callback) {
+         timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
+-            lib::ref(*m_io_service),
+            *m_io_service,
+             boost::posix_time::milliseconds(duration)
+         );
+ 
+@@ -423,7 +423,7 @@ class connection : public config::socket_type::socket_
+ 
+         if (config::enable_multithreading) {
+             m_strand = lib::make_shared<boost::asio::io_service::strand>(
+-                lib::ref(*io_service));
+                *io_service);
+ 
+             m_async_read_handler = m_strand->wrap(lib::bind(
+                 &type::handle_async_read, get_shared(),lib::placeholders::_1,
+--- src/cpp/ext/websocketpp/transport/asio/endpoint.hpp.orig	2019-03-05 23:41:04 UTC
+++ src/cpp/ext/websocketpp/transport/asio/endpoint.hpp
+@@ -184,7 +184,7 @@ class endpoint : public config::socket_type { (public)
+         m_io_service = ptr;
+         m_external_io_service = true;
+         m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
+-            lib::ref(*m_io_service));
+            *m_io_service);
+ 
+         m_state = READY;
+         ec = lib::error_code();
+@@ -610,7 +610,7 @@ class endpoint : public config::socket_type { (public)
+      */
+     void start_perpetual() {
+         m_work = lib::make_shared<boost::asio::io_service::work>(
+-            lib::ref(*m_io_service)
+            *m_io_service
+         );
+     }
+ 
+@@ -776,7 +776,7 @@ class endpoint : public config::socket_type { (public)
+         // Create a resolver
+         if (!m_resolver) {
+             m_resolver = lib::make_shared<boost::asio::ip::tcp::resolver>(
+-                lib::ref(*m_io_service));
+                *m_io_service);
+         }
+ 
+         std::string proxy = tcon->get_proxy();
+--- src/cpp/ext/websocketpp/transport/asio/security/none.hpp.orig	2019-03-05 23:41:04 UTC
+++ src/cpp/ext/websocketpp/transport/asio/security/none.hpp
+@@ -167,7 +167,7 @@ class connection : public lib::enable_shared_from_this
+         }
+ 
+         m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
+-            lib::ref(*service));
+            *service);
+ 
+         m_state = READY;
+ 
--- a/srcpkgs/rstudio/patches/rstudio-1.1.463-boost-1.69.0_p1.patch
+++ b/srcpkgs/rstudio/patches/rstudio-1.1.463-boost-1.69.0_p1.patch
@ -1,680 +0,0 @@
--- /dev/null	2018-11-10 15:32:26.332997437 +1100
-+++ src/cpp/core/include/core/BoostSignals.hpp	2018-11-17 21:24:35.285976284 +1100
-@@ -0,0 +1,40 @@
-+/*
-+ * BoostSignals.hpp
-+ *
-+ * 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
-+ * this program is licensed to you under the terms of version 3 of the
-+ * GNU Affero General Public License. This program is distributed WITHOUT
-+ * ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT,
-+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the
-+ * AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details.
-+ *
-+ */
-+
-+#ifndef CORE_RSTUDIO_BOOST_SIGNALS_HPP
-+#define CORE_RSTUDIO_BOOST_SIGNALS_HPP
-+
-+#if RSTUDIO_BOOST_SIGNALS_VERSION == 1
-+
-+# include <boost/signals.hpp>
-+# define RSTUDIO_BOOST_SIGNAL boost::signal
-+# define RSTUDIO_BOOST_CONNECTION boost::signals::connection
-+# define RSTUDIO_BOOST_SCOPED_CONNECTION boost::signals::scoped_connection
-+# define RSTUDIO_BOOST_LAST_VALUE boost::last_value
-+
-+#elif RSTUDIO_BOOST_SIGNALS_VERSION == 2
-+
-+# include <boost/signals2.hpp>
-+# define RSTUDIO_BOOST_SIGNAL boost::signals2::signal
-+# define RSTUDIO_BOOST_CONNECTION boost::signals2::connection
-+# define RSTUDIO_BOOST_SCOPED_CONNECTION boost::signals2::scoped_connection
-+# define RSTUDIO_BOOST_LAST_VALUE boost::signals2::last_value
-+
-+#else
-+# error "Unrecognized RSTUDIO_BOOST_SIGNALS_VERSION"
-+#endif
-+
-+#endif // CORE_RSTUDIO_BOOST_SIGNALS_HPP
-+
--- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/CMakeLists.txt	2018-11-17 21:24:35.285976284 +1100
-@@ -208,6 +208,18 @@
-    message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}")
- endif()
- 
-+# allow opt-in to using Boost.Signals2
-+# TODO: remove this in RStudio v1.3 and port to signals2
-+if(NOT RSTUDIO_BOOST_SIGNALS_VERSION)
-+   if (BOOST_VERSION VERSION_LESS 1.69.0)
-+      set(RSTUDIO_BOOST_SIGNALS_VERSION 1)
-+   else()
-+      set(RSTUDIO_BOOST_SIGNALS_VERSION 2)
-+   endif()
-+endif()
-+
-+message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
-+add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION})
- 
- # add boost as system include directory
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
--- rstudio-1.1.463-orig/src/cpp/r/include/r/session/RConsoleHistory.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/r/include/r/session/RConsoleHistory.hpp	2018-11-17 21:24:35.285976284 +1100
-@@ -20,8 +20,8 @@
- 
- #include <boost/utility.hpp>
- #include <boost/circular_buffer.hpp>
-#include <boost/signal.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/json/Json.hpp>
- 
- namespace rstudio {
-@@ -44,7 +44,7 @@
- public:
-    typedef boost::circular_buffer<std::string>::value_type value_type;
-    typedef boost::circular_buffer<std::string>::const_iterator const_iterator;
-   typedef boost::signal<void (const std::string&)> AddSignal;
-+   typedef RSTUDIO_BOOST_SIGNAL<void (const std::string&)> AddSignal;
- 
- private:
-    ConsoleHistory();
-@@ -86,8 +86,7 @@
-    core::Error loadFromFile(const core::FilePath& filePath, bool verifyFile);
-    core::Error saveToFile(const core::FilePath& filePath) const;
-    
-   boost::signals::connection connectOnAdd(
-                                 const AddSignal::slot_function_type& slot)
-+   RSTUDIO_BOOST_CONNECTION connectOnAdd(const AddSignal::slot_function_type& slot)
-    {
-       return onAdd_.connect(slot);
-    }
--- rstudio-1.1.463-orig/src/cpp/r/include/r/session/RGraphics.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/r/include/r/session/RGraphics.hpp	2018-11-17 21:24:35.286976293 +1100
-@@ -19,6 +19,8 @@
- #include <boost/system/error_code.hpp>
- #include <boost/date_time/posix_time/ptime.hpp>
- 
-+#include <core/BoostSignals.hpp>
-+
- namespace rstudio {
- namespace r {
- namespace session {
-@@ -56,8 +58,8 @@
- #include <vector>
- 
- #include <boost/function.hpp>
-#include <boost/signal.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/Error.hpp>
- #include <core/json/Json.hpp>
- 
-@@ -162,7 +164,7 @@
-    virtual void clear() = 0;
- 
-    // subscribe to showManipulator event
-   virtual boost::signal<void ()>& onShowManipulator() = 0;
-+   virtual RSTUDIO_BOOST_SIGNAL<void ()>& onShowManipulator() = 0;
- 
-    // set manipulator values
-    virtual void setPlotManipulatorValues(const core::json::Object& values) = 0;
--- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManager.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/r/session/graphics/RGraphicsPlotManager.cpp	2018-11-17 21:24:35.286976293 +1100
-@@ -540,7 +540,7 @@
- 
- 
- 
-boost::signal<void ()>& PlotManager::onShowManipulator()
-+RSTUDIO_BOOST_SIGNAL<void ()>& PlotManager::onShowManipulator()
- {
-    return plotManipulatorManager().onShowManipulator();
- }
--- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManager.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/r/session/graphics/RGraphicsPlotManager.hpp	2018-11-17 21:24:35.287976303 +1100
-@@ -22,10 +22,10 @@
- #include <boost/utility.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/function.hpp>
-#include <boost/signal.hpp>
- #include <boost/regex.hpp>
- #include <boost/circular_buffer.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/Error.hpp>
- #include <core/FilePath.hpp>
- 
-@@ -45,10 +45,10 @@
- 
- struct GraphicsDeviceEvents
- {
-   boost::signal<void (SEXP)> onNewPage; 
-   boost::signal<void ()> onDrawing;
-   boost::signal<void ()> onResized;
-   boost::signal<void ()> onClosed;
-+   RSTUDIO_BOOST_SIGNAL<void (SEXP)> onNewPage; 
-+   RSTUDIO_BOOST_SIGNAL<void ()> onDrawing;
-+   RSTUDIO_BOOST_SIGNAL<void ()> onResized;
-+   RSTUDIO_BOOST_SIGNAL<void ()> onClosed;
- };
- 
- class PlotManipulatorManager;
-@@ -110,7 +110,7 @@
-    
-    virtual void clear();
- 
-   virtual boost::signal<void ()>& onShowManipulator() ;
-+   virtual RSTUDIO_BOOST_SIGNAL<void ()>& onShowManipulator() ;
-    virtual void setPlotManipulatorValues(const core::json::Object& values);
-    virtual void manipulatorPlotClicked(int x, int y);
- 
--- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.cpp	2018-11-17 21:24:35.287976303 +1100
-@@ -184,7 +184,7 @@
- }
- 
- 
-boost::signal<void ()>& PlotManipulatorManager::onShowManipulator()
-+RSTUDIO_BOOST_SIGNAL<void ()>& PlotManipulatorManager::onShowManipulator()
- {
-    return onShowManipulator_;
- }
--- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.hpp	2018-11-17 21:24:35.287976303 +1100
-@@ -16,8 +16,7 @@
- #ifndef R_SESSION_GRAPHICS_PLOT_MANIPULATOR_MANAGER_HPP
- #define R_SESSION_GRAPHICS_PLOT_MANIPULATOR_MANAGER_HPP
- 
-#include <boost/signal.hpp>
-
-+#include <core/BoostSignals.hpp>
- #include <core/Error.hpp>
- #include <core/json/Json.hpp>
- 
-@@ -53,7 +52,7 @@
- public:
-    core::Error initialize(const UnitConversionFunctions& convert);
- 
-   boost::signal<void ()>& onShowManipulator() ;
-+   RSTUDIO_BOOST_SIGNAL<void ()>& onShowManipulator() ;
-    void setPlotManipulatorValues(const core::json::Object& values);
-    void manipulatorPlotClicked(int x, int y);
-    
-@@ -85,7 +84,7 @@
-    bool replayingManipulator_;
- 
-    // manipulator event hook
-   boost::signal<void ()> onShowManipulator_;
-+   RSTUDIO_BOOST_SIGNAL<void ()> onShowManipulator_;
- 
-    // unit conversion function
-    UnitConversionFunctions convert_;
--- rstudio-1.1.463-orig/src/cpp/server/include/server/ServerSessionManager.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/server/include/server/ServerSessionManager.hpp	2018-11-17 21:27:05.255436316 +1100
-@@ -20,9 +20,9 @@
- #include <vector>
- #include <map>
- 
-#include <boost/signals.hpp>
- #include <boost/asio/io_service.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/Thread.hpp>
- 
- #include <core/system/PosixSystem.hpp>
--- rstudio-1.1.463-orig/src/cpp/session/SessionMain.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/SessionMain.cpp	2018-11-17 21:24:35.288976313 +1100
-@@ -33,12 +33,12 @@
- #include <boost/lexical_cast.hpp>
- #include <boost/format.hpp>
- 
-#include <boost/signals.hpp>
- #include <boost/date_time/posix_time/posix_time.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/algorithm/string/join.hpp>
- 
- #include <core/Error.hpp>
-+#include <core/BoostSignals.hpp>
- #include <core/BoostThread.hpp>
- #include <core/ConfigUtils.hpp>
- #include <core/FilePath.hpp>
--- rstudio-1.1.463-orig/src/cpp/session/SessionModuleContext.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/SessionModuleContext.cpp	2018-11-17 21:24:35.289976322 +1100
-@@ -19,10 +19,10 @@
- 
- #include <boost/assert.hpp>
- #include <boost/utility.hpp>
-#include <boost/signal.hpp>
- #include <boost/format.hpp>
- #include <boost/numeric/conversion/cast.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/BoostThread.hpp>
- #include <core/Error.hpp>
- #include <core/FilePath.hpp>
-@@ -586,13 +586,13 @@
-    
-    int nextGroup_; 
-    
-   boost::signal<void(const r::session::RSuspendOptions&,Settings*),
-                 boost::last_value<void>,
-+   RSTUDIO_BOOST_SIGNAL<void(const r::session::RSuspendOptions&,Settings*),
-+                 RSTUDIO_BOOST_LAST_VALUE<void>,
-                  int,
-                  std::less<int> > suspendSignal_;
-                   
-   boost::signal<void(const Settings&),
-                 boost::last_value<void>,
-+   RSTUDIO_BOOST_SIGNAL<void(const Settings&),
-+                 RSTUDIO_BOOST_LAST_VALUE<void>,
-                  int,
-                  std::greater<int> > resumeSignal_;
- };
--- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionConsoleProcess.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/include/session/SessionConsoleProcess.hpp	2018-11-17 21:24:35.290976332 +1100
-@@ -20,10 +20,10 @@
- #include <deque>
- 
- #include <boost/regex.hpp>
-#include <boost/signals.hpp>
- #include <boost/circular_buffer.hpp>
- #include <boost/enable_shared_from_this.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/system/Process.hpp>
- #include <core/terminal/PrivateCommand.hpp>
- 
-@@ -146,7 +146,7 @@
-    void setPromptHandler(
-          const boost::function<bool(const std::string&, Input*)>& onPrompt);
- 
-   boost::signal<void(int)>& onExit() { return onExit_; }
-+   RSTUDIO_BOOST_SIGNAL<void(int)>& onExit() { return onExit_; }
- 
-    std::string handle() const { return procInfo_->getHandle(); }
-    InteractionMode interactionMode() const { return procInfo_->getInteractionMode(); }
-@@ -264,7 +264,7 @@
-    boost::mutex inputOutputQueueMutex_;
- 
-    boost::function<bool(const std::string&, Input*)> onPrompt_;
-   boost::signal<void(int)> onExit_;
-+   RSTUDIO_BOOST_SIGNAL<void(int)> onExit_;
- 
-    // regex for prompt detection
-    boost::regex controlCharsPattern_;
--- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionModuleContext.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/include/session/SessionModuleContext.hpp	2018-11-17 21:28:25.019212857 +1100
-@@ -21,9 +21,9 @@
- 
- #include <boost/utility.hpp>
- #include <boost/function.hpp>
-#include <boost/signals.hpp>
- #include <boost/shared_ptr.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/HtmlUtils.hpp>
- #include <core/system/System.hpp>
- #include <core/system/ShellUtils.hpp>
-@@ -315,35 +315,35 @@
- // session events
- struct Events : boost::noncopyable
- {
-   boost::signal<void (core::json::Object*)> onSessionInfo;
-   boost::signal<void ()>                    onClientInit;
-   boost::signal<void ()>                    onBeforeExecute;
-   boost::signal<void(const std::string&)>   onConsolePrompt;
-   boost::signal<void(const std::string&)>   onConsoleInput;
-   boost::signal<void(const std::string&, const std::string&)>  
-+   RSTUDIO_BOOST_SIGNAL<void (core::json::Object*)> onSessionInfo;
-+   RSTUDIO_BOOST_SIGNAL<void ()>                    onClientInit;
-+   RSTUDIO_BOOST_SIGNAL<void ()>                    onBeforeExecute;
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&)>   onConsolePrompt;
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&)>   onConsoleInput;
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&)>  
-                                              onActiveConsoleChanged;
-   boost::signal<void (ConsoleOutputType, const std::string&)>
-+   RSTUDIO_BOOST_SIGNAL<void (ConsoleOutputType, const std::string&)>
-                                              onConsoleOutput;
-   boost::signal<void()>                     onUserInterrupt;
-   boost::signal<void (ChangeSource)>        onDetectChanges;
-   boost::signal<void (core::FilePath)>      onSourceEditorFileSaved;
-   boost::signal<void(bool)>                 onDeferredInit;
-   boost::signal<void(bool)>                 afterSessionInitHook;
-   boost::signal<void(bool)>                 onBackgroundProcessing;
-   boost::signal<void(bool)>                 onShutdown;
-   boost::signal<void ()>                    onQuit;
-   boost::signal<void ()>                    onDestroyed;
-   boost::signal<void (const std::vector<std::string>&)>
-+   RSTUDIO_BOOST_SIGNAL<void()>                     onUserInterrupt;
-+   RSTUDIO_BOOST_SIGNAL<void (ChangeSource)>        onDetectChanges;
-+   RSTUDIO_BOOST_SIGNAL<void (core::FilePath)>      onSourceEditorFileSaved;
-+   RSTUDIO_BOOST_SIGNAL<void(bool)>                 onDeferredInit;
-+   RSTUDIO_BOOST_SIGNAL<void(bool)>                 afterSessionInitHook;
-+   RSTUDIO_BOOST_SIGNAL<void(bool)>                 onBackgroundProcessing;
-+   RSTUDIO_BOOST_SIGNAL<void(bool)>                 onShutdown;
-+   RSTUDIO_BOOST_SIGNAL<void ()>                    onQuit;
-+   RSTUDIO_BOOST_SIGNAL<void ()>                    onDestroyed;
-+   RSTUDIO_BOOST_SIGNAL<void (const std::vector<std::string>&)>
-                                              onLibPathsChanged;
-   boost::signal<void (const std::string&)>  onPackageLoaded;
-   boost::signal<void ()>                    onPackageLibraryMutated;
-   boost::signal<void ()>                    onPreferencesSaved;
-   boost::signal<void (const core::DistributedEvent&)>
-+   RSTUDIO_BOOST_SIGNAL<void (const std::string&)>  onPackageLoaded;
-+   RSTUDIO_BOOST_SIGNAL<void ()>                    onPackageLibraryMutated;
-+   RSTUDIO_BOOST_SIGNAL<void ()>                    onPreferencesSaved;
-+   RSTUDIO_BOOST_SIGNAL<void (const core::DistributedEvent&)>
-                                              onDistributedEvent;
-   boost::signal<void (core::FilePath)>      onPermissionsChanged;
-+   RSTUDIO_BOOST_SIGNAL<void (core::FilePath)>      onPermissionsChanged;
- 
-    // signal for detecting extended type of documents
-   boost::signal<std::string(boost::shared_ptr<source_database::SourceDocument>),
-+   RSTUDIO_BOOST_SIGNAL<std::string(boost::shared_ptr<source_database::SourceDocument>),
-                  firstNonEmpty<std::string> > onDetectSourceExtendedType;
- };
- 
--- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionSourceDatabase.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/include/session/SessionSourceDatabase.hpp	2018-11-17 21:24:35.291976342 +1100
-@@ -21,8 +21,8 @@
- 
- #include <boost/utility.hpp>
- #include <boost/shared_ptr.hpp>
-#include <boost/signals.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/FilePath.hpp>
- #include <core/json/Json.hpp>
- 
-@@ -204,14 +204,14 @@
- // source database events
- struct Events : boost::noncopyable
- {
-   boost::signal<void(boost::shared_ptr<SourceDocument>)>      onDocUpdated;
-   boost::signal<void(const std::string&,
-+   RSTUDIO_BOOST_SIGNAL<void(boost::shared_ptr<SourceDocument>)>      onDocUpdated;
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&,
-                       boost::shared_ptr<SourceDocument>)>      onDocRenamed;
-   boost::signal<void(const std::string&)>                     onDocAdded;
-   boost::signal<void(
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&)>                     onDocAdded;
-+   RSTUDIO_BOOST_SIGNAL<void(
-       boost::shared_ptr<source_database::SourceDocument>)>     onDocPendingRemove;
-   boost::signal<void(const std::string&, const std::string&)> onDocRemoved;
-   boost::signal<void()>                                       onRemoveAll;
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&)> onDocRemoved;
-+   RSTUDIO_BOOST_SIGNAL<void()>                                       onRemoveAll;
- };
- 
- Events& events();
--- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionUserSettings.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/include/session/SessionUserSettings.hpp	2018-11-17 21:24:35.291976342 +1100
-@@ -20,8 +20,8 @@
- 
- #include <boost/utility.hpp>
- #include <boost/scoped_ptr.hpp>
-#include <boost/signal.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/Settings.hpp>
- #include <core/FilePath.hpp>
- #include <core/StringUtils.hpp>
-@@ -62,7 +62,7 @@
-    friend UserSettings& userSettings();
- 
- public:
-   boost::signal<void()> onChanged;
-+   RSTUDIO_BOOST_SIGNAL<void()> onChanged;
- 
- public:
-    // COPYING: boost::noncopyable
--- rstudio-1.1.463-orig/src/cpp/session/include/session/projects/SessionProjects.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/include/session/projects/SessionProjects.hpp	2018-11-17 21:24:35.291976342 +1100
-@@ -22,8 +22,8 @@
- #include <boost/utility.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/foreach.hpp>
-#include <boost/signals.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/FileInfo.hpp>
- #include <core/FilePath.hpp>
- #include <core/Settings.hpp>
-@@ -220,10 +220,10 @@
- 
-    bool hasFileMonitor_;
-    std::vector<std::string> monitorSubscribers_;
-   boost::signal<void(const tree<core::FileInfo>&)> onMonitoringEnabled_;
-   boost::signal<void(const std::vector<core::system::FileChangeEvent>&)>
-+   RSTUDIO_BOOST_SIGNAL<void(const tree<core::FileInfo>&)> onMonitoringEnabled_;
-+   RSTUDIO_BOOST_SIGNAL<void(const std::vector<core::system::FileChangeEvent>&)>
-                                                             onFilesChanged_;
-   boost::signal<void()> onMonitoringDisabled_;
-+   RSTUDIO_BOOST_SIGNAL<void()> onMonitoringDisabled_;
- };
- 
- ProjectContext& projectContext();
--- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/SessionPlots.hpp	2018-11-17 21:24:35.292976352 +1100
-@@ -16,7 +16,7 @@
- #ifndef SESSION_PLOTS_HPP
- #define SESSION_PLOTS_HPP
- 
-#include <boost/signals.hpp>
-+#include <core/BoostSignals.hpp>
- 
- namespace rstudio {
- namespace core {
-@@ -35,9 +35,9 @@
- 
- struct Events : boost::noncopyable
- {
-   boost::signal<void()> onBeforeNewPlot;
-   boost::signal<void()> onBeforeNewGridPage;
-   boost::signal<void()> onNewPlot;
-+   RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewPlot;
-+   RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewGridPage;
-+   RSTUDIO_BOOST_SIGNAL<void()> onNewPlot;
- };
- 
- Events& events();
--- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/build/SessionSourceCpp.cpp	2018-11-17 21:24:35.293976361 +1100
-@@ -15,11 +15,11 @@
- 
- #include "SessionSourceCpp.hpp"
- 
-#include <boost/signal.hpp>
- #include <boost/algorithm/string/trim.hpp>
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/algorithm/string/join.hpp>
- 
-+#include <core/BoostSignals.hpp>
- #include <core/Error.hpp>
- #include <core/FilePath.hpp>
- #include <core/StringUtils.hpp>
--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp	2018-11-17 21:24:35.294976371 +1100
-@@ -142,7 +142,7 @@
-       LOG_ERROR(error);
-    
-    // capture console output, error
-   boost::signals::scoped_connection consoleHandler =
-+   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
-          module_context::events().onConsoleOutput.connect(
-             boost::bind(chunkConsoleOutputHandler,
-                         _1,
-@@ -219,7 +219,7 @@
-       LOG_ERROR(error);
-    
-    // capture console output, error
-   boost::signals::scoped_connection consoleHandler =
-+   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
-          module_context::events().onConsoleOutput.connect(
-             boost::bind(chunkConsoleOutputHandler,
-                         _1,
-@@ -363,7 +363,7 @@
-       LOG_ERROR(error);
-    
-    // capture console output, error
-   boost::signals::scoped_connection consoleHandler =
-+   RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
-          module_context::events().onConsoleOutput.connect(
-             boost::bind(chunkConsoleOutputHandler,
-                         _1,
--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/rmarkdown/NotebookCapture.cpp	2018-11-17 21:24:35.294976371 +1100
-@@ -16,6 +16,8 @@
- #include "SessionRmdNotebook.hpp"
- #include "NotebookCapture.hpp"
- 
-+#include <boost/make_shared.hpp>
-+
- namespace rstudio {
- namespace session {
- namespace modules {
--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/rmarkdown/NotebookExec.cpp	2018-11-17 21:24:35.295976381 +1100
-@@ -441,7 +441,7 @@
-    }
- 
-    // unhook all our event handlers
-   BOOST_FOREACH(const boost::signals::connection connection, connections_) 
-+   BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_) 
-    {
-       connection.disconnect();
-    }
--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/rmarkdown/NotebookExec.hpp	2018-11-17 21:24:35.295976381 +1100
-@@ -18,8 +18,7 @@
- 
- #include <session/SessionModuleContext.hpp>
- 
-#include <boost/signal.hpp>
-
-+#include <core/BoostSignals.hpp>
- #include <core/json/Json.hpp>
- 
- #include <r/RSexp.hpp>
-@@ -99,7 +98,7 @@
-    bool hasErrors_;
- 
-    std::vector<boost::shared_ptr<NotebookCapture> > captures_;
-   std::vector<boost::signals::connection> connections_;
-+   std::vector<RSTUDIO_BOOST_CONNECTION> connections_;
- };
- 
- } // namespace notebook
--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/rmarkdown/NotebookPlots.cpp	2018-11-17 21:24:35.295976381 +1100
-@@ -20,11 +20,12 @@
- 
- #include <boost/format.hpp>
- #include <boost/foreach.hpp>
-#include <boost/signals/connection.hpp>
- 
-#include <core/system/FileMonitor.hpp>
-#include <core/StringUtils.hpp>
-+#include <core/BoostSignals.hpp>
- #include <core/Exec.hpp>
-+#include <core/StringUtils.hpp>
-+
-+#include <core/system/FileMonitor.hpp>
- 
- #include <session/SessionModuleContext.hpp>
- 
--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/rmarkdown/NotebookPlots.hpp	2018-11-17 21:24:35.296976391 +1100
-@@ -18,8 +18,10 @@
- #define SESSION_NOTEBOOK_PLOTS_HPP
- 
- #include <boost/function.hpp>
-#include <boost/signals/connection.hpp>
-+
-+#include <core/BoostSignals.hpp>
- #include <core/FilePath.hpp>
-+
- #include <r/RSexp.hpp>
- 
- #include "NotebookCapture.hpp"
-@@ -80,9 +82,9 @@
- 
-    unsigned lastOrdinal_;
- 
-   boost::signals::connection onBeforeNewPlot_;
-   boost::signals::connection onBeforeNewGridPage_;
-   boost::signals::connection onNewPlot_;
-+   RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_;
-+   RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_;
-+   RSTUDIO_BOOST_CONNECTION onNewPlot_;
- 
-    double width_;
-    double height_;
--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/rmarkdown/NotebookQueue.cpp	2018-11-17 21:24:35.296976391 +1100
-@@ -87,7 +87,7 @@
-       pInput_->enque(kThreadQuitCommand);
- 
-       // unregister handlers
-      BOOST_FOREACH(boost::signals::connection connection, handlers_)
-+      BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_)
-       {
-          connection.disconnect();
-       }
-@@ -651,7 +651,7 @@
-    boost::shared_ptr<ChunkExecContext> execContext_;
- 
-    // registered signal handlers
-   std::vector<boost::signals::connection> handlers_;
-+   std::vector<RSTUDIO_BOOST_CONNECTION> handlers_;
- 
-    // the thread which submits console input, and the queue which feeds it
-    boost::thread console_;
--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp	2018-11-17 21:24:35.296976391 +1100
-@@ -18,7 +18,8 @@
- #define SESSION_RMARKDOWN_NOTEBOOK_HPP
- 
- #include <ctime>
-#include <boost/signals.hpp>
-+
-+#include <core/BoostSignals.hpp>
- #include <core/json/Json.hpp>
- 
- #define kChunkLibDir "lib"
-@@ -76,24 +77,24 @@
- struct Events : boost::noncopyable
- {
-    // Document {0}, chunk {1} from context id {3} execution completed
-   boost::signal<void(const std::string&, const std::string&,
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&,
-                       const std::string&)> 
-                 onChunkExecCompleted;
- 
-    // Document {0}, chunk {1} had console output of type {2} and text {3}
-   boost::signal<void(const std::string&, const std::string&, int, 
-+   RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, int, 
-                 const std::string&)>
-                 onChunkConsoleOutput;
- 
-   boost::signal<void(const core::FilePath&, const core::FilePath&, 
-+   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&, 
-                       const core::json::Value& metadata, unsigned ordinal)> 
-                          onPlotOutput;
-   boost::signal<void(const core::FilePath&, const core::FilePath&,
-+   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
-                       const core::json::Value& metadata)> onHtmlOutput;
-   boost::signal<void(const core::json::Object&)> onErrorOutput;
-   boost::signal<void(const core::FilePath&, const core::FilePath&,
-+   RSTUDIO_BOOST_SIGNAL<void(const core::json::Object&)> onErrorOutput;
-+   RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
-                       const core::json::Value& metadata)> onDataOutput;
-   boost::signal<void(Condition condition, const std::string& message)> 
-+   RSTUDIO_BOOST_SIGNAL<void(Condition condition, const std::string& message)> 
-                          onCondition;
- };
- 
--- a/srcpkgs/rstudio/patches/rstudio-1.1.463-boost-1.69.0_p2.patch
+++ b/srcpkgs/rstudio/patches/rstudio-1.1.463-boost-1.69.0_p2.patch
@ -1,167 +0,0 @@
--- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt	2018-11-17 21:24:35.285976284 +1100
-+++ src/cpp/CMakeLists.txt	2018-11-17 21:41:02.712507842 +1100
-@@ -175,6 +175,9 @@
-       set(Boost_USE_STATIC_LIBS ON)
-       set(BOOST_INCLUDEDIR  ${RSTUDIO_TOOLS_BOOST}/include)
-       find_package(Boost ${BOOST_VERSION} REQUIRED)
-+      if(NOT Boost_VERSION VERSION_LESS 1.69.0)
-+         list(REMOVE_ITEM BOOST_LIBS signals)
-+      endif()
- 
-       # define library list manually (find_package doesn't always pick them up)
-       set(BOOST_LIB_DIR ${RSTUDIO_TOOLS_BOOST}/lib)
-@@ -184,11 +187,15 @@
-       message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}")
-    else()
-       add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost)
-+      find_package(Boost ${BOOST_VERSION} REQUIRED)
-+      if(NOT Boost_VERSION VERSION_LESS 1.69.0)
-+         list(REMOVE_ITEM BOOST_LIBS signals)
-+      endif()
-       find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS})
-       message(STATUS "Using system Boost ${BOOST_VERSION}")
-    endif()
- 
-   # WIN32 BOOST
-+# WIN32 BOOST
- else()
-    # hard-code to our own prebuilt boost libs
-    add_definitions(-DRSTUDIO_BOOST_NAMESPACE=rstudio_boost)
-@@ -211,14 +218,14 @@
- # allow opt-in to using Boost.Signals2
- # TODO: remove this in RStudio v1.3 and port to signals2
- if(NOT RSTUDIO_BOOST_SIGNALS_VERSION)
-   if (BOOST_VERSION VERSION_LESS 1.69.0)
-+   if (Boost_VERSION VERSION_LESS 1.69.0)
-       set(RSTUDIO_BOOST_SIGNALS_VERSION 1)
-    else()
-       set(RSTUDIO_BOOST_SIGNALS_VERSION 2)
-    endif()
- endif()
- 
-message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
-+message(STATUS "Using Boost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
- add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION})
- 
- # add boost as system include directory
--- rstudio-1.1.463-orig/src/cpp/core/include/core/r_util/RFunctionInformation.hpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/core/include/core/r_util/RFunctionInformation.hpp	2018-11-17 21:41:02.713507852 +1100
-@@ -75,9 +75,9 @@
-    const std::string& name() const { return name_; }
-    const boost::optional<std::string>& defaultValue() const { return defaultValue_; }
-    boost::tribool hasDefault() const { return hasDefault_; }
-   bool isUsed() const { return isUsed_; }
-+   bool isUsed() const { return bool(isUsed_); }
-    void setIsUsed(bool value) { isUsed_ = value; }
-   bool isMissingnessHandled() const { return isMissingnessHandled_; }
-+   bool isMissingnessHandled() const { return bool(isMissingnessHandled_); }
-    void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; }
-    
- private:
-@@ -130,7 +130,7 @@
-    
-    bool isPrimitive()
-    {
-      return isPrimitive_ == true;
-+      return bool(isPrimitive_);
-    }
-    
-    void setIsPrimitive(bool isPrimitive)
--- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/session/modules/SessionRParser.cpp	2018-11-17 21:41:02.714507862 +1100
-@@ -390,7 +390,7 @@
-    if (!failed)
-    {
-       DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding());
-      return fnInfo.performsNse();
-+      return bool(fnInfo.performsNse());
-    }
-    
-    // Handle some special cases first.
--- rstudio-1.1.463-orig/src/tools/clang-ubsan-build	2018-10-25 09:42:55.000000000 +1100
-+++ src/tools/clang-ubsan-build	2018-11-17 21:41:02.714507862 +1100
-@@ -10,19 +10,19 @@
- 
- : ${RSTUDIO_USE_LIBCXX="Yes"}
- : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
-: ${RSTUDIO_BOOST_VERSION="1.56.0"}
-+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.56.0"}
- 
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
-cmake ../cpp                                                 \
-    -DLIBR_HOME="${R_HOME}"                                  \
-    -DCMAKE_C_COMPILER="${CC}"                               \
-    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                \
-    -DCMAKE_CXX_COMPILER="${CXX}"                            \
-    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"              \
-    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"             \
-    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
-    -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}"       \
-+cmake ../cpp                                                               \
-+    -DLIBR_HOME="${R_HOME}"                                                \
-+    -DCMAKE_C_COMPILER="${CC}"                                             \
-+    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                              \
-+    -DCMAKE_CXX_COMPILER="${CXX}"                                          \
-+    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"                            \
-+    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"                           \
-+    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}"               \
-+    -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
-     "$@"
- cd ..
- 
--- rstudio-1.1.463-orig/src/tools/gcc-ubsan-build	2018-10-25 09:42:55.000000000 +1100
-+++ src/tools/gcc-ubsan-build	2018-11-17 21:41:02.715507871 +1100
-@@ -19,19 +19,19 @@
- # NOTE: Boost 1.50.0 not compatible with gcc-6
- : ${RSTUDIO_USE_LIBCXX="No"}
- : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
-: ${RSTUDIO_BOOST_VERSION="1.54.0"}
-+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.54.0"}
- 
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
-cmake ../cpp                                                 \
-    -DLIBR_HOME="${R_HOME}"                                  \
-    -DCMAKE_C_COMPILER="${CC}"                               \
-    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                \
-    -DCMAKE_CXX_COMPILER="${CXX}"                            \
-    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"              \
-    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"             \
-    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
-    -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}"       \
-+cmake ../cpp                                                               \
-+    -DLIBR_HOME="${R_HOME}"                                                \
-+    -DCMAKE_C_COMPILER="${CC}"                                             \
-+    -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}"                              \
-+    -DCMAKE_CXX_COMPILER="${CXX}"                                          \
-+    -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}"                            \
-+    -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}"                           \
-+    -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}"               \
-+    -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
-     "$@"
- cd ..
- 
--- rstudio-1.1.463-orig/src/tools/xcode-ubsan-build	2018-10-25 09:42:55.000000000 +1100
-+++ src/tools/xcode-ubsan-build	2018-11-17 21:41:02.715507871 +1100
-@@ -15,13 +15,13 @@
- # sanitizers released with newer versions of clang)
- mkdir -p "${BUILD_DIR}"
- cd "${BUILD_DIR}"
-cmake ../cpp -GXcode                 \
-    -DLIBR_HOME="${R_HOME}"          \
-    -DLIBR_INCLUDE_DIRS="${R_INCL}"  \
-    -DLIBR_DOC_DIR="${R_DOCS}"       \
-    -DRSTUDIO_USE_LIBCXX="Yes"       \
-    -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
-    -DRSTUDIO_BOOST_VERSION="1.56.0" \
-+cmake ../cpp -GXcode                           \
-+    -DLIBR_HOME="${R_HOME}"                    \
-+    -DLIBR_INCLUDE_DIRS="${R_INCL}"            \
-+    -DLIBR_DOC_DIR="${R_DOCS}"                 \
-+    -DRSTUDIO_USE_LIBCXX="Yes"                 \
-+    -DRSTUDIO_USE_SYSTEM_BOOST="Yes"           \
-+    -DRSTUDIO_BOOST_REQUESTED_VERSION="1.56.0" \
-     "$@"
- cmake ../cpp -DLIBR_LIBRARIES="${R_LIBS}/libR.dylib"
- cd ..
--- a/srcpkgs/rstudio/patches/rstudio-1.1.463-fix-ptr-int-compare.patch
+++ b/srcpkgs/rstudio/patches/rstudio-1.1.463-fix-ptr-int-compare.patch
@ -1,13 +0,0 @@
--- rstudio-1.1.463-orig/src/cpp/server/ServerSecureKeyFile.cpp	2018-10-25 09:42:55.000000000 +1100
-+++ src/cpp/server/ServerSecureKeyFile.cpp	2018-11-17 22:17:18.110012955 +1100
-@@ -79,8 +79,8 @@
-          return error;
- 
-       // change mode it so it is only readable and writeable by this user
-      if (changeFileMode(secureKeyPath,
-                         core::system::UserReadWriteMode) < 0)
-+      if (!!changeFileMode(secureKeyPath,
-+                           core::system::UserReadWriteMode))
-       {
-          return systemError(errno, ERROR_LOCATION);
-       }
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@ -1,6 +1,6 @@
 # Template file for 'rstudio'
 pkgname=rstudio
-version=1.1.463
+version=1.2.1335
 revision=1
 archs="i686 x86_64"
 build_style=cmake
@ -16,38 +16,35 @@ makedepends="R zlib-devel libuuid-devel libressl-devel pam-devel
 boost-devel pango-devel mathjax hunspell-devel pandoc
 openjdk apache-ant
 qt5-devel qt5-qmake qt5-webkit-devel qt5-declarative-devel qt5-location-devel
- qt5-sensors-devel qt5-svg-devel qt5-xmlpatterns-devel qt5-webchannel-devel"
+ qt5-sensors-devel qt5-svg-devel qt5-xmlpatterns-devel qt5-webchannel-devel
+ qt5-webengine-devel"
 depends="R"
 short_desc="Integrated development environment (IDE) for R"
 maintainer="ivierlin <github@ivierlin.de>"
 license="AGPL-3.0-only"
 homepage="https://www.rstudio.com"
 _aws="https://s3.amazonaws.com"
-_gin_version="1.5"
-_gwt_version="2.7.0"
-_junit_version="4.9b3"
+_gin_version="2.1.2"
+_gwt_version="2.8.1"
 _selenium_version="2.37.0"
 _chromedriver_version="2.7"
 distfiles="https://github.com/rstudio/rstudio/archive/v${version}.tar.gz
 ${_aws}/rstudio-dictionaries/core-dictionaries.zip
 ${_aws}/rstudio-buildtools/gin-${_gin_version}.zip
 ${_aws}/rstudio-buildtools/gwt-${_gwt_version}.zip
- ${_aws}/rstudio-buildtools/junit-${_junit_version}.jar
 ${_aws}/rstudio-buildtools/selenium-java-${_selenium_version}.zip
 ${_aws}/rstudio-buildtools/selenium-server-standalone-${_selenium_version}.jar
 ${_aws}/rstudio-buildtools/chromedriver-linux"
-checksum="57be651509ff2542a1dabccb70584ecf6b35fb20f97618091c181d4982667cdd
+checksum="f124fbae68762d0a1fc9a7dc72ad290aebde768e262df87acda3883a07fdfd58
 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
- f561f4eb5d5fe1cff95c881e6aed53a86e9f0de8a52863295a8600375f96ab94
- aa65061b73836190410720bea422eb8e787680d7bc0c2b244ae6c9a0d24747b3
- dc566c3f5da446defe36c534f7ee19cdfe7e565020038b2ef38f01bc9c070551
+ b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
+ 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7
 0eebba65d8edb01c1f46e462907c58f5d6e1cb0ddf63660a9985c8432bdffbb7
 97bc8c699037fb6e99ba7af570fb60dbb1b7ce30cde2448287a44ef65b13023e
 1ff3e9fc17e456571c440ab160f25ee451b2a4d36e61c8e297737cff7433f48c"
 skip_extraction="core-dictionaries.zip
 gin.zip
 gwt-${_gwt_version}.zip
- junit-${_junit_version}.jar
 selenium-java-${_selenium_version}.zip
 selenium-server-standalone-${_selenium_version}.jar
 chromedriver-linux"
@ -64,7 +61,6 @@ post_extract() {
 	unzip -qd src/gwt/lib ${_srcdir}/selenium-java-${_selenium_version}.zip
 	mv src/gwt/lib/selenium-${_selenium_version} src/gwt/lib/selenium/${_selenium_version}

-	cp ${_srcdir}/junit-${_junit_version}.jar src/gwt/lib
 	cp ${_srcdir}/selenium-server-standalone-${_selenium_version}.jar src/gwt/lib/selenium/${_selenium_version}
 	cp ${_srcdir}/chromedriver-linux src/gwt/lib/selenium/chromedriver/${_chromedriver_version}