diff options
| author |   Mark Wright <gienah@gentoo.org> | 2020-05-23 22:34:01 +1000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2020-05-23 22:42:05 +1000 |
| commit | 03406d4343f6bf8e63fcc86bfc6264cdb429fefb (patch) | |
| tree | f4d1d3915223c76b2305d9e8530dac3c53e0e00a /sci-mathematics/rstudio/files | |
| parent | dev-db/mariadb: bump to v5.5.68 (diff) | |
| download | gentoo-03406d4343f6bf8e63fcc86bfc6264cdb429fefb.tar.gz gentoo-03406d4343f6bf8e63fcc86bfc6264cdb429fefb.tar.bz2 gentoo-03406d4343f6bf8e63fcc86bfc6264cdb429fefb.zip | |
sci-mathematics/rstudio: Remove old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mark Wright <gienah@gentoo.org>
Diffstat (limited to 'sci-mathematics/rstudio/files')
17 files changed, 0 insertions, 1663 deletions
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch deleted file mode 100644 index a336fccbc981..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch +++ /dev/null @@ -1,18 +0,0 @@ -Some gcc hardening options were added, however since we add -"-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which -leads to linker errors about unknown options, if we make it so the -as-needed option is the last option on the line, everything is fine. - -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index 0589ca0..fe5bd5f 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -57,7 +57,7 @@ if(UNIX) - add_definitions(-D_FORTIFY_SOURCE=2) - add_definitions(-fstack-protector --param ssp-buffer-size=4) - add_definitions(-pie -fPIE) -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now") -+ set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}") - endif() - - # Win32 specific global directives diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch deleted file mode 100644 index bf66bd236788..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- rstudio-0.99.473-orig/src/cpp/desktop/CMakeLists.txt 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/src/cpp/desktop/CMakeLists.txt 2015-08-30 23:16:11.396175587 +1000 -@@ -93,7 +93,12 @@ - find_package(Qt5DBus REQUIRED) - endif() - -- -+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) -@@ -113,7 +118,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 -@@ -175,8 +179,6 @@ - DesktopSubMenu.cpp - DesktopSynctex.cpp - DesktopNetworkAccessManager.cpp -- 3rdparty/qtsingleapplication/qtsingleapplication.cpp -- 3rdparty/qtsingleapplication/qtlocalpeer.cpp - ) - - if(WIN32) -@@ -219,6 +221,7 @@ - ${CORE_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -+ ${QTSINGLEAPPLIB_INCLUDE_DIR} - ${TESTS_INCLUDE_DIR} - ) - -@@ -332,6 +335,7 @@ - - # set link dependencies - target_link_libraries(rstudio -+ ${QTSINGLEAPPLIB} - ${QT_LIBRARIES} - rstudio-core - ${LINK_FLAGS} ---- rstudio-0.99.473-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2015-08-12 09:58:43.000000000 +1000 -+++ rstudio-0.99.473/src/cpp/desktop/DesktopPosixApplication.hpp 2015-08-30 21:41:21.616934106 +1000 -@@ -16,7 +16,7 @@ - #ifndef DESKTOP_POSIX_APPLICATION_HPP - #define DESKTOP_POSIX_APPLICATION_HPP - --#include "3rdparty/qtsingleapplication/QtSingleApplication" -+#include <QtSingleApplication> - - namespace rstudio { - namespace desktop { diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch deleted file mode 100644 index 483613cc5c09..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- rstudio-0.99.879-orig/src/gwt/build.xml 2016-02-12 09:24:39.000000000 +1100 -+++ rstudio-0.99.879/src/gwt/build.xml 2016-02-20 00:25:39.458756693 +1100 -@@ -25,6 +25,7 @@ - <property name="gwt.extra.args" value=""/> - <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> - <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> -+ <property environment="env"/> - - <path id="project.class.path"> - <pathelement location="bin"/> -@@ -101,8 +102,10 @@ - <pathelement location="src"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> - <jvmarg value="-Xmx1536M"/> -+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> - <arg value="-war"/> - <arg value="www"/> - <arg value="-localWorkers"/> -@@ -142,6 +145,7 @@ - <pathelement location="src"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <jvmarg value="-Xmx2048M"/> - <arg value="-war"/> - <arg value="www"/> -@@ -163,6 +167,7 @@ - <pathelement location="src"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <jvmarg value="-Xmx2048M"/> - <arg value="-src"/> - <arg value = "src"/> -@@ -194,6 +199,7 @@ - <pathelement location="src"/> - <path refid="test.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <arg value="org.rstudio.studio.selenium.RStudioTestSuite"/> - </java> - </sequential> diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch deleted file mode 100644 index b2a1a33b44c2..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch +++ /dev/null @@ -1,130 +0,0 @@ ---- rstudio-1.0.44-orig/CMakeGlobals.txt 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/CMakeGlobals.txt 2016-12-01 23:33:04.149326324 +1100 -@@ -123,7 +123,7 @@ - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate ---- rstudio-1.0.44-orig/src/cpp/server/CMakeLists.txt 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/src/cpp/server/CMakeLists.txt 2016-12-01 23:35:51.634862018 +1100 -@@ -155,7 +155,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") -@@ -163,7 +163,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") -@@ -171,13 +171,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 apparmor profile - set(RSERVER_APPARMOR_DIR "extras/apparmor") -@@ -185,9 +185,9 @@ - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -195,12 +195,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.0.44-orig/src/cpp/server/ServerOptions.cpp 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/src/cpp/server/ServerOptions.cpp 2016-12-01 23:33:04.151326331 +1100 -@@ -386,8 +386,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.0.44-orig/src/cpp/session/SessionOptions.cpp 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/src/cpp/session/SessionOptions.cpp 2016-12-01 23:33:04.151326331 +1100 -@@ -49,7 +49,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"; - -@@ -481,14 +481,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_); -@@ -498,7 +498,7 @@ - resolvePath(resourcePath_, &sumatraPath_); - resolvePath(resourcePath_, &winutilsPath_); - #endif -- 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.1.357-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch deleted file mode 100644 index 28b0220912a0..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch +++ /dev/null @@ -1,76 +0,0 @@ -Index: rstudio-1.1.357/src/cpp/session/CMakeLists.txt -=================================================================== ---- rstudio-1.1.357.orig/src/cpp/session/CMakeLists.txt -+++ rstudio-1.1.357/src/cpp/session/CMakeLists.txt -@@ -25,9 +25,6 @@ endif() - 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 - -@@ -38,22 +35,6 @@ endif() - # message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") - # endif() - --# verify libclang is installed --if(WIN32) -- set(LIBCLANG_VERSION "3.4") --else() -- set(LIBCLANG_VERSION "3.5") --endif() --set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") --if(NOT EXISTS "${LIBCLANG_DIR}") -- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") --endif() --set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") --if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") --endif() -- -- - # include files - file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") - -@@ -465,13 +446,6 @@ if (NOT RSTUDIO_SESSION_WIN64) - install(DIRECTORY "resources/connections" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install pandoc -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1") -- 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} -@@ -502,24 +476,6 @@ if (NOT RSTUDIO_SESSION_WIN64) - install(DIRECTORY "resources/profiler" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install libclang -- if(WIN32) -- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") -- install(PROGRAMS ${LIBCLANG_32_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") -- install(PROGRAMS ${LIBCLANG_64_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- else() -- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") -- install(PROGRAMS ${LIBCLANG_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) -- endif() -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -- - # install winpty on windows - if(WIN32) - install(PROGRAMS "${WINPTY_BINDIR_32}/winpty.dll" diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch deleted file mode 100644 index 760c9b561055..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- rstudio-1.1.453-orig/src/cpp/core/DateTime.cpp 2018-05-15 04:19:30.000000000 +1000 -+++ rstudio-1.1.453/src/cpp/core/DateTime.cpp 2018-07-02 16:19:21.335703471 +1000 -@@ -65,7 +65,7 @@ - using namespace boost::posix_time; - - ptime time_t_epoch(date(1970,1,1)); -- return time_t_epoch + seconds(sec); -+ return time_t_epoch + seconds(static_cast<long>(sec)); - } - - boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms) ---- rstudio-1.1.453-orig/src/cpp/core/file_lock/FileLock.cpp 2018-05-15 04:19:30.000000000 +1000 -+++ rstudio-1.1.453/src/cpp/core/file_lock/FileLock.cpp 2018-07-02 17:00:35.915695201 +1000 -@@ -133,11 +133,11 @@ - - // timeout interval - double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval); -- FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval); -+ FileLock::s_timeoutInterval = boost::posix_time::seconds(static_cast<long>(timeoutInterval)); - - // refresh rate - double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate); -- FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate); -+ FileLock::s_refreshRate = boost::posix_time::seconds(static_cast<long>(refreshRate)); - - // logging - bool loggingEnabled = settings.getBool("enable-logging", false); -@@ -212,8 +212,8 @@ - - // default values for static members - FileLock::LockType FileLock::s_defaultType(FileLock::LOCKTYPE_LINKBASED); --boost::posix_time::seconds FileLock::s_timeoutInterval(kDefaultTimeoutInterval); --boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate); -+boost::posix_time::seconds FileLock::s_timeoutInterval(static_cast<long>(kDefaultTimeoutInterval)); -+boost::posix_time::seconds FileLock::s_refreshRate(static_cast<long>(kDefaultRefreshRate)); - bool FileLock::s_loggingEnabled(false); - bool FileLock::s_isLoadBalanced(false); - FilePath FileLock::s_logFile; diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch deleted file mode 100644 index 641f7710167a..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch +++ /dev/null @@ -1,143 +0,0 @@ ---- rstudio-1.1.453-orig/src/cpp/session/SessionClientInit.cpp 2018-05-15 04:19:30.000000000 +1000 -+++ rstudio-1.1.453/src/cpp/session/SessionClientInit.cpp 2018-07-02 20:21:41.595654877 +1000 -@@ -105,7 +105,7 @@ - } - - // prepare session info -- json::Object sessionInfo ; -+ core::json::Object sessionInfo ; - sessionInfo["clientId"] = clientId; - sessionInfo["mode"] = options.programMode(); - -@@ -119,8 +119,8 @@ - } - - // temp dir -- FilePath tempDir = rstudio::r::session::utils::tempDir(); -- Error error = tempDir.ensureDirectory(); -+ core::FilePath tempDir = rstudio::r::session::utils::tempDir(); -+ core::Error error = tempDir.ensureDirectory(); - if (error) - LOG_ERROR(error); - sessionInfo["temp_dir"] = tempDir.absolutePath(); -@@ -132,12 +132,12 @@ - sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt"); - - // client state -- json::Object clientStateObject; -+ core::json::Object clientStateObject; - rstudio::r::session::clientState().currentState(&clientStateObject); - sessionInfo["client_state"] = clientStateObject; - - // source documents -- json::Array jsonDocs; -+ core::json::Array jsonDocs; - error = modules::source::clientInitDocuments(&jsonDocs); - if (error) - LOG_ERROR(error); -@@ -159,7 +159,7 @@ - if (resumed) - { - // console actions -- json::Object actionsObject; -+ core::json::Object actionsObject; - consoleActions.asJson(&actionsObject); - sessionInfo["console_actions"] = actionsObject; - } -@@ -211,12 +211,12 @@ - } - else - { -- sessionInfo["active_project_file"] = json::Value(); -- sessionInfo["project_ui_prefs"] = json::Value(); -- sessionInfo["project_open_docs"] = json::Value(); -+ sessionInfo["active_project_file"] = core::json::Value(); -+ sessionInfo["project_ui_prefs"] = core::json::Value(); -+ sessionInfo["project_open_docs"] = core::json::Value(); - sessionInfo["project_supports_sharing"] = false; - sessionInfo["project_owned_by_user"] = false; -- sessionInfo["project_user_data_directory"] = json::Value(); -+ sessionInfo["project_user_data_directory"] = core::json::Value(); - } - - sessionInfo["system_encoding"] = std::string(::locale2charset(NULL)); -@@ -253,20 +253,20 @@ - sessionInfo["build_tools_bookdown_website"] = - module_context::isBookdownWebsite(); - -- FilePath buildTargetDir = projects::projectContext().buildTargetPath(); -+ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath(); - if (!buildTargetDir.empty()) - { - sessionInfo["build_target_dir"] = module_context::createAliasedPath( - buildTargetDir); -- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) && -+ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) && - buildTargetDir.childPath("src").exists(); - sessionInfo["has_pkg_vig"] = -- (type == r_util::kBuildTypePackage) && -+ (type == core::r_util::kBuildTypePackage) && - buildTargetDir.childPath("vignettes").exists(); - } - else - { -- sessionInfo["build_target_dir"] = json::Value(); -+ sessionInfo["build_target_dir"] = core::json::Value(); - sessionInfo["has_pkg_src"] = false; - sessionInfo["has_pkg_vig"] = false; - } -@@ -274,9 +274,9 @@ - } - else - { -- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone; -+ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone; - sessionInfo["build_tools_bookdown_website"] = false; -- sessionInfo["build_target_dir"] = json::Value(); -+ sessionInfo["build_target_dir"] = core::json::Value(); - sessionInfo["has_pkg_src"] = false; - sessionInfo["has_pkg_vig"] = false; - } -@@ -285,7 +285,7 @@ - sessionInfo["presentation_commands"] = options.allowPresentationCommands(); - - sessionInfo["tutorial_api_available"] = false; -- sessionInfo["tutorial_api_client_origin"] = json::Value(); -+ sessionInfo["tutorial_api_client_origin"] = core::json::Value(); - - sessionInfo["build_state"] = modules::build::buildStateAsJson(); - sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled(); -@@ -296,7 +296,7 @@ - - // console history -- we do this at the end because - // restoreBuildRestartContext may have reset it -- json::Array historyArray; -+ core::json::Array historyArray; - rstudio::r::session::consoleHistory().asJson(&historyArray); - sessionInfo["console_history"] = historyArray; - sessionInfo["console_history_capacity"] = -@@ -364,13 +364,13 @@ - - sessionInfo["multi_session"] = options.multiSession(); - -- json::Object rVersionsJson; -+ core::json::Object rVersionsJson; - rVersionsJson["r_version"] = module_context::rVersion(); - rVersionsJson["r_home_dir"] = module_context::rHomeDir(); - sessionInfo["r_versions_info"] = rVersionsJson; - - sessionInfo["show_user_home_page"] = options.showUserHomePage(); -- sessionInfo["user_home_page_url"] = json::Value(); -+ sessionInfo["user_home_page_url"] = core::json::Value(); - - sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson(); - sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload(); -@@ -394,7 +394,7 @@ - - // send response (we always set kEventsPending to false so that the client - // won't poll for events until it is ready) -- json::JsonRpcResponse jsonRpcResponse ; -+ core::json::JsonRpcResponse jsonRpcResponse ; - jsonRpcResponse.setField(kEventsPending, "false"); - jsonRpcResponse.setResult(sessionInfo) ; - ptrConnection->sendJsonRpcResponse(jsonRpcResponse); 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 deleted file mode 100644 index a7a48572de30..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch +++ /dev/null @@ -1,460 +0,0 @@ ---- /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 @@ -+/* -+ * 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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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 -+++ rstudio-1.1.463/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(); 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 deleted file mode 100644 index d90ce005a1a0..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch +++ /dev/null @@ -1,220 +0,0 @@ ---- 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 <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 -+++ 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 <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 -+++ 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 <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 -+++ 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 <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 -+++ rstudio-1.1.463/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 -+++ 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 <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 -+++ 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<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 -+++ 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 <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; - }; - 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 deleted file mode 100644 index 961723fd224f..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch +++ /dev/null @@ -1,167 +0,0 @@ ---- 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<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 -+++ 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 deleted file mode 100644 index 320b823355a3..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- 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<boost::asio::deadline_timer>( -+#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<boost::asio::ip::tcp::acceptor>( -- 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<boost::asio::ip::tcp::socket>( -- 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.1.463-fix-ptr-int-compare.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-fix-ptr-int-compare.patch deleted file mode 100644 index 914cd942e8f4..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-fix-ptr-int-compare.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rstudio-1.1.463-orig/src/cpp/server/ServerSecureKeyFile.cpp 2018-10-25 09:42:55.000000000 +1100 -+++ rstudio-1.1.463/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); - } diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch deleted file mode 100644 index b2c4d2392f6a..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a11d0454e5fe9c50005a03b9d9de84355df5c7fd Mon Sep 17 00:00:00 2001 -From: Kevin Ushey <kevinushey@gmail.com> -Date: Fri, 15 Nov 2019 14:54:02 -0800 -Subject: [PATCH] avoid use of deprecated APIs - ---- - src/cpp/core/FilePath.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/cpp/shared_core/FilePath.cpp b/src/cpp/shared_core/FilePath.cpp -index 088366a9d6..495289e7fc 100644 ---- a/src/cpp/core/FilePath.cpp -+++ b/src/cpp/core/FilePath.cpp -@@ -22,8 +22,6 @@ - #include <windows.h> - #endif - --#define BOOST_FILESYSTEM_NO_DEPRECATED -- - #define BOOST_NO_CXX11_SCOPED_ENUMS - #include <boost/filesystem.hpp> - #undef BOOST_NO_CXX11_SCOPED_ENUMS -@@ -1032,7 +1030,7 @@ - { - // NOTE: The path gets round-tripped through toString/fromString, would - // be nice to have a direct constructor -- if (!iterationFunction(itr.level(), -+ if (!iterationFunction(itr.depth(), - FilePath(BOOST_FS_PATH2STR(itr->path())))) - { - // end the iteration if requested 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 deleted file mode 100644 index e38f5e0c4448..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch deleted file mode 100644 index e2fe83867bcd..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 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 deleted file mode 100644 index ba66ef9f0ea1..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch +++ /dev/null @@ -1,118 +0,0 @@ ---- 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 deleted file mode 100644 index e72df553eeb6..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- 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 @@ - <property name="gwt.extra.args" value=""/> - <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> - <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> -+ <property environment="env"/> - - <path id="project.class.path"> - <pathelement location="${build.dir}"/> -@@ -112,8 +113,10 @@ - <pathelement location="${src.dir}"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> - <jvmarg value="-Xmx1536M"/> -+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> - <arg value="-war"/> - <arg value="${www.dir}"/> - <arg value="-localWorkers"/> -@@ -154,6 +157,7 @@ - <pathelement location="${src.dir}"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <jvmarg value="-Xmx2048M"/> - <arg value="-style"/> - <arg value="PRETTY"/> -@@ -176,6 +180,7 @@ - <pathelement location="src"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <jvmarg value="-Xmx2048M"/> - <arg value="-style"/> - <arg value="PRETTY"/> -@@ -202,6 +207,7 @@ - <pathelement location="src"/> - <path refid="project.class.path"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <jvmarg value="-Xmx2048M"/> - <arg value="-src"/> - <arg value = "src"/> -@@ -237,6 +243,7 @@ - <pathelement location="${test.dir}"/> - <pathelement location="${src.dir}"/> - </classpath> -+ <jvmarg value="-Duser.home=${env.T}"/> - <classpath refid="project.class.path"/> - <classpath refid="unittest.class.path"/> - <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/> |