From 652e7327aa55ca3b1ae5ceca58bd153e3e179b55 Mon Sep 17 00:00:00 2001 From: Michael Gehring Date: Sun, 23 Apr 2017 08:42:05 +0000 Subject: [PATCH] rstudio: fix build against R-3.4.0 Closes: #6248 [via git-merge-pr] --- srcpkgs/rstudio/patches/r-3.4.0.patch | 10 ++++++++++ srcpkgs/rstudio/template | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/rstudio/patches/r-3.4.0.patch diff --git a/srcpkgs/rstudio/patches/r-3.4.0.patch b/srcpkgs/rstudio/patches/r-3.4.0.patch new file mode 100644 index 00000000000..696bfddc421 --- /dev/null +++ b/srcpkgs/rstudio/patches/r-3.4.0.patch @@ -0,0 +1,10 @@ +--- src/cpp/r/RRoutines.cpp.orig 2017-04-13 16:16:15.000000000 +0000 ++++ src/cpp/r/RRoutines.cpp 2017-04-23 08:48:22.700317995 +0000 +@@ -59,7 +59,6 @@ + nullMethodDef.fun = NULL ; + nullMethodDef.numArgs = 0 ; + nullMethodDef.types = NULL; +- nullMethodDef.styles = NULL; + s_cMethods.push_back(nullMethodDef); + pCMethods = &s_cMethods[0]; + } diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index 15e9d578b3e..8941b8318a7 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio version=1.0.143 -revision=1 +revision=2 only_for_archs="i686 x86_64" build_style=cmake make_install_args="INSTALL_ROOT=${DESTDIR} \