mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-01 05:45:45 +00:00
Code Issues Releases Activity

devel/RStudio: Update 1.2.5042 -> 1.3.959

Browse Source 
Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2020-05-23 18:20:01 +00:00
parent ea15c33039
commit 4fa63fbae4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=536328
8 changed files with 57 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
devel/RStudio/Makefile
View File

@ -5,18 +5,14 @@
PORTNAME= RStudio
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.5042
PORTREVISION= 1
DISTVERSION= 1.3.959
CATEGORIES= devel math java
MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
https://s3.amazonaws.com/rstudio-buildtools/:buildtools
DISTFILES= core-dictionaries.zip:dictionaries \
gin-${GIN_VERSION}.zip:buildtools \
gwt-${GWT_VERSION}.zip:buildtools \
mathjax-26.zip:buildtools
PATCH_SITES= https://github.com/rstudio/rstudio/commit/
PATCHFILES+= 33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch:-p1 # https://github.com/rstudio/rstudio/commit/33c2c42d40ad97d97ca3907df51059cd2ce76fe3
mathjax-27.zip:buildtools
MAINTAINER= yuri@FreeBSD.org
COMMENT= Integrated development environment (IDE) for R

12
devel/RStudio/distinfo
View File

@ -1,14 +1,14 @@
TIMESTAMP = 1588990554
TIMESTAMP = 1590254502
SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
SIZE (core-dictionaries.zip) = 876339
SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
SIZE (gin-2.1.2.zip) = 1341053
SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7
SIZE (gwt-2.8.1.zip) = 95650299
SHA256 (mathjax-26.zip) = 939a2d7f37e26287970be942df70f3e8f272bac2eb868ce1de18bb95d3c26c71
SIZE (mathjax-26.zip) = 3061588
SHA256 (RStudio-rstudio-v1.2.5042_GH0.tar.gz) = 2bcd1d525d92e9ce42f4c7a57383c025e10d34313f8ed245429f02980b47c1fc
SIZE (RStudio-rstudio-v1.2.5042_GH0.tar.gz) = 20456999
SHA256 (mathjax-27.zip) = c56cbaa6c4ce03c1fcbaeb2b5ea3c312d2fb7626a360254770cbcb88fb204176
SIZE (mathjax-27.zip) = 3285230
SHA256 (RStudio-rstudio-v1.3.959_GH0.tar.gz) = 5c89fe18e3d5ead0e7921c88e5fb42ed816823238e84135f5e9e3a364d35fcc1
SIZE (RStudio-rstudio-v1.3.959_GH0.tar.gz) = 89639419
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
@ -17,5 +17,3 @@ SHA256 (rstudio-rsconnect-03c379b_GH0.tar.gz) = d24b6ee49f32f650f6d10bbfc7b2f61a
SIZE (rstudio-rsconnect-03c379b_GH0.tar.gz) = 220711
SHA256 (trestletech-plumber-v0.4.6_GH0.tar.gz) = 7bcbfdf5a8a2e3a051d2c673ac5ac51a483ed888afe73116cba7741dbb5f63a6
SIZE (trestletech-plumber-v0.4.6_GH0.tar.gz) = 83332
SHA256 (33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch) = d252111e28a7de8602b4df1f66b36dded260061f094b504895e5c789f8681091
SIZE (33c2c42d40ad97d97ca3907df51059cd2ce76fe3.patch) = 4875

57
devel/RStudio/files/patch-src_cpp_core_system_PosixSched.cpp
View File

