Date: Fri, 8 Mar 2019 16:26:47 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495054 - in head/devel/RStudio: . files Message-ID: <201903081626.x28GQmef079463@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Fri Mar 8 16:26:47 2019 New Revision: 495054 URL: https://svnweb.freebsd.org/changeset/ports/495054 Log: devel/RStudio: Update 1.2.679 -> 1.2.1320 * Update WWW * Various trivial patch and Makefile updates Added: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopWebView.cpp (contents, props changed) head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp (contents, props changed) Deleted: head/devel/RStudio/files/patch-boost-1.69 Modified: head/devel/RStudio/Makefile head/devel/RStudio/distinfo head/devel/RStudio/files/patch-CMakeGlobals.txt head/devel/RStudio/files/patch-CMakeLists.txt head/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt head/devel/RStudio/pkg-descr Modified: head/devel/RStudio/Makefile ============================================================================== --- head/devel/RStudio/Makefile Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/Makefile Fri Mar 8 16:26:47 2019 (r495054) @@ -5,8 +5,7 @@ PORTNAME= RStudio DISTVERSIONPREFIX= v -DISTVERSION= 1.2.679 -PORTREVISION= 8 +DISTVERSION= 1.2.1320 CATEGORIES= devel math java MASTER_SITES= https://s3.amazonaws.com/rstudio-dictionaries/:dictionaries \ https://s3.amazonaws.com/rstudio-buildtools/:buildtools @@ -45,6 +44,7 @@ CMAKE_ARGS= -DRSTUDIO_TARGET=Desktop \ -DFREEBSD_RSTUDIO_VERSION:STRING=${PORTVERSION} \ -DFREEBSD_LIBDIR:STRING=${PREFIX}/lib CMAKE_ARGS+= -DRSTUDIO_BOOST_SIGNALS_VERSION=2 # until Boost 1.69 or RStudio 1.3 +CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE:STRING=${QMAKE} MAKE_ENV= HOME=${WRKDIR} \ ANT_OPTS="-Duser.home=${WRKDIR}" Modified: head/devel/RStudio/distinfo ============================================================================== --- head/devel/RStudio/distinfo Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/distinfo Fri Mar 8 16:26:47 2019 (r495054) @@ -1,4 +1,4 @@ -TIMESTAMP = 1528355181 +TIMESTAMP = 1552019950 SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 SIZE (core-dictionaries.zip) = 876339 SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a @@ -7,8 +7,8 @@ SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace946 SIZE (gwt-2.8.1.zip) = 95650299 SHA256 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71 SIZE (mathjax-26.zip) = 3061588 -SHA256 (RStudio-rstudio-v1.2.679_GH0.tar.gz) = 23c22afd8451f6ab0f7d74310426f20a478d4f4daeaeeb6d74000b91330682fd -SIZE (RStudio-rstudio-v1.2.679_GH0.tar.gz) = 20143262 +SHA256 (RStudio-rstudio-v1.2.1320_GH0.tar.gz) = d896c2d89476ce1bed2207b3e218f44d0daedd482789e616fe7b4949117301c0 +SIZE (RStudio-rstudio-v1.2.1320_GH0.tar.gz) = 20439887 SHA256 (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 6355a7632134c8c9487056019a9c458db2c98d10388cf66b018d5461d0a947af SIZE (rstudio-r2d3-v0.2.0_GH0.tar.gz) = 21977747 SHA256 (rstudio-rmarkdown-aed26ac_GH0.tar.gz) = b6f6f48dd9930514204739d8957c2737f0b1d110aebf9f89fa31de10598cb29b Modified: head/devel/RStudio/files/patch-CMakeGlobals.txt ============================================================================== --- head/devel/RStudio/files/patch-CMakeGlobals.txt Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/files/patch-CMakeGlobals.txt Fri Mar 8 16:26:47 2019 (r495054) @@ -1,22 +1,28 @@ ---- CMakeGlobals.txt.orig 2018-06-07 06:50:17 UTC +--- CMakeGlobals.txt.orig 2019-02-18 00:38:08 UTC +++ CMakeGlobals.txt -@@ -84,14 +84,16 @@ endif() +@@ -74,17 +74,19 @@ endif() # record git revision hash (cache it since we don't use this in development # mode and we don't want it to force rebuilds there) --if(NOT RSTUDIO_SESSION_WIN64 AND NOT RSTUDIO_GIT_REVISION_HASH) +-if(NOT RSTUDIO_GIT_REVISION_HASH) - find_program(GIT_EXECUTABLE git) - if(GIT_EXECUTABLE) -- exec_program(git ARGS rev-parse HEAD -- OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH) +- execute_process( +- COMMAND git rev-parse HEAD +- WORKING_DIRECTORY "${ROOT_SRC_DIR}" +- OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH +- OUTPUT_STRIP_TRAILING_WHITESPACE) - SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash") - endif() -endif() -+#if(NOT RSTUDIO_SESSION_WIN64 AND NOT RSTUDIO_GIT_REVISION_HASH) ++#if(NOT RSTUDIO_GIT_REVISION_HASH) +# find_program(GIT_EXECUTABLE git) +# if(GIT_EXECUTABLE) -+# exec_program(git ARGS rev-parse HEAD -+# OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH) ++# execute_process( ++# COMMAND git rev-parse HEAD ++# WORKING_DIRECTORY "${ROOT_SRC_DIR}" ++# OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH ++# OUTPUT_STRIP_TRAILING_WHITESPACE) +# SET(RSTUDIO_GIT_REVISION_HASH "${RSTUDIO_GIT_REVISION_HASH}" CACHE STRING "Git Revision Hash") +# endif() +#endif() Modified: head/devel/RStudio/files/patch-CMakeLists.txt ============================================================================== --- head/devel/RStudio/files/patch-CMakeLists.txt Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/files/patch-CMakeLists.txt Fri Mar 8 16:26:47 2019 (r495054) @@ -1,21 +1,28 @@ ---- CMakeLists.txt.orig 2017-11-16 21:40:37 UTC +--- CMakeLists.txt.orig 2019-02-16 02:00:24 UTC +++ CMakeLists.txt -@@ -31,8 +31,7 @@ endif() - if (NOT RSTUDIO_SESSION_WIN64) - # dynamically configure SOURCE with the git revision hash - INSTALL(CODE " -- exec_program(git ARGS rev-parse HEAD +@@ -29,13 +29,18 @@ endif() + + # install root docs + # dynamically configure SOURCE with the git revision hash +-INSTALL(CODE " +- execute_process(COMMAND git rev-parse HEAD +- WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\" - OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH) -+ set(RSTUDIO_VERSION ${FREEBSD_RSTUDIO_VERSION}) - configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in\" - \"${CMAKE_CURRENT_BINARY_DIR}/SOURCE\") - ") -@@ -57,8 +56,6 @@ add_subdirectory(package) +- configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in\" +- \"${CMAKE_CURRENT_BINARY_DIR}/SOURCE\") +-") ++#INSTALL(CODE " ++# execute_process(COMMAND git rev-parse HEAD ++# WORKING_DIRECTORY \"${CMAKE_CURRENT_SOURCE_DIR}\" ++# OUTPUT_VARIABLE RSTUDIO_GIT_REVISION_HASH) ++# configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in\" ++# \"${CMAKE_CURRENT_BINARY_DIR}/SOURCE\") ++#") ++ ++configure_file (${CMAKE_CURRENT_SOURCE_DIR}/SOURCE.in ++ ${CMAKE_CURRENT_BINARY_DIR}/SOURCE) ++ ++set(RSTUDIO_VERSION ${FREEBSD_RSTUDIO_VERSION}) - - -- -- - - - + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/VERSION.in + ${CMAKE_CURRENT_BINARY_DIR}/VERSION) Modified: head/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt ============================================================================== --- head/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/files/patch-src_cpp_core_CMakeLists.txt Fri Mar 8 16:26:47 2019 (r495054) @@ -1,10 +1,6 @@ ---- src/cpp/core/CMakeLists.txt.orig 2017-11-16 21:40:37 UTC +--- src/cpp/core/CMakeLists.txt.orig 2019-02-16 02:00:24 UTC +++ src/cpp/core/CMakeLists.txt -@@ -143,16 +143,17 @@ if (UNIX) - } - " - HAVE_SCANDIR_POSIX) -- +@@ -156,12 +156,14 @@ if (UNIX) # platform introspection check_symbol_exists(SA_NOCLDWAIT "signal.h" HAVE_SA_NOCLDWAIT) check_symbol_exists(SO_PEERCRED "sys/socket.h" HAVE_SO_PEERCRED) @@ -18,6 +14,6 @@ set(HAVE_PROCSELF TRUE) - endif() + #endif() - configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/config.h) + # find packages and libraries + find_library(PTHREAD_LIBRARIES pthread) Modified: head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp ============================================================================== --- head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp Fri Mar 8 16:26:47 2019 (r495054) @@ -1,6 +1,6 @@ ---- src/cpp/core/system/PosixSystem.cpp.orig 2018-05-16 18:21:36 UTC +--- src/cpp/core/system/PosixSystem.cpp.orig 2019-02-16 02:00:24 UTC +++ src/cpp/core/system/PosixSystem.cpp -@@ -36,6 +36,7 @@ +@@ -37,6 +37,7 @@ #include <ifaddrs.h> #include <sys/socket.h> #include <netdb.h> @@ -8,7 +8,7 @@ #include <uuid/uuid.h> -@@ -45,13 +46,22 @@ +@@ -46,13 +47,22 @@ #include <libproc.h> #endif @@ -32,7 +32,7 @@ #include <boost/thread.hpp> #include <boost/format.hpp> #include <boost/lexical_cast.hpp> -@@ -569,7 +579,35 @@ Error getOpenFds(std::vector<unsigned in +@@ -575,7 +585,35 @@ Error getOpenFds(std::vector<uint32_t>* return getOpenFds(getpid(), pFds); } @@ -66,10 +66,10 @@ + return Success(); +} +#elif !defined(__APPLE__) - Error getOpenFds(pid_t pid, std::vector<unsigned int>* pFds) + Error getOpenFds(pid_t pid, std::vector<uint32_t>* pFds) { std::string pidStr = safe_convert::numberToString(pid); -@@ -859,7 +897,11 @@ Error executablePath(const char * argv0, +@@ -920,7 +958,11 @@ Error executablePath(const char * argv0, #elif defined(HAVE_PROCSELF) @@ -81,7 +81,7 @@ #else -@@ -1296,7 +1338,7 @@ Error osResourceLimit(ResourceLimit limi +@@ -1395,7 +1437,7 @@ Error osResourceLimit(ResourceLimit limi case CpuLimit: *pLimit = RLIMIT_CPU; break; @@ -90,7 +90,7 @@ case NiceLimit: *pLimit = RLIMIT_NICE; break; -@@ -1369,7 +1411,7 @@ Error systemInformation(SysInfo* pSysInf +@@ -1468,7 +1510,7 @@ Error systemInformation(SysInfo* pSysInf { pSysInfo->cores = boost::thread::hardware_concurrency(); @@ -99,7 +99,7 @@ struct sysinfo info; if (::sysinfo(&info) == -1) return systemError(errno, ERROR_LOCATION); -@@ -1402,7 +1444,7 @@ void toPids(const std::vector<std::strin +@@ -1501,7 +1543,7 @@ void toPids(const std::vector<std::strin } // anonymous namespace @@ -108,7 +108,7 @@ core::Error pidof(const std::string& process, std::vector<PidType>* pPids) { // use pidof to capture pids -@@ -1711,7 +1753,7 @@ Error restrictCoreDumps() +@@ -1908,7 +1950,7 @@ Error restrictCoreDumps() return error; // no ptrace core dumps permitted @@ -117,7 +117,7 @@ int res = ::prctl(PR_SET_DUMPABLE, 0); if (res == -1) return systemError(errno, ERROR_LOCATION); -@@ -1722,7 +1764,7 @@ Error restrictCoreDumps() +@@ -1919,7 +1961,7 @@ Error restrictCoreDumps() Error enableCoreDumps() { @@ -126,7 +126,7 @@ int res = ::prctl(PR_SET_DUMPABLE, 1); if (res == -1) return systemError(errno, ERROR_LOCATION); -@@ -1748,7 +1790,7 @@ void printCoreDumpable(const std::string +@@ -1945,7 +1987,7 @@ void printCoreDumpable(const std::string ostr << " hard limit: " << rLimitHard << std::endl; // ptrace Modified: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp ============================================================================== --- head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp Fri Mar 8 16:26:47 2019 (r495054) @@ -1,14 +1,23 @@ ---- src/cpp/desktop/DesktopMain.cpp.orig 2018-05-16 18:21:36 UTC +--- src/cpp/desktop/DesktopMain.cpp.orig 2019-02-16 02:00:24 UTC +++ src/cpp/desktop/DesktopMain.cpp -@@ -40,6 +40,7 @@ +@@ -41,6 +41,7 @@ #include "DesktopProgressActivator.hpp" #include "DesktopNetworkProxyFactory.hpp" #include "DesktopActivationOverlay.hpp" +#include "global-setenv.h" - QProcess* pRSessionProcess; - QString sharedSecret; -@@ -262,6 +263,7 @@ bool useChromiumDevtools() + #ifdef _WIN32 + #include <Windows.h> +@@ -324,7 +325,7 @@ QString inferDefaultRenderingEngine() + + #endif + +-#ifdef Q_OS_LINUX ++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) + + QString inferDefaultRenderingEngine() + { +@@ -383,6 +384,7 @@ void initializeRenderingEngine(std::vect int main(int argc, char* argv[]) { Added: head/devel/RStudio/files/patch-src_cpp_desktop_DesktopWebView.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/RStudio/files/patch-src_cpp_desktop_DesktopWebView.cpp Fri Mar 8 16:26:47 2019 (r495054) @@ -0,0 +1,29 @@ +--- src/cpp/desktop/DesktopWebView.cpp.orig 2019-02-18 00:53:59 UTC ++++ src/cpp/desktop/DesktopWebView.cpp +@@ -257,7 +257,7 @@ void WebView::contextMenuEvent(QContextM + + case QWebEngineContextMenuData::MediaTypeAudio: + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) ++#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) && !defined(__FreeBSD__) // FreeBSD stayed with qt5-webengine-5.9.5_14 while Qt advanced to 5.12.0 + if (data.mediaFlags().testFlag(QWebEngineContextMenuData::MediaPaused)) + menu->addAction(label(tr("&Play")), [&]() { triggerPageAction(QWebEnginePage::ToggleMediaPlayPause); }); + else +@@ -274,7 +274,7 @@ void WebView::contextMenuEvent(QContextM + + case QWebEngineContextMenuData::MediaTypeVideo: + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) ++#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) && !defined(__FreeBSD__) // FreeBSD stayed with qt5-webengine-5.9.5_14 while Qt advanced to 5.12.0 + if (data.mediaFlags().testFlag(QWebEngineContextMenuData::MediaPaused)) + menu->addAction(label(tr("&Play")), [&]() { triggerPageAction(QWebEnginePage::ToggleMediaPlayPause); }); + else +@@ -332,7 +332,7 @@ void WebView::contextMenuEvent(QContextM + menu->addAction(selectAll); + } + +-#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) ++#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0) && !defined(__FreeBSD__) // FreeBSD stayed with qt5-webengine-5.9.5_14 while Qt advanced to 5.12.0 + menu->addSeparator(); + menu->addAction(label(tr("&Reload")), [&]() { triggerPageAction(QWebEnginePage::Reload); }); + menu->addAction(label(tr("I&nspect element")), [&]() { Modified: head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt ============================================================================== --- head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/files/patch-src_cpp_diagnostics_CMakeLists.txt Fri Mar 8 16:26:47 2019 (r495054) @@ -1,4 +1,4 @@ ---- src/cpp/diagnostics/CMakeLists.txt.orig 2018-05-30 06:20:49 UTC +--- src/cpp/diagnostics/CMakeLists.txt.orig 2019-02-16 02:00:24 UTC +++ src/cpp/diagnostics/CMakeLists.txt @@ -62,6 +62,7 @@ endif() # set link dependencies @@ -6,5 +6,5 @@ rstudio-core + procstat ) - if(NOT RSTUDIO_SESSION_WIN64) - install(TARGETS diagnostics DESTINATION ${RSTUDIO_INSTALL_BIN}) + install(TARGETS diagnostics DESTINATION ${RSTUDIO_INSTALL_BIN}) + Modified: head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt ============================================================================== --- head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt Fri Mar 8 16:26:47 2019 (r495054) @@ -1,4 +1,4 @@ ---- src/cpp/session/CMakeLists.txt.orig 2018-05-16 18:21:36 UTC +--- src/cpp/session/CMakeLists.txt.orig 2019-02-16 02:00:24 UTC +++ src/cpp/session/CMakeLists.txt @@ -25,9 +25,9 @@ endif() if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") @@ -13,40 +13,38 @@ # we often install embedded versions of these packages but don't do so currently -@@ -42,19 +42,19 @@ if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DI - endif() +@@ -39,18 +39,18 @@ endif() + # endif() - # verify libclang is installed + # verify libclang is installed (Windows only) -if(WIN32) -- set(LIBCLANG_VERSION "3.4") --else() -- set(LIBCLANG_VERSION "3.5") +- set(LIBCLANG_VERSION "5.0.2") +- 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() -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() +#if(WIN32) -+# set(LIBCLANG_VERSION "3.4") -+#else() -+# set(LIBCLANG_VERSION "3.5") ++# set(LIBCLANG_VERSION "5.0.2") ++# 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() +#endif() -+set(LIBCLANG_DIR ${CMAKE_INSTALL_PREFIX}) -+#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 "${CMAKE_INSTALL_PREFIX}/include") -+#if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -+# message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") -+#endif() - # include files -@@ -362,6 +362,9 @@ endif() + file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") +@@ -364,6 +364,9 @@ endif() # define executable add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES}) @@ -56,40 +54,20 @@ # skip libR RPATH at development time if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE) set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE) -@@ -474,11 +477,11 @@ if (NOT RSTUDIO_SESSION_WIN64) - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) +@@ -486,11 +489,11 @@ else() + set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") + endif() - # install pandoc -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/2.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) -+ #set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/2.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) +-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) ++#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") -@@ -524,14 +527,14 @@ if (NOT RSTUDIO_SESSION_WIN64) - 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) -+ #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(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -+ # DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") - - # install winpty on windows - if(WIN32) + # install rmarkdown package + # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") Added: head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/RStudio/files/patch-src_cpp_session_SessionMain.cpp Fri Mar 8 16:26:47 2019 (r495054) @@ -0,0 +1,15 @@ +--- src/cpp/session/SessionMain.cpp.orig 2019-02-18 01:05:52 UTC ++++ src/cpp/session/SessionMain.cpp +@@ -1620,8 +1620,12 @@ int main (int argc, char * const argv[]) + + // move to own process group + #ifndef _WIN32 ++#if defined(__FreeBSD__) ++ ::setpgrp(0, 0); ++#else + ::setpgrp(); + #endif ++#endif + + // get main thread id (used to distinguish forks which occur + // from the main thread vs. child threads) Modified: head/devel/RStudio/pkg-descr ============================================================================== --- head/devel/RStudio/pkg-descr Fri Mar 8 16:10:20 2019 (r495053) +++ head/devel/RStudio/pkg-descr Fri Mar 8 16:26:47 2019 (r495054) @@ -3,4 +3,4 @@ It includes a console, syntax-highlighting editor that code execution, as well as tools for plotting, history, debugging and workspace management. -WWW: https://www.rstudio.org +WWW: https://www.rstudio.com/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903081626.x28GQmef079463>