devel/RStudio: Update 2022.07.2+576 -> 2022.12.0+353
This commit is contained in:
Yuri Victorovich
parent
3296a983f0
commit
eff3aa5c32
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PORTNAME= RStudio
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 2022.07.2+576
|
||||
DISTVERSION= 2022.12.0+353
|
||||
CATEGORIES= devel math java
|
||||
MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
|
||||
https://s3.amazonaws.com/rstudio-buildtools/:buildtools
|
||||
|
|
@ -61,6 +61,7 @@ MAKE_ENV= HOME=${WRKDIR} \
|
|||
JAVA_HOME=${JAVA_HOME} \
|
||||
PATH=${JAVA_HOME}/bin:${PATH} \
|
||||
ANT_OPTS="-Duser.home=${WRKDIR}"
|
||||
LDFLAGS+= -lexecinfo
|
||||
|
||||
GWT_VERSION= 2.8.1
|
||||
GIN_VERSION= 2.1.2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
TIMESTAMP = 1663892387
|
||||
TIMESTAMP = 1672353588
|
||||
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) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d3723
|
|||
SIZE (gwt-2.8.1.zip) = 95650299
|
||||
SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176
|
||||
SIZE (mathjax-27.zip) = 3285230
|
||||
SHA256 (RStudio-rstudio-v2022.07.2+576_GH0.tar.gz) = 55705c36a9b826064b4d9aa87b58c40bb9f7cd2f149b16d554e20136306ce301
|
||||
SIZE (RStudio-rstudio-v2022.07.2+576_GH0.tar.gz) = 100396422
|
||||
SHA256 (RStudio-rstudio-v2022.12.0+353_GH0.tar.gz) = e4f3503e2ad4229301360f56fd5288e5c8e769c490073dae7fe40366237ecce0
|
||||
SIZE (RStudio-rstudio-v2022.12.0+353_GH0.tar.gz) = 266546261
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
--- CMakeGlobals.txt.orig 2022-07-06 19:59:49 UTC
|
||||
--- CMakeGlobals.txt.orig 2022-12-03 07:38:59 UTC
|
||||
+++ CMakeGlobals.txt
|
||||
@@ -168,7 +168,7 @@ endif()
|
||||
|
||||
|
|
@ -17,16 +17,16 @@
|
|||
|
||||
# record these from Jenkins if available
|
||||
if("$ENV{GIT_COMMIT}" STREQUAL "")
|
||||
@@ -254,7 +255,7 @@ elseif(IS_CENTOS7)
|
||||
set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
|
||||
else()
|
||||
# enable by default
|
||||
- set(QUARTO_ENABLED TRUE CACHE INTERNAL "")
|
||||
+ set(QUARTO_ENABLED ${FREEBSD_QUARTO_ENABLED})
|
||||
add_definitions(-DQUARTO_ENABLED)
|
||||
@@ -241,7 +242,7 @@ if(NOT DEFINED QUARTO_ENABLED)
|
||||
set(QUARTO_ENABLED FALSE CACHE INTERNAL "")
|
||||
else()
|
||||
# enable by default
|
||||
- set(QUARTO_ENABLED TRUE CACHE INTERNAL "")
|
||||
+ set(QUARTO_ENABLED ${FREEBSD_QUARTO_ENABLED} CACHE INTERNAL "")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -341,14 +342,14 @@ else()
|
||||
@@ -334,14 +335,14 @@ else()
|
||||
endif()
|
||||
|
||||
# if the install prefix is /usr/local then tweak as appropriate
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
--- src/cpp/CMakeLists.txt.orig 2021-05-24 22:22:25 UTC
|
||||
--- src/cpp/CMakeLists.txt.orig 2022-12-03 07:38:59 UTC
|
||||
+++ src/cpp/CMakeLists.txt
|
||||
@@ -433,11 +433,11 @@ endif()
|
||||
@@ -468,9 +468,9 @@ endif()
|
||||
# find SOCI libraries
|
||||
if(UNIX)
|
||||
set(SOCI_LIBRARY_DIR "${RSTUDIO_TOOLS_SOCI}/build/lib")
|
||||
if(NOT APPLE AND RSTUDIO_USE_SYSTEM_SOCI)
|
||||
- set(SOCI_LIBRARY_DIR "/usr/lib")
|
||||
+ set(SOCI_LIBRARY_DIR "${FREEBSD_LOCALBASE}/lib")
|
||||
endif()
|
||||
- find_library(SOCI_CORE_LIB NAMES "libsoci_core.a" "soci_core" PATHS "${SOCI_LIBRARY_DIR}" NO_DEFAULT_PATH)
|
||||
- find_library(SOCI_SQLITE_LIB NAMES "libsoci_sqlite3.a" "soci_sqlite3" PATHS "${SOCI_LIBRARY_DIR}" NO_DEFAULT_PATH)
|
||||
- find_library(SOCI_POSTGRESQL_LIB NAMES "libsoci_postgresql.a" "soci_postgresql" PATHS "${SOCI_LIBRARY_DIR}" NO_DEFAULT_PATH)
|
||||
+ find_library(SOCI_CORE_LIB NAMES "libsoci_core.so" "soci_core" PATHS "${SOCI_LIBRARY_DIR}" NO_DEFAULT_PATH)
|
||||
+ find_library(SOCI_SQLITE_LIB NAMES "libsoci_sqlite3.so" "soci_sqlite3" PATHS "${SOCI_LIBRARY_DIR}" NO_DEFAULT_PATH)
|
||||
+ find_library(SOCI_POSTGRESQL_LIB NAMES "libsoci_postgresql.so" "soci_postgresql" PATHS "${SOCI_LIBRARY_DIR}" NO_DEFAULT_PATH)
|
||||
find_library(DL_LIB "dl")
|
||||
find_library(SQLITE_LIB "sqlite3")
|
||||
get_filename_component(SQLITE_LIB "${SQLITE_LIB}" REALPATH)
|
||||
- find_library(SOCI_CORE_LIB NAMES "libsoci_core.a" "soci_core")
|
||||
- find_library(SOCI_SQLITE_LIB NAMES "libsoci_sqlite3.a" "soci_sqlite3")
|
||||
- find_library(SOCI_POSTGRESQL_LIB NAMES "libsoci_postgresql.a" "soci_postgresql")
|
||||
+ find_library(SOCI_CORE_LIB NAMES "libsoci_core.so" "soci_core")
|
||||
+ find_library(SOCI_SQLITE_LIB NAMES "libsoci_sqlite3.so" "soci_sqlite3")
|
||||
+ find_library(SOCI_POSTGRESQL_LIB NAMES "libsoci_postgresql.so" "soci_postgresql")
|
||||
if(NOT SOCI_CORE_LIB OR NOT SOCI_SQLITE_LIB OR NOT SOCI_POSTGRESQL_LIB)
|
||||
message(FATAL_ERROR "Some or all SOCI libraries were not found. Ensure the SOCI dependency is installed and try again.")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- src/cpp/core/Backtrace.cpp.orig 2017-11-16 21:40:37 UTC
|
||||
+++ src/cpp/core/Backtrace.cpp
|
||||
@@ -46,7 +46,7 @@ std::string demangle(const std::string&
|
||||
|
||||
void printBacktrace(std::ostream& os)
|
||||
{
|
||||
-#ifndef _WIN32
|
||||
+#if !defined(_WIN32) && !defined(__FreeBSD__)
|
||||
|
||||
os << "Backtrace (most recent calls first):" << std::endl << std::endl;
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- src/cpp/core/CMakeLists.txt.orig 2020-01-23 23:30:24 UTC
|
||||
--- src/cpp/core/CMakeLists.txt.orig 2022-12-03 07:38:59 UTC
|
||||
+++ src/cpp/core/CMakeLists.txt
|
||||
@@ -152,12 +152,14 @@ if (UNIX)
|
||||
@@ -161,12 +161,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)
|
||||
|
|
@ -15,5 +15,5 @@
|
|||
- endif()
|
||||
+ #endif()
|
||||
|
||||
# find packages and libraries
|
||||
find_library(PTHREAD_LIBRARIES pthread)
|
||||
# missing on non-glibc platforms like macOS, musl-based Linux distros, and
|
||||
# the BSDs
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
--- src/cpp/core/r_util/RSessionContext.cpp.orig 2020-01-23 23:30:24 UTC
|
||||
+++ src/cpp/core/r_util/RSessionContext.cpp
|
||||
@@ -186,8 +186,8 @@ bool isSharedPath(const std::string& projectPath,
|
||||
// not shared if we're in any of the groups that own the directory
|
||||
// (note that this checks supplementary group IDs only, so the check
|
||||
// against the primary group ID above is still required)
|
||||
- if (::group_member(st.st_gid))
|
||||
- return false;
|
||||
+// if (::group_member(st.st_gid))
|
||||
+// return false;
|
||||
#endif
|
||||
|
||||
// if we got this far, we likely have access due to project sharing
|
||||
|
|
@ -1,22 +1,18 @@
|
|||
--- src/cpp/core/system/PosixChildProcess.cpp.orig 2022-07-06 19:59:49 UTC
|
||||
--- src/cpp/core/system/PosixChildProcess.cpp.orig 2022-12-30 20:28:33 UTC
|
||||
+++ src/cpp/core/system/PosixChildProcess.cpp
|
||||
@@ -25,9 +25,12 @@
|
||||
#include <sys/ttycom.h>
|
||||
#include <sys/ioctl.h>
|
||||
#else
|
||||
-#include <pty.h>
|
||||
-#include <asm/ioctls.h>
|
||||
-#include <sys/prctl.h>
|
||||
+//#include <pty.h>
|
||||
+//#include <asm/ioctls.h>
|
||||
+//#include <sys/prctl.h>
|
||||
+#include <sys/tty.h>
|
||||
+#include <sys/ttycom.h>
|
||||
@@ -28,6 +28,11 @@
|
||||
#include <pty.h>
|
||||
#include <asm/ioctls.h>
|
||||
#include <sys/prctl.h>
|
||||
+#elif defined(__FreeBSD__) // for forkpty
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/ioctl.h>
|
||||
+#include <termios.h>
|
||||
+#include <libutil.h>
|
||||
#endif
|
||||
|
||||
#include <sys/wait.h>
|
||||
@@ -807,7 +810,7 @@ Error ChildProcess::run()
|
||||
@@ -807,7 +812,7 @@ Error ChildProcess::run()
|
||||
|
||||
if (options_.exitWithParent)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
--- src/cpp/core/system/PosixSched.cpp.orig 2020-05-18 18:11:10 UTC
|
||||
+++ src/cpp/core/system/PosixSched.cpp
|
||||
@@ -41,7 +41,7 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus)
|
||||
|
||||
Error getCpuAffinity(CpuAffinity* pCpus)
|
||||
{
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
cpu_set_t cs;
|
||||
CPU_ZERO(&cs);
|
||||
if (::sched_getaffinity(0, sizeof(cs), &cs) == -1)
|
||||
@@ -66,7 +66,7 @@ Error getCpuAffinity(CpuAffinity* pCpus)
|
||||
|
||||
Error setCpuAffinity(const CpuAffinity& cpus)
|
||||
{
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
cpu_set_t cs;
|
||||
CPU_ZERO(&cs);
|
||||
|
||||
|
|
@ -1,24 +1,8 @@
|
|||
- one of the patches is a workaround for access to /proc/{pid}/fd : https://github.com/rstudio/rstudio/issues/8912
|
||||
|
||||
--- src/cpp/core/system/PosixSystem.cpp.orig 2021-05-24 22:22:25 UTC
|
||||
--- src/cpp/core/system/PosixSystem.cpp.orig 2022-12-03 07:38:59 UTC
|
||||
+++ src/cpp/core/system/PosixSystem.cpp
|
||||
@@ -41,20 +41,25 @@
|
||||
|
||||
#include <shared_core/system/PosixSystem.hpp>
|
||||
|
||||
-#ifdef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
#include <mach-o/dyld.h>
|
||||
#include <sys/proc_info.h>
|
||||
#include <libproc.h>
|
||||
#include <gsl/gsl>
|
||||
#endif
|
||||
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
#include <sys/prctl.h>
|
||||
#include <sys/sysinfo.h>
|
||||
#include <linux/kernel.h>
|
||||
@@ -56,6 +56,11 @@
|
||||
#include <dirent.h>
|
||||
#endif
|
||||
|
||||
|
|
@ -30,7 +14,7 @@
|
|||
#include <boost/thread.hpp>
|
||||
#include <boost/format.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
@@ -560,6 +565,7 @@ Error getOpenFds(std::vector<uint32_t>* pFds)
|
||||
@@ -619,6 +624,7 @@ Error getOpenFds(std::vector<uint32_t>* pFds)
|
||||
#ifndef __APPLE__
|
||||
Error getOpenFds(pid_t pid, std::vector<uint32_t>* pFds)
|
||||
{
|
||||
|
|
@ -38,7 +22,7 @@
|
|||
std::string pidStr = safe_convert::numberToString(pid);
|
||||
boost::format fmt("/proc/%1%/fd");
|
||||
FilePath filePath(boost::str(fmt % pidStr));
|
||||
@@ -586,6 +592,7 @@ Error getOpenFds(pid_t pid, std::vector<uint32_t>* pFd
|
||||
@@ -645,6 +651,7 @@ Error getOpenFds(pid_t pid, std::vector<uint32_t>* pFd
|
||||
pFds->push_back(fd.get());
|
||||
}
|
||||
}
|
||||
|
|
@ -46,7 +30,7 @@
|
|||
|
||||
return Success();
|
||||
}
|
||||
@@ -911,7 +918,7 @@ Error executablePath(const char * argv0,
|
||||
@@ -970,7 +977,7 @@ Error executablePath(const char * argv0,
|
||||
|
||||
#elif defined(HAVE_PROCSELF)
|
||||
|
||||
|
|
@ -55,39 +39,3 @@
|
|||
|
||||
#else
|
||||
|
||||
@@ -1420,7 +1427,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit
|
||||
case CpuLimit:
|
||||
*pLimit = RLIMIT_CPU;
|
||||
break;
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
case NiceLimit:
|
||||
*pLimit = RLIMIT_NICE;
|
||||
break;
|
||||
@@ -1493,7 +1500,7 @@ Error systemInformation(SysInfo* pSysInfo)
|
||||
{
|
||||
pSysInfo->cores = boost::thread::hardware_concurrency();
|
||||
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
struct sysinfo info;
|
||||
if (::sysinfo(&info) == -1)
|
||||
return systemError(errno, ERROR_LOCATION);
|
||||
@@ -1897,7 +1904,7 @@ Error restrictCoreDumps()
|
||||
return error;
|
||||
|
||||
// no ptrace core dumps permitted
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
int res = ::prctl(PR_SET_DUMPABLE, 0);
|
||||
if (res == -1)
|
||||
return systemError(errno, ERROR_LOCATION);
|
||||
@@ -1928,7 +1935,7 @@ void printCoreDumpable(const std::string& context)
|
||||
ostr << " hard limit: " << rLimitHard << std::endl;
|
||||
|
||||
// ptrace
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
int dumpable = ::prctl(PR_GET_DUMPABLE, nullptr, nullptr, nullptr, nullptr);
|
||||
if (dumpable == -1)
|
||||
LOG_ERROR(systemError(errno, ERROR_LOCATION));
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
--- src/cpp/session/SessionMain.cpp.orig 2020-01-23 23:30:24 UTC
|
||||
--- src/cpp/session/SessionMain.cpp.orig 2022-12-03 07:38:59 UTC
|
||||
+++ src/cpp/session/SessionMain.cpp
|
||||
@@ -1711,7 +1711,11 @@ int main (int argc, char * const argv[])
|
||||
|
||||
@@ -1947,7 +1947,11 @@ int main(int argc, char * const argv[])
|
||||
|
||||
// move to own process group
|
||||
#ifndef _WIN32
|
||||
+#if defined(__FreeBSD__)
|
||||
|
|
@ -11,4 +11,4 @@
|
|||
+#endif
|
||||
#endif
|
||||
|
||||
// get main thread id (used to distinguish forks which occur
|
||||
logStartingEnv();
|
||||
|
|
|
|||
|
|
@ -1,23 +1,14 @@
|
|||
--- src/cpp/shared_core/system/PosixSystem.cpp.orig 2021-06-09 01:52:44 UTC
|
||||
--- src/cpp/shared_core/system/PosixSystem.cpp.orig 2022-12-30 20:20:59 UTC
|
||||
+++ src/cpp/shared_core/system/PosixSystem.cpp
|
||||
@@ -29,8 +29,10 @@
|
||||
@@ -27,7 +27,11 @@
|
||||
#include <ifaddrs.h>
|
||||
#include <memory.h>
|
||||
#include <netdb.h>
|
||||
+#include <netinet/in.h>
|
||||
#include <pwd.h>
|
||||
+#include <netinet/in.h> // for sa_family_t
|
||||
+#include <sys/socket.h> // for struct sockaddr
|
||||
+#include <sys/socket.h>
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
#ifdef __linux__
|
||||
#include <sys/prctl.h>
|
||||
#endif
|
||||
|
||||
@@ -80,7 +82,7 @@ Error restorePrivilegesImpl(uid_t in_uid)
|
||||
|
||||
Error enableCoreDumps()
|
||||
{
|
||||
-#ifndef __APPLE__
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
int res = ::prctl(PR_SET_DUMPABLE, 1);
|
||||
if (res == -1)
|
||||
return systemError(errno, ERROR_LOCATION);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user