@ -1,57 +1,20 @@
--- src/cpp/core/system/PosixSched.cpp.orig 2020-04-01 16:16:24 UTC
--- src/cpp/core/system/PosixSched.cpp.orig 2020-05-18 18:11:10 UTC
+++ src/cpp/core/system/PosixSched.cpp
@@ -15,8 +15,13 @@
@@ -41,7 +41,7 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus)
#include <core/system/PosixSched.hpp>
+#define _GNU_SOURCE
#include <sched.h>
+#include <sys/types.h>
+#include <sys/param.h> // w/out this fails on i386 with error: use of undeclared identifier 'NBBY'
+#include <sys/cpuset.h>
+
#include <core/Error.hpp>
namespace rstudio {
@@ -41,9 +46,10 @@ bool isCpuAffinityEmpty(const CpuAffinity& cpus)
Error getCpuAffinity(CpuAffinity* pCpus)
{
#ifndef __APPLE__
- cpu_set_t cs;
+/*
+ cpuset_t cs;
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
cpu_set_t cs;
CPU_ZERO(&cs);
- if (::sched_getaffinity(0, sizeof(cs), &cs) == -1)
+ if (sched_getaffinity(0, sizeof(cs), &cs) == -1)
return systemError(errno, ERROR_LOCATION);
if (::sched_getaffinity(0, sizeof(cs), &cs) == -1)
@@ -66,7 +66,7 @@ Error getCpuAffinity(CpuAffinity* pCpus)
pCpus->clear();
@@ -55,7 +61,7 @@ Error getCpuAffinity(CpuAffinity* pCpus)
else
pCpus->push_back(false);
}
-
+*/
return Success();
#else
return systemError(boost::system::errc::not_supported, ERROR_LOCATION);
@@ -66,7 +72,8 @@ Error getCpuAffinity(CpuAffinity* pCpus)
Error setCpuAffinity(const CpuAffinity& cpus)
{
#ifndef __APPLE__
- cpu_set_t cs;
+/*
+ cpuset_t cs;
-#ifndef __APPLE__
+#if !defined(__APPLE__) && !defined(__FreeBSD__)
cpu_set_t cs;
CPU_ZERO(&cs);
for (std::size_t i=0; i<cpus.size(); i++)
@@ -79,7 +86,7 @@ Error setCpuAffinity(const CpuAffinity& cpus)
if (::sched_setaffinity(0, sizeof(cs), &cs) == -1)
return systemError(errno, ERROR_LOCATION);
-
+*/
return Success();
#else
return systemError(boost::system::errc::not_supported, ERROR_LOCATION);

26
devel/RStudio/files/patch-src_cpp_core_system_PosixSystem.cpp
View File

@ -1,7 +1,15 @@
--- src/cpp/core/system/PosixSystem.cpp.orig 2020-04-01 16:16:24 UTC
--- src/cpp/core/system/PosixSystem.cpp.orig 2020-05-18 18:11:10 UTC
+++ src/cpp/core/system/PosixSystem.cpp
@@ -46,13 +46,18 @@
@@ -40,20 +40,25 @@
#include <uuid/uuid.h>
-#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__
@ -20,7 +28,7 @@
#include <boost/thread.hpp>
#include <boost/format.hpp>
#include <boost/lexical_cast.hpp>
@@ -920,7 +925,7 @@ Error executablePath(const char * argv0,
@@ -917,7 +922,7 @@ Error executablePath(const char * argv0,
#elif defined(HAVE_PROCSELF)
@ -29,7 +37,7 @@
#else
@@ -1429,7 +1434,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit
@@ -1426,7 +1431,7 @@ Error osResourceLimit(ResourceLimit limit, int* pLimit
case CpuLimit:
*pLimit = RLIMIT_CPU;
break;
@ -38,7 +46,7 @@
case NiceLimit:
*pLimit = RLIMIT_NICE;
break;
@@ -1502,7 +1507,7 @@ Error systemInformation(SysInfo* pSysInfo)
@@ -1499,7 +1504,7 @@ Error systemInformation(SysInfo* pSysInfo)
{
pSysInfo->cores = boost::thread::hardware_concurrency();
@ -47,7 +55,7 @@
struct sysinfo info;
if (::sysinfo(&info) == -1)
return systemError(errno, ERROR_LOCATION);
@@ -1942,7 +1947,7 @@ Error restrictCoreDumps()
@@ -1939,7 +1944,7 @@ Error restrictCoreDumps()
return error;
// no ptrace core dumps permitted
@ -56,7 +64,7 @@
int res = ::prctl(PR_SET_DUMPABLE, 0);
if (res == -1)
return systemError(errno, ERROR_LOCATION);
@@ -1953,7 +1958,7 @@ Error restrictCoreDumps()
@@ -1950,7 +1955,7 @@ Error restrictCoreDumps()
Error enableCoreDumps()
{
@ -65,12 +73,12 @@
int res = ::prctl(PR_SET_DUMPABLE, 1);
if (res == -1)
return systemError(errno, ERROR_LOCATION);
@@ -1979,7 +1984,7 @@ void printCoreDumpable(const std::string& context)
@@ -1976,7 +1981,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, NULL, NULL, NULL, NULL);
int dumpable = ::prctl(PR_GET_DUMPABLE, nullptr, nullptr, nullptr, nullptr);
if (dumpable == -1)
LOG_ERROR(systemError(errno, ERROR_LOCATION));

10
devel/RStudio/files/patch-src_cpp_desktop_DesktopMain.cpp
View File

@ -1,15 +1,15 @@
--- src/cpp/desktop/DesktopMain.cpp.orig 2020-04-01 16:16:24 UTC
--- src/cpp/desktop/DesktopMain.cpp.orig 2020-05-18 18:11:10 UTC
+++ src/cpp/desktop/DesktopMain.cpp
@@ -42,6 +42,8 @@
#include "DesktopNetworkProxyFactory.hpp"
@@ -47,6 +47,8 @@
#include "DesktopActivationOverlay.hpp"
#include "DesktopSessionServersOverlay.hpp"
+#include "global-setenv.h"
+
#ifdef _WIN32
#include <core/system/RegistryKey.hpp>
#include <Windows.h>
@@ -367,7 +369,7 @@ QString inferDefaultRenderingEngine()
@@ -372,7 +374,7 @@ QString inferDefaultRenderingEngine()
#endif
@ -18,7 +18,7 @@
QString inferDefaultRenderingEngine()
{
@@ -426,6 +428,7 @@ void initializeRenderingEngine(std::vector<char*>* pAr
@@ -461,6 +463,7 @@ std::string getSessionUrl()
int main(int argc, char* argv[])
{

30
devel/RStudio/files/patch-src_cpp_session_CMakeLists.txt
View File

@ -1,8 +1,8 @@
--- src/cpp/session/CMakeLists.txt.orig 2020-04-01 16:16:24 UTC
--- src/cpp/session/CMakeLists.txt.orig 2020-05-18 18:11:10 UTC
+++ src/cpp/session/CMakeLists.txt
@@ -25,9 +25,9 @@ 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)")
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-27")
message(FATAL_ERROR "Mathjax 2.7 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)")
@ -11,10 +11,10 @@
+# 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
@@ -39,19 +39,19 @@ endif()
# endif()
# verify embedded packages are available
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
@@ -38,19 +38,19 @@ foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
endforeach()
# verify libclang is installed (Windows only)
-if(WIN32)
@ -45,9 +45,9 @@
# include files
file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*")
@@ -366,6 +366,9 @@ endif()
@@ -391,6 +391,9 @@ endif()
# define executable
add_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
add_stripped_executable(rsession ${SESSION_SOURCE_FILES} ${SESSION_HEADER_FILES})
+# additional libraries
+target_link_libraries(rsession -L${FREEBSD_LIBDIR} -linotify -lprocstat)
@ -55,9 +55,9 @@
# skip libR RPATH at development time
if(RSTUDIO_DEVELOPMENT OR RSTUDIO_RUN_IN_PLACE)
set_target_properties(rsession PROPERTIES SKIP_BUILD_RPATH TRUE)
@@ -497,11 +500,11 @@ if (NOT RSTUDIO_SESSION_WIN32)
set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
endif()
@@ -519,11 +522,11 @@ if (NOT RSTUDIO_SESSION_WIN32)
# install pandoc
set(PANDOC_VERSION "2.7.3" CACHE INTERNAL "Pandoc version")
- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
@ -70,9 +70,9 @@
+ # 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")
@@ -534,18 +537,18 @@ if (NOT RSTUDIO_SESSION_WIN32)
# install embedded packages
foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
@@ -558,18 +561,18 @@ if (NOT RSTUDIO_SESSION_WIN32)
DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
# install libclang

4
devel/RStudio/files/patch-src_cpp_session_session-config.h.in
View File

@ -1,4 +1,4 @@
--- src/cpp/session/session-config.h.in.orig 2020-04-01 16:16:24 UTC
--- src/cpp/session/session-config.h.in.orig 2020-05-18 18:11:10 UTC
+++ src/cpp/session/session-config.h.in
@@ -13,11 +13,11 @@
*
@ -14,4 +14,4 @@
+#define RSTUDIO_BUILD_ID "FreeBSD-port-version-${FREEBSD_RSTUDIO_VERSION}"
#define RSTUDIO_BUILD_DATE "${CPACK_BUILD_DATE}"
#define RSTUDIO_COPYRIGHT_YEAR "${CPACK_COPYRIGHT_YEAR}"
#cmakedefine RSTUDIO_SERVER
#define RSTUDIO_PACKAGE_OS "${RSTUDIO_PACKAGE_OS}"

2
devel/RStudio/pkg-descr
View File

@ -3,4 +3,4 @@ It includes a console, syntax-highlighting editor that supports direct
code execution, as well as tools for plotting, history, debugging and
workspace management.
WWW: https://www.rstudio.com/
WWW: https://rstudio.com/