[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/files/, sci-mathematics/rstudio/

[Pacho Ramos]

commit:     f6bde9a800ea09a38d7e0fab20ee1379bf339a89
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 18:25:07 2021 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 18:34:33 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6bde9a8

sci-mathematics/rstudio: Fix build with boost-1.76.0

Thanks-to: Dmitry S. Kulyabov
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>

 .../files/rstudio-1.3.1093-boost-1.76.patch        | 55 ++++++++++++++++++++++
 sci-mathematics/rstudio/rstudio-1.3.1093.ebuild    |  2 +
 2 files changed, 57 insertions(+)

diff --git a/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch b/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch
new file mode 100644
index 00000000000..5e832db2883
--- /dev/null
+++ b/sci-mathematics/rstudio/files/rstudio-1.3.1093-boost-1.76.patch
@@ -0,0 +1,55 @@
+--- rstudio-1.3.1093-orig/src/cpp/r/session/RStdCallbacks.cpp
++++ rstudio-1.3.1093/src/cpp/r/session/RStdCallbacks.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <boost/function.hpp>
+ #include <boost/regex.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ 
+ #include <r/RExec.hpp>
+ #include <r/ROptions.hpp>
+@@ -58,6 +58,7 @@ __declspec(dllimport) SA_TYPE SaveAction
+ }
+ 
+ using namespace rstudio::core;
++using namespace boost::placeholders;
+ 
+ namespace rstudio {
+ namespace r {
+--- rstudio-1.3.1093-orig/src/cpp/core/HtmlUtils.cpp.orig
++++ rstudio-1.3.1093/src/cpp/core/HtmlUtils.cpp
+@@ -19,13 +19,15 @@
+ 
+ #include <boost/format.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ 
+ #include <core/Base64.hpp>
+ #include <core/FileSerializer.hpp>
+ #include <core/RegexUtils.hpp>
+ 
+ #include <core/http/Util.hpp>
++
++using namespace boost::placeholders;
+ 
+ namespace rstudio {
+ namespace core {
+--- rstudio-1.3.1093-orig/src/cpp/core/file_lock/FileLock.cpp.orig
++++ rstudio-1.3.1093/src/cpp/core/file_lock/FileLock.cpp
+@@ -26,10 +26,12 @@
+ #include <core/system/Environment.hpp>
+ 
+ #include <boost/algorithm/string.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ 
+ // borrowed from SessionConstants.hpp
+ #define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE"
++
++using namespace boost::placeholders;
+ 
+ namespace rstudio {
+ namespace core {
+ 
\ No newline at end of file

diff --git a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
index 4fee0074c08..851ffef54c9 100644
--- a/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
+++ b/sci-mathematics/rstudio/rstudio-1.3.1093.ebuild
@@ -95,6 +95,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.5042-boost-1.73.0.patch
 	"${FILESDIR}"/${PN}-1.3.1056-R-4.0.0.patch
 	"${FILESDIR}"/${PN}-1.3.1056-boost-1.74.0.patch
+	"${FILESDIR}"/${PN}-1.3.1093-boost-1.76.patch
 )
 
 src_unpack() {
@@ -177,6 +178,7 @@ src_configure() {
 		-DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")")
 		-DRSTUDIO_VERIFY_R_VERSION=FALSE
 		-DRSTUDIO_USE_SYSTEM_BOOST=TRUE
+		-DRSTUDIO_BOOST_SIGNALS_VERSION=2
 		)
 
 	if use !dedicated; then