freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

devel/RStudio: Unbreak the build after math/R upgrade to 4.0.0

Browse Source 
Backport the patch.

PR:		246310
Reported by:	fallout, Robert Cina <transitive@gmail.com>
This commit is contained in:
Yuri Victorovich
2020-05-09 03:10:05 +00:00
parent 4fad24e2db
commit d940c58d9a
3 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
devel/RStudio/Makefile
View File

@@ -6,6 +6,7 @@
PORTNAME= RStudio
DISTVERSIONPREFIX= v
DISTVERSION= 1.2.5042
PORTREVISION= 1
CATEGORIES= devel math java
MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
https://s3.amazonaws.com/rstudio-buildtools/:buildtools

2
devel/RStudio/distinfo
View File

@@ -1,4 +1,4 @@
TIMESTAMP = 1587507394
TIMESTAMP = 1588990554
SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
SIZE (core-dictionaries.zip) = 876339
SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a

24
devel/RStudio/files/patch-src_cpp_r_session_REmbeddedPosix.cpp Normal file
View File

@@ -0,0 +1,24 @@
part of https://github.com/rstudio/rstudio/pull/6017 to fix the R-4.0.0 compatibility
--- src/cpp/r/session/REmbeddedPosix.cpp.orig 2020-04-01 16:16:24 UTC
+++ src/cpp/r/session/REmbeddedPosix.cpp
@@ -103,14 +105,14 @@ void runEmbeddedR(const core::FilePath& /*rHome*/,
//
structRstart rp;
Rstart Rp = &rp;
- R_DefParams(Rp) ;
- Rp->R_Slave = FALSE ;
+ R_DefParams(Rp);
+ Rp->R_NoEcho = FALSE;
Rp->R_Quiet = quiet ? TRUE : FALSE;
- Rp->R_Interactive = TRUE ;
- Rp->SaveAction = defaultSaveAction ;
+ Rp->R_Interactive = TRUE;
+ Rp->SaveAction = defaultSaveAction;
Rp->RestoreAction = SA_NORESTORE; // handled within initialize()
Rp->LoadInitFile = loadInitFile ? TRUE : FALSE;
- R_SetParams(Rp) ;
+ R_SetParams(Rp);
// redirect console
R_Interactive = TRUE; // should have also been set by call to Rf_initialize_R