rstudio: 1.2.5042 -> 1.3.959
This commit is contained in:
parent
230226be3c
commit
64328a81dc
1263
rstudio/.footprint
1263
rstudio/.footprint
File diff suppressed because it is too large
Load Diff
|
|
@ -1,12 +1,7 @@
|
|||
untrusted comment: verify with /etc/ports/contrib.pub
|
||||
RWSagIOpLGJF3zNSASryMVzyTNdta5KnJ9OSN172yGaM+8fBV79LWdH5eB+yb6HBZ0IdszSOba271oXQQi7lnVpGaerY1TJMoQs=
|
||||
SHA256 (Pkgfile) = 9cf2cb83524ea25e75834f3a432a7c96ec0dbfb8250e53552bf8fe7eb6e3f508
|
||||
SHA256 (.footprint) = bcde50a8850d52066713cd22252d77e2a3afcc7eb436b954816a5ef82594db16
|
||||
SHA256 (rstudio-1.2.5042.tar.gz) = 2bcd1d525d92e9ce42f4c7a57383c025e10d34313f8ed245429f02980b47c1fc
|
||||
SHA256 (gin-2.1.2.zip) = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
|
||||
SHA256 (gwt-2.8.1.zip) = 0b7af89fdadb4ec51cdb400ace94637d6fe9ffa401b168e2c3d372392a00a0a7
|
||||
SHA256 (core-dictionaries.zip) = 4341a9630efb9dcf7f215c324136407f3b3d6003e1c96f2e5e1f9f14d5787494
|
||||
SHA256 (rstudio-1.2.1335-boost-1.70.0_p1.patch) = 0e7a4e1e6c43d0dcee80c63ffdebbaf8335a4a693ab693e9dab75d85edd0d24a
|
||||
SHA256 (rstudio-1.2.1335-boost-1.70.0_p2.patch) = 3add12ebcdab67ad14ac6ec4bf5e960a08a829ebd40442843513d7c3243f3445
|
||||
RWSagIOpLGJF393DYNlLhrXs+Z5XaG/yTsSC0v5Ug+gTPxEqCYea6IM1DtP/jcmXZF9Q18eYRFKn35vsrGUAhphhXx6k+olL/A8=
|
||||
SHA256 (Pkgfile) = 039ad16f72829232448ba02cc3def614f1748c92097eaa3d3f23c1862e47133c
|
||||
SHA256 (.footprint) = bf3fa23bf5e92b768b35aad58d193e3911f4bbbf69a901b871e22168a5bd53c8
|
||||
SHA256 (rstudio-1.3.959.tar.gz) = 5c89fe18e3d5ead0e7921c88e5fb42ed816823238e84135f5e9e3a364d35fcc1
|
||||
SHA256 (rstudio-1.2.5042-boost-1.73.0.patch) = 5d282059731b64579c0f8c8eeb280b4c4efe810ce829ad7332385b0a92e1215e
|
||||
SHA256 (r-nosave.patch) = 88d6924605de8d9e50c545bbf1e18a1146db8756be3d65e3e47e7cc1f7f324be
|
||||
|
|
|
|||
|
|
@ -4,69 +4,35 @@
|
|||
# Depends on: ant boost hyphen libevent mathjax openjdk8 pandoc-bin qtwebengine r
|
||||
|
||||
name=rstudio
|
||||
version=1.2.5042
|
||||
release=2
|
||||
version=1.3.959
|
||||
release=1
|
||||
|
||||
# $SRC/$name-$version/dependencies/common/install-gwt
|
||||
_gwtver=2.8.1
|
||||
_ginver=2.1.2
|
||||
|
||||
source=(
|
||||
https://github.com/rstudio/rstudio/archive/v$version/$name-$version.tar.gz
|
||||
https://s3.amazonaws.com/rstudio-buildtools/gin-$_ginver.zip
|
||||
https://s3.amazonaws.com/rstudio-buildtools/gwt-$_gwtver.zip
|
||||
https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
|
||||
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.1335-boost-1.70.0_p1.patch rstudio-1.2.1335-boost-1.70.0_p2.patch
|
||||
rstudio-1.2.5042-boost-1.73.0.patch
|
||||
# https://github.com/rstudio/rstudio/commit/60dd6e3cd349cc208e33a12635378a1e338f8efc.patch
|
||||
r-nosave.patch)
|
||||
git=(https://github.com/rstudio/rstudio.git)
|
||||
|
||||
unpack_source() {
|
||||
for file in ${source[@]}; do
|
||||
case ${file##*/} in
|
||||
rstudio-$version.tar.gz)
|
||||
bsdtar -p -o -C $SRC -xf $(get_filename $file) ;;
|
||||
#if you need a git based build, comment the line above and uncomment the line below
|
||||
#git clone $git $SRC/$name-$version ;;
|
||||
gwt-$_gwtver.zip)
|
||||
gwtdir=$SRC/$name-$version/src/gwt
|
||||
|
||||
install -d $gwtdir/dictionaries
|
||||
install -d $gwtdir/lib/gwt
|
||||
install -d $gwtdir/lib/gwt/$_gwtver
|
||||
unzip -qd $gwtdir/lib/gwt/$_gwtver $(get_filename $file) # ;;
|
||||
mv $gwtdir/lib/gwt/$_gwtver/gwt-$_gwtver/* $gwtdir/lib/gwt/$_gwtver ;;
|
||||
gin-$_ginver.zip)
|
||||
gwtdir=$SRC/$name-$version/src/gwt
|
||||
install -d $gwtdir/lib/gin
|
||||
install -d $gwtdir/lib/gin/$_ginver
|
||||
unzip -qo $(get_filename $file) -d $gwtdir/lib/gin/$_ginver ;;
|
||||
*)
|
||||
cp $(get_filename $file) $SRC ;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
build() {
|
||||
## if you want your git snapshot to be a particular version
|
||||
## uncomment below and change every occurance of $name-$version to $name
|
||||
#git checkout v$version $name
|
||||
|
||||
patch -Np1 -d $name-$version -i $SRC/rstudio-1.2.1335-boost-1.70.0_p1.patch
|
||||
patch -Np1 -d $name-$version -i $SRC/rstudio-1.2.1335-boost-1.70.0_p2.patch
|
||||
patch -Np1 -d $name-$version -i $SRC/rstudio-1.2.5042-boost-1.73.0.patch
|
||||
|
||||
sed -i 's/2009-12/2009-19/g' $name-$version/src/cpp/r/session/REmbeddedPosix.cpp
|
||||
sed -i 's/PBC/Inc./g' $name-$version/src/cpp/r/config.h.in
|
||||
sed -i 's/PBC/Inc./g' $name-$version/src/cpp/r/session/REmbeddedPosix.cpp
|
||||
patch -Np1 -d $name-$version -i $SRC/r-nosave.patch
|
||||
|
||||
pushd $name-$version/dependencies/common
|
||||
install -d pandoc
|
||||
ln -sfT /usr/share/myspell/dicts dictionaries
|
||||
ln -sfT /usr/share/mathjax mathjax-26
|
||||
ln -sfT /usr/share/mathjax mathjax-27
|
||||
ln -sfT /usr/bin/pandoc pandoc/pandoc
|
||||
ln -sfT /usr/bin/pandoc-citeproc pandoc/pandoc-citeproc
|
||||
export R_LIBS_USER="$PKG/usr/lib/R/library/"
|
||||
bash install-packages
|
||||
popd
|
||||
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-28 16:08:20.000000000 +1100
|
||||
+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-08-20 22:38:53.808923305 +1000
|
||||
@@ -296,7 +296,11 @@
|
||||
*/
|
||||
timer_ptr set_timer(long duration, timer_handler callback) {
|
||||
timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
|
||||
+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
|
||||
+ *m_io_service,
|
||||
+#else
|
||||
lib::ref(*m_io_service),
|
||||
+#endif
|
||||
boost::posix_time::milliseconds(duration)
|
||||
);
|
||||
|
||||
--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-28 16:08:20.000000000 +1100
|
||||
+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-08-20 22:38:53.822923358 +1000
|
||||
@@ -184,7 +184,12 @@
|
||||
m_io_service = ptr;
|
||||
m_external_io_service = true;
|
||||
m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
|
||||
- lib::ref(*m_io_service));
|
||||
+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
|
||||
+ *m_io_service
|
||||
+#else
|
||||
+ lib::ref(*m_io_service)
|
||||
+#endif
|
||||
+ );
|
||||
|
||||
m_state = READY;
|
||||
ec = lib::error_code();
|
||||
--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-28 16:08:20.000000000 +1100
|
||||
+++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-08-20 22:38:53.823923362 +1000
|
||||
@@ -167,7 +167,12 @@
|
||||
}
|
||||
|
||||
m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
|
||||
- lib::ref(*service));
|
||||
+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
|
||||
+ *service
|
||||
+#else
|
||||
+ lib::ref(*service)
|
||||
+#endif
|
||||
+ );
|
||||
|
||||
m_state = READY;
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
--- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-03-28 16:08:20.000000000 +1100
|
||||
+++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-04-09 22:08:45.331273559 +1000
|
||||
@@ -77,7 +77,13 @@
|
||||
{
|
||||
// start a timer that will cancel any outstanding asynchronous operations
|
||||
// when it elapses if the connection operation has not succeeded
|
||||
- pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout));
|
||||
+ pConnectionTimer_.reset(new boost::asio::deadline_timer(
|
||||
+#if BOOST_VERSION >= 107000
|
||||
+ resolver_.get_executor(),
|
||||
+#else
|
||||
+ resolver_.get_io_service(),
|
||||
+#endif
|
||||
+ timeout));
|
||||
pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout,
|
||||
TcpIpAsyncConnector::shared_from_this(),
|
||||
boost::asio::placeholders::error));
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From a11d0454e5fe9c50005a03b9d9de84355df5c7fd Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Ushey <kevinushey@gmail.com>
|
||||
Date: Fri, 15 Nov 2019 14:54:02 -0800
|
||||
Subject: [PATCH] avoid use of deprecated APIs
|
||||
|
||||
---
|
||||
src/cpp/core/FilePath.cpp | 4 +---
|
||||
1 file changed, 1 insertion(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/cpp/shared_core/FilePath.cpp b/src/cpp/shared_core/FilePath.cpp
|
||||
index 088366a9d6..495289e7fc 100644
|
||||
--- a/src/cpp/core/FilePath.cpp
|
||||
+++ b/src/cpp/core/FilePath.cpp
|
||||
@@ -22,8 +22,6 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
-#define BOOST_FILESYSTEM_NO_DEPRECATED
|
||||
-
|
||||
#define BOOST_NO_CXX11_SCOPED_ENUMS
|
||||
#include <boost/filesystem.hpp>
|
||||
#undef BOOST_NO_CXX11_SCOPED_ENUMS
|
||||
@@ -1032,7 +1030,7 @@
|
||||
{
|
||||
// NOTE: The path gets round-tripped through toString/fromString, would
|
||||
// be nice to have a direct constructor
|
||||
- if (!iterationFunction(itr.level(),
|
||||
+ if (!iterationFunction(itr.depth(),
|
||||
FilePath(BOOST_FS_PATH2STR(itr->path()))))
|
||||
{
|
||||
// end the iteration if requested
|
||||
Loading…
Reference in New Issue
Block a user