From 0f30a15a0cdabaf5205f1dccbf0647b796cf7f72 Mon Sep 17 00:00:00 2001 From: John Date: Thu, 30 Apr 2020 21:29:50 +0200 Subject: [PATCH] rstudio: update to 1.2.5042. --- srcpkgs/rstudio/patches/boost173.patch | 26 ++++++++++++++++++++++++++ srcpkgs/rstudio/template | 6 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/rstudio/patches/boost173.patch diff --git a/srcpkgs/rstudio/patches/boost173.patch b/srcpkgs/rstudio/patches/boost173.patch new file mode 100644 index 00000000000..cffe1cbaa18 --- /dev/null +++ b/srcpkgs/rstudio/patches/boost173.patch @@ -0,0 +1,26 @@ +--- src/cpp/core/system/PosixChildProcessTracker.cpp 2020-04-01 18:16:24.000000000 +0200 ++++ - 2020-05-01 18:29:14.359052359 +0200 +@@ -60,7 +60,7 @@ + std::for_each(processes.begin(), + processes.end(), + boost::bind(&ChildProcessTracker::attemptToReapProcess, +- this, _1)); ++ this, boost::placeholders::_1)); + } + + void ChildProcessTracker::attemptToReapProcess( +--- src/cpp/core/system/PosixOutputCapture.cpp 2020-04-01 18:16:24.000000000 +0200 ++++ - 2020-05-01 18:30:02.132088380 +0200 +@@ -80,10 +80,10 @@ + }; + + if (dupStdoutFd != -1) +- outHandler = boost::bind(wrapHandler, stdoutHandler, dupStdoutFd, _1); ++ outHandler = boost::bind(wrapHandler, stdoutHandler, dupStdoutFd, boost::placeholders::_1); + + if (dupStderrFd != -1) +- errHandler = boost::bind(wrapHandler, stderrHandler, dupStderrFd, _1); ++ errHandler = boost::bind(wrapHandler, stderrHandler, dupStderrFd, boost::placeholders::_1); + + try + { diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index d219beb9410..ef128b19569 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio -version=1.2.5033 -revision=2 +version=1.2.5042 +revision=1 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_BOOST_SIGNALS_VERSION=2 @@ -25,7 +25,7 @@ distfiles="https://github.com/rstudio/rstudio/archive/v${version}.tar.gz ${_aws}/rstudio-dictionaries/core-dictionaries.zip ${_aws}/rstudio-buildtools/gin-${_gin_version}.zip ${_aws}/rstudio-buildtools/gwt-${_gwt_version}.zip" -checksum="ff5115bda56ee0fdee0ae2eb014ce5379774aeb3714a257a52da5b91a95e4408 +checksum="2bcd1d525d92e9ce42f4c7a57383c025e10d34313f8ed245429f02980b47c1fc 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494 b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7"