commit 535fb48cc2a7d62b39cb2e41dd4d046c40094980 Author: Tim Biermann <tbier@posteo.de> Date: Fri Aug 21 08:05:58 2020 +0000 rstudio: fixed against boost-1.74.0 diff --git a/rstudio/.signature b/rstudio/.signature index 086437ec9..b632c298c 100644 --- a/rstudio/.signature +++ b/rstudio/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3y1vEeLd6JJ91pkKDNo5Co/nE1be477tnOlWzmV/B/yHVt71eSn5H6l9i9u77CEk0mTPhBzH/EqVvmKj7BWN1Qc= -SHA256 (Pkgfile) = 97d757360eaf11e3241e1bc644b64b2f2ac9107bd5e5adde57a0c84e51aab46a +RWSagIOpLGJF37FNutvnvqIGy+T0Mmp7qnzXqDd7WVsTF7GC4Rjg3jQmc/xCvJLXQxZHq+g5iqszY2iPjcmBmsCuuP1NoLRYcwY= +SHA256 (Pkgfile) = 28d62521c6ea72f8c5ffcd42eaf14c29c0974e7730e3da3d2dcbd8b71065bd00 SHA256 (.footprint) = 5f1390894f090612db1afb960e7c2895e3fc1ce4ed03e4e98868b3f0571f391c SHA256 (rstudio-1.3.1073.tar.gz) = 18f7af9b9b24f2c43d4df11beb20e97f122a4a53adb0e9e5b3c4283710a49b0b SHA256 (rstudio-1.2.5042-boost-1.73.0.patch) = 5d282059731b64579c0f8c8eeb280b4c4efe810ce829ad7332385b0a92e1215e +SHA256 (rstudio-1.3.1056-boost-1.74.0.patch) = e952b6f55b0ffa7eab7ba6fca8126dd8202f37b84687d97bbd1d9d324a099065 diff --git a/rstudio/Pkgfile b/rstudio/Pkgfile index 7da379d4c..51b94e51a 100644 --- a/rstudio/Pkgfile +++ b/rstudio/Pkgfile @@ -9,7 +9,7 @@ release=1 source=(https://github.com/rstudio/rstudio/archive/v$version/$name-$version.tar.gz # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-mathematics/rstudio/files - rstudio-1.2.5042-boost-1.73.0.patch) + rstudio-1.2.5042-boost-1.73.0.patch rstudio-1.3.1056-boost-1.74.0.patch) git=(https://github.com/rstudio/rstudio.git) build() { @@ -18,7 +18,7 @@ build() { #git checkout v$version $name patch -Np1 -d $name-$version -i $SRC/rstudio-1.2.5042-boost-1.73.0.patch - + patch -Np1 -d $name-$version -i $SRC/rstudio-1.3.1056-boost-1.74.0.patch pushd $name-$version/dependencies/common install -d pandoc ln -sfT /usr/share/myspell/dicts dictionaries diff --git a/rstudio/rstudio-1.3.1056-boost-1.74.0.patch b/rstudio/rstudio-1.3.1056-boost-1.74.0.patch new file mode 100644 index 000000000..2fde3119e --- /dev/null +++ b/rstudio/rstudio-1.3.1056-boost-1.74.0.patch @@ -0,0 +1,30 @@ +--- rstudio-1.3.1056-orig/src/cpp/core/file_lock/FileLock.cpp 2020-07-08 08:25:03.000000000 +1000 ++++ rstudio-1.3.1056/src/cpp/core/file_lock/FileLock.cpp 2020-07-17 18:01:57.016882590 +1000 +@@ -26,6 +26,7 @@ + #include <core/system/Environment.hpp> + + #include <boost/algorithm/string.hpp> ++#include <boost/bind.hpp> + + // borrowed from SessionConstants.hpp + #define kRStudioSessionRoute "RSTUDIO_SESSION_ROUTE" +--- rstudio-1.3.1056-orig/src/cpp/core/HtmlUtils.cpp 2020-07-08 08:25:03.000000000 +1000 ++++ rstudio-1.3.1056/src/cpp/core/HtmlUtils.cpp 2020-07-17 18:01:58.129886387 +1000 +@@ -19,6 +19,7 @@ + + #include <boost/format.hpp> + #include <boost/algorithm/string/predicate.hpp> ++#include <boost/bind.hpp> + + #include <core/Base64.hpp> + #include <core/FileSerializer.hpp> +--- rstudio-1.3.1056-orig/src/cpp/r/session/RStdCallbacks.cpp 2020-07-08 08:25:03.000000000 +1000 ++++ rstudio-1.3.1056/src/cpp/r/session/RStdCallbacks.cpp 2020-07-17 18:32:09.044071640 +1000 +@@ -19,6 +19,7 @@ + + #include <boost/function.hpp> + #include <boost/regex.hpp> ++#include <boost/bind.hpp> + + #include <r/RExec.hpp> + #include <r/ROptions.hpp>