From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- .../files/rstudio-1.1.463-boost-1.69.0_p1.patch | 222 +----------- .../files/rstudio-1.1.463-boost-1.69.0_p2.patch | 377 ++++++++++++--------- .../files/rstudio-1.1.463-boost-1.69.0_p3.patch | 167 +++++++++ .../files/rstudio-1.1.463-boost-1.70.0.patch | 46 +++ .../files/rstudio-1.2.1335-boost-1.70.0_p1.patch | 46 +++ .../files/rstudio-1.2.1335-boost-1.70.0_p2.patch | 17 + .../rstudio/files/rstudio-1.2.1335-core.patch | 160 +++++++++ .../rstudio-1.2.1335-fix-ptr-int-compare.patch | 13 + .../files/rstudio-1.2.1335-linker_flags.patch | 11 + .../rstudio/files/rstudio-1.2.1335-pandoc.patch | 32 ++ .../rstudio/files/rstudio-1.2.1335-paths.patch | 118 +++++++ .../rstudio/files/rstudio-1.2.1335-prefs.patch | 53 +++ .../rstudio-1.2.1335-qtsingleapplication.patch | 60 ++++ 13 files changed, 939 insertions(+), 383 deletions(-) create mode 100644 sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch create mode 100644 sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch (limited to 'sci-mathematics/rstudio/files') diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch index aa3db25f3c01..a7a48572de30 100644 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch +++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch @@ -1,4 +1,4 @@ ---- /dev/null 2018-11-10 15:32:26.332997437 +1100 +--- /dev/null 2019-03-19 11:03:33.121000004 +1100 +++ rstudio-1.1.463/src/cpp/core/include/core/BoostSignals.hpp 2018-11-17 21:24:35.285976284 +1100 @@ -0,0 +1,40 @@ +/* @@ -458,223 +458,3 @@ }; ProjectContext& projectContext(); ---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/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 -+#include - - namespace rstudio { - namespace core { -@@ -35,9 +35,9 @@ - - struct Events : boost::noncopyable - { -- boost::signal onBeforeNewPlot; -- boost::signal onBeforeNewGridPage; -- boost::signal onNewPlot; -+ RSTUDIO_BOOST_SIGNAL onBeforeNewPlot; -+ RSTUDIO_BOOST_SIGNAL onBeforeNewGridPage; -+ RSTUDIO_BOOST_SIGNAL onNewPlot; - }; - - Events& events(); ---- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-11-17 21:24:35.293976361 +1100 -@@ -15,11 +15,11 @@ - - #include "SessionSourceCpp.hpp" - --#include - #include - #include - #include - -+#include - #include - #include - #include ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+ - 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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-11-17 21:24:35.295976381 +1100 -@@ -18,8 +18,7 @@ - - #include - --#include -- -+#include - #include - - #include -@@ -99,7 +98,7 @@ - bool hasErrors_; - - std::vector > captures_; -- std::vector connections_; -+ std::vector connections_; - }; - - } // namespace notebook ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-11-17 21:24:35.295976381 +1100 -@@ -20,11 +20,12 @@ - - #include - #include --#include - --#include --#include -+#include - #include -+#include -+ -+#include - - #include - ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/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 --#include -+ -+#include - #include -+ - #include - - #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 -+++ rstudio-1.1.463/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 execContext_; - - // registered signal handlers -- std::vector handlers_; -+ std::vector 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 -+++ rstudio-1.1.463/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 --#include -+ -+#include - #include - - #define kChunkLibDir "lib" -@@ -76,24 +77,24 @@ - struct Events : boost::noncopyable - { - // Document {0}, chunk {1} from context id {3} execution completed -- boost::signal - onChunkExecCompleted; - - // Document {0}, chunk {1} had console output of type {2} and text {3} -- boost::signal - onChunkConsoleOutput; - -- boost::signal - onPlotOutput; -- boost::signal onHtmlOutput; -- boost::signal onErrorOutput; -- boost::signal onErrorOutput; -+ RSTUDIO_BOOST_SIGNAL onDataOutput; -- boost::signal -+ RSTUDIO_BOOST_SIGNAL - onCondition; - }; - diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch index 961723fd224f..d90ce005a1a0 100644 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch +++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch @@ -1,167 +1,220 @@ ---- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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& 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; } +--- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/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 ++#include + + namespace rstudio { + namespace core { +@@ -35,9 +35,9 @@ + + struct Events : boost::noncopyable + { +- boost::signal onBeforeNewPlot; +- boost::signal onBeforeNewGridPage; +- boost::signal onNewPlot; ++ RSTUDIO_BOOST_SIGNAL onBeforeNewPlot; ++ RSTUDIO_BOOST_SIGNAL onBeforeNewGridPage; ++ RSTUDIO_BOOST_SIGNAL onNewPlot; + }; + + Events& events(); +--- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-11-17 21:24:35.293976361 +1100 +@@ -15,11 +15,11 @@ + + #include "SessionSourceCpp.hpp" + +-#include + #include + #include + #include + ++#include + #include + #include + #include +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-11-17 21:24:35.294976371 +1100 +@@ -142,7 +142,7 @@ + LOG_ERROR(error); - private: -@@ -130,7 +130,7 @@ + // 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); - bool isPrimitive() - { -- return isPrimitive_ == true; -+ return bool(isPrimitive_); - } + // 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); - void setIsPrimitive(bool isPrimitive) ---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/src/cpp/session/modules/SessionRParser.cpp 2018-11-17 21:41:02.714507862 +1100 -@@ -390,7 +390,7 @@ - if (!failed) + // 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 ++++ rstudio-1.1.463/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 ++ + 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 ++++ rstudio-1.1.463/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_) { - DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding()); -- return fnInfo.performsNse(); -+ return bool(fnInfo.performsNse()); + connection.disconnect(); } - - // Handle some special cases first. ---- rstudio-1.1.463-orig/src/tools/clang-ubsan-build 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 .. +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-11-17 21:24:35.295976381 +1100 +@@ -18,8 +18,7 @@ + + #include + +-#include +- ++#include + #include + + #include +@@ -99,7 +98,7 @@ + bool hasErrors_; + + std::vector > captures_; +- std::vector connections_; ++ std::vector connections_; + }; + + } // namespace notebook +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-11-17 21:24:35.295976381 +1100 +@@ -20,11 +20,12 @@ + + #include + #include +-#include + +-#include +-#include ++#include + #include ++#include ++ ++#include + + #include + +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/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 +-#include ++ ++#include + #include ++ + #include + + #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 ++++ rstudio-1.1.463/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 execContext_; + + // registered signal handlers +- std::vector handlers_; ++ std::vector 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 ++++ rstudio-1.1.463/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 +-#include ++ ++#include + #include + + #define kChunkLibDir "lib" +@@ -76,24 +77,24 @@ + struct Events : boost::noncopyable + { + // Document {0}, chunk {1} from context id {3} execution completed +- boost::signal + onChunkExecCompleted; + + // Document {0}, chunk {1} had console output of type {2} and text {3} +- boost::signal + onChunkConsoleOutput; + +- boost::signal + onPlotOutput; +- boost::signal onHtmlOutput; +- boost::signal onErrorOutput; +- boost::signal onErrorOutput; ++ RSTUDIO_BOOST_SIGNAL onDataOutput; +- boost::signal ++ RSTUDIO_BOOST_SIGNAL + onCondition; + }; + diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch new file mode 100644 index 000000000000..961723fd224f --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch @@ -0,0 +1,167 @@ +--- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100 ++++ rstudio-1.1.463/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 ++++ rstudio-1.1.463/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& 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 ++++ rstudio-1.1.463/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 ++++ rstudio-1.1.463/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 ++++ rstudio-1.1.463/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 ++++ rstudio-1.1.463/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 .. diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch new file mode 100644 index 000000000000..320b823355a3 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch @@ -0,0 +1,46 @@ +--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-30 20:14:40.634057634 +1100 +@@ -296,7 +296,11 @@ + */ + timer_ptr set_timer(long duration, timer_handler callback) { + timer_ptr new_timer = lib::make_shared( ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 ++ *m_io_service, ++#else + lib::ref(*m_io_service), ++#endif + boost::posix_time::milliseconds(duration) + ); + +--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-30 20:14:36.319021594 +1100 +@@ -184,7 +184,12 @@ + m_io_service = ptr; + m_external_io_service = true; + m_acceptor = lib::make_shared( +- lib::ref(*m_io_service)); ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 ++ *m_io_service ++#else ++ lib::ref(*m_io_service) ++#endif ++ ); + + m_state = READY; + ec = lib::error_code(); +--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2018-10-25 09:42:55.000000000 +1100 ++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-30 20:15:22.353406097 +1100 +@@ -167,7 +167,12 @@ + } + + m_socket = lib::make_shared( +- lib::ref(*service)); ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 ++ *service ++#else ++ lib::ref(*service) ++#endif ++ ); + + m_state = READY; + diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch new file mode 100644 index 000000000000..1ec458bb8698 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch @@ -0,0 +1,46 @@ +--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-08-20 22:38:53.808923305 +1000 +@@ -296,7 +296,11 @@ + */ + timer_ptr set_timer(long duration, timer_handler callback) { + timer_ptr new_timer = lib::make_shared( ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 ++ *m_io_service, ++#else + lib::ref(*m_io_service), ++#endif + boost::posix_time::milliseconds(duration) + ); + +--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-08-20 22:38:53.822923358 +1000 +@@ -184,7 +184,12 @@ + m_io_service = ptr; + m_external_io_service = true; + m_acceptor = lib::make_shared( +- lib::ref(*m_io_service)); ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 ++ *m_io_service ++#else ++ lib::ref(*m_io_service) ++#endif ++ ); + + m_state = READY; + ec = lib::error_code(); +--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-08-20 22:38:53.823923362 +1000 +@@ -167,7 +167,12 @@ + } + + m_socket = lib::make_shared( +- lib::ref(*service)); ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 ++ *service ++#else ++ lib::ref(*service) ++#endif ++ ); + + m_state = READY; + diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch new file mode 100644 index 000000000000..eed2c5c955cb --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch @@ -0,0 +1,17 @@ +--- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-04-09 22:08:45.331273559 +1000 +@@ -77,7 +77,13 @@ + { + // start a timer that will cancel any outstanding asynchronous operations + // when it elapses if the connection operation has not succeeded +- pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout)); ++ pConnectionTimer_.reset(new boost::asio::deadline_timer( ++#if BOOST_VERSION >= 107000 ++ resolver_.get_executor(), ++#else ++ resolver_.get_io_service(), ++#endif ++ timeout)); + pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout, + TcpIpAsyncConnector::shared_from_this(), + boost::asio::placeholders::error)); diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch new file mode 100644 index 000000000000..2c4374bb8045 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch @@ -0,0 +1,160 @@ +--- rstudio-1.2.1335-orig/src/cpp/session/SessionClientInit.cpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/session/SessionClientInit.cpp 2019-04-09 18:15:37.746363789 +1000 +@@ -87,13 +87,13 @@ + boost::shared_ptr* pCookie) + { + // extract the base URL +- json::JsonRpcRequest request; ++ core::json::JsonRpcRequest request; + Error error = parseJsonRpcRequest(ptrConnection->request().body(), &request); + if (error) + return error; + std::string baseURL; + +- error = json::readParams(request.params, &baseURL); ++ error = core::json::readParams(request.params, &baseURL); + if (error) + return error; + +@@ -161,7 +161,7 @@ + } + + // prepare session info +- json::Object sessionInfo ; ++ core::json::Object sessionInfo ; + sessionInfo["clientId"] = clientId; + sessionInfo["mode"] = options.programMode(); + +@@ -175,8 +175,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(); +@@ -194,12 +194,12 @@ + sessionInfo["prompt"] = rstudio::r::options::getOption("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); +@@ -224,7 +224,7 @@ + if (resumed) + { + // console actions +- json::Object actionsObject; ++ core::json::Object actionsObject; + consoleActions.asJson(&actionsObject); + sessionInfo["console_actions"] = actionsObject; + } +@@ -290,12 +290,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)); +@@ -332,20 +332,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; + } +@@ -353,9 +353,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; + } +@@ -364,7 +364,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(); +@@ -375,7 +375,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"] = +@@ -447,14 +447,14 @@ + + sessionInfo["multi_session"] = options.multiSession(); + +- json::Object rVersionsJson; ++ core::json::Object rVersionsJson; + rVersionsJson["r_version"] = module_context::rVersion(); + rVersionsJson["r_version_label"] = module_context::rVersionLabel(); + 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(); +@@ -491,7 +491,7 @@ + + // create 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); + diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch new file mode 100644 index 000000000000..e38f5e0c4448 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch @@ -0,0 +1,13 @@ +--- rstudio-1.2.1335-orig/src/cpp/server_core/SecureKeyFile.cpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/server_core/SecureKeyFile.cpp 2019-04-09 20:47:57.943317208 +1000 +@@ -68,8 +68,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); + } diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch new file mode 100644 index 000000000000..e07ead68969e --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch @@ -0,0 +1,11 @@ +--- rstudio-1.2.1335-orig/src/cpp/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/CMakeLists.txt 2019-04-09 17:58:59.926559001 +1000 +@@ -117,7 +117,7 @@ + add_definitions(-O0) + add_definitions(-D_GLIBCXX_ASSERTIONS) + endif() +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie -Wl,-z,relro,-z,now") ++ set(CMAKE_EXE_LINKER_FLAGS "-pie -Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}") + endif() + + # other useful gcc diagnostics diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch new file mode 100644 index 000000000000..e2fe83867bcd --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch @@ -0,0 +1,32 @@ +--- rstudio-1.2.1335-orig/src/cpp/session/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/session/CMakeLists.txt 2019-04-09 17:22:59.210201624 +1000 +@@ -25,9 +25,6 @@ + if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") + message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") + endif() +-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") +- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") +-endif() + + # we often install embedded versions of these packages but don't do so currently + +@@ -479,19 +476,6 @@ + install(DIRECTORY "resources/connections" + DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) + +-# install pandoc +-if(WIN32) +- set(PANDOC_VERSION "2.6" CACHE INTERNAL "Pandoc version") +-else() +- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") +-endif() +- +-set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") +-file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") +-install(FILES ${PANDOC_FILES} +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE +- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) +- + # install rmarkdown package + # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") + # install(FILES ${RMARKDOWN_PACKAGE} diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch new file mode 100644 index 000000000000..ba66ef9f0ea1 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch @@ -0,0 +1,118 @@ +--- rstudio-1.2.1335-orig/CMakeGlobals.txt 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/CMakeGlobals.txt 2019-04-09 17:10:07.680657631 +1000 +@@ -161,7 +161,7 @@ + set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources) + else() + set(RSTUDIO_INSTALL_BIN bin) +- set(RSTUDIO_INSTALL_SUPPORTING .) ++ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) + endif() + + # if the install prefix is /usr/local then tweak as appropriate +--- rstudio-1.2.1335-orig/src/cpp/server/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/server/CMakeLists.txt 2019-04-09 16:54:34.740739744 +1000 +@@ -194,7 +194,7 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} +- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) + + # install configured redhat init.d script + set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") +@@ -202,7 +202,7 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} +- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) + + # install configured suse init.d script + set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") +@@ -210,13 +210,13 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} +- DESTINATION ${RSERVER_INITD_SUSE_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) + + # install pam profile + set(RSERVER_PAM_DIR "extras/pam") + set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} +- DESTINATION ${RSERVER_PAM_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) + + # install configured upstart profile + set(RSERVER_UPSTART_DIR "extras/upstart") +@@ -224,12 +224,12 @@ + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} +- DESTINATION ${RSERVER_UPSTART_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) + set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} +- DESTINATION ${RSERVER_UPSTART_DIR}) ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) + + # install configured systemd profile + set(RSERVER_SYSTEMD_DIR "extras/systemd") +--- rstudio-1.2.1335-orig/src/cpp/server/ServerOptions.cpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/server/ServerOptions.cpp 2019-04-09 16:54:34.740739744 +1000 +@@ -389,8 +389,8 @@ + + // convert relative paths by completing from the system installation + // path (this allows us to be relocatable) +- resolvePath(resourcePath, &wwwLocalPath_); +- resolvePath(resourcePath, &wwwSymbolMapsPath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); + resolvePath(binaryPath, &authPamHelperPath_); + resolvePath(binaryPath, &rsessionPath_); + resolvePath(binaryPath, &rldpathPath_); +--- rstudio-1.2.1335-orig/src/cpp/session/SessionOptions.cpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/session/SessionOptions.cpp 2019-04-09 17:17:06.035206050 +1000 +@@ -53,7 +53,7 @@ + namespace session { + + namespace { +-const char* const kDefaultPandocPath = "bin/pandoc"; ++const char* const kDefaultPandocPath = "bin"; + const char* const kDefaultPostbackPath = "bin/postback/rpostback"; + const char* const kDefaultRsclangPath = "bin/rsclang"; + +@@ -569,14 +569,14 @@ + } + + // convert relative paths by completing from the app resource path +- resolvePath(resourcePath_, &rResourcesPath_); +- resolvePath(resourcePath_, &agreementFilePath_); +- resolvePath(resourcePath_, &wwwLocalPath_); +- resolvePath(resourcePath_, &wwwSymbolMapsPath_); +- resolvePath(resourcePath_, &coreRSourcePath_); +- resolvePath(resourcePath_, &modulesRSourcePath_); +- resolvePath(resourcePath_, &sessionLibraryPath_); +- resolvePath(resourcePath_, &sessionPackageArchivesPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); + resolvePostbackPath(resourcePath_, &rpostbackPath_); + #ifdef _WIN32 + resolvePath(resourcePath_, &consoleIoPath_); +@@ -601,7 +601,7 @@ + } + winptyPath_ = pty.complete(completion).absolutePath(); + #endif // _WIN32 +- resolvePath(resourcePath_, &hunspellDictionariesPath_); ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); + resolvePath(resourcePath_, &mathjaxPath_); + resolvePath(resourcePath_, &libclangHeadersPath_); + resolvePandocPath(resourcePath_, &pandocPath_); diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch new file mode 100644 index 000000000000..e72df553eeb6 --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch @@ -0,0 +1,53 @@ +--- rstudio-1.2.1335-orig/src/gwt/build.xml 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/gwt/build.xml 2019-04-09 16:44:15.089471934 +1000 +@@ -34,6 +34,7 @@ + + + ++ + + + +@@ -112,8 +113,10 @@ + + + ++ + + ++ + + + +@@ -154,6 +157,7 @@ + + + ++ + + + +@@ -176,6 +180,7 @@ + + + ++ + + + +@@ -202,6 +207,7 @@ + + + ++ + + + +@@ -237,6 +243,7 @@ + + + ++ + + + diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch new file mode 100644 index 000000000000..a59fa02f1d2c --- /dev/null +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch @@ -0,0 +1,60 @@ +--- rstudio-1.2.1335-orig/src/cpp/desktop/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/desktop/CMakeLists.txt 2019-04-09 18:04:57.783616412 +1000 +@@ -140,6 +140,13 @@ + get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib" ABSOLUTE CACHE) + get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.." ABSOLUTE CACHE) + ++find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication ++ PATH_SUFFIXES QtSolutions ++ PATHS ++ /usr/include/qt5) ++find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6 ++ libQt5Solutions_SingleApplication-2.6) ++ + # disable clang warnings for qt sources + if(APPLE) + add_definitions(-Wno-unused-private-field +@@ -158,7 +165,6 @@ + + set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES}) + list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES +- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h + ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp +@@ -224,8 +230,6 @@ + DesktopSlotBinders.cpp + DesktopSubMenu.cpp + DesktopSynctex.cpp +- 3rdparty/qtsingleapplication/qtsingleapplication.cpp +- 3rdparty/qtsingleapplication/qtlocalpeer.cpp + ) + + if(WIN32) +@@ -280,6 +284,7 @@ + ${CORE_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ++ ${QTSINGLEAPPLIB_INCLUDE_DIR} + ${TESTS_INCLUDE_DIR} + ) + +@@ -384,6 +389,7 @@ + # set link dependencies + target_link_libraries(rstudio + ${RSTUDIO_QTMODULES} ++ ${QTSINGLEAPPLIB} + ${QT_LIBRARIES} + ${Boost_LIBRARIES} + rstudio-core +--- rstudio-1.2.1335-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2019-03-28 16:08:20.000000000 +1100 ++++ rstudio-1.2.1335/src/cpp/desktop/DesktopPosixApplication.hpp 2019-04-09 18:01:39.333920927 +1000 +@@ -16,7 +16,7 @@ + #ifndef DESKTOP_POSIX_APPLICATION_HPP + #define DESKTOP_POSIX_APPLICATION_HPP + +-#include "3rdparty/qtsingleapplication/QtSingleApplication" ++#include + + #include "DesktopApplicationLaunch.hpp" + -- cgit v1.2.3