svn commit: r534702 - in head/devel/RStudio: . files
Yuri Victorovich
yuri at FreeBSD.org
Sat May 9 03:10:06 UTC 2020
Author: yuri
Date: Sat May 9 03:10:05 2020
New Revision: 534702
URL: https://svnweb.freebsd.org/changeset/ports/534702
Log:
devel/RStudio: Unbreak the build after math/R upgrade to 4.0.0
Backport the patch.
PR: 246310
Reported by: fallout, Robert Cina <transitive at gmail.com>
Added:
head/devel/RStudio/files/patch-src_cpp_r_session_REmbeddedPosix.cpp (contents, props changed)
Modified:
head/devel/RStudio/Makefile
head/devel/RStudio/distinfo
Modified: head/devel/RStudio/Makefile
==============================================================================
--- head/devel/RStudio/Makefile Sat May 9 01:52:02 2020 (r534701)
+++ head/devel/RStudio/Makefile Sat May 9 03:10:05 2020 (r534702)
@@ -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
Modified: head/devel/RStudio/distinfo
==============================================================================
--- head/devel/RStudio/distinfo Sat May 9 01:52:02 2020 (r534701)
+++ head/devel/RStudio/distinfo Sat May 9 03:10:05 2020 (r534702)
@@ -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
Added: head/devel/RStudio/files/patch-src_cpp_r_session_REmbeddedPosix.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/RStudio/files/patch-src_cpp_r_session_REmbeddedPosix.cpp Sat May 9 03:10:05 2020 (r534702)
@@ -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
More information about the svn-ports-head
mailing list