From ae45f8a18ffd50b0fdeaff7dc6ee6ee74818a78f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Oct 2017 12:50:48 +0200 Subject: [PATCH 1/2] rstudio: Add version 1.1.383 --- rstudio-1.1.383-0.build.sh | 64 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100755 rstudio-1.1.383-0.build.sh diff --git a/rstudio-1.1.383-0.build.sh b/rstudio-1.1.383-0.build.sh new file mode 100755 index 0000000..154042a --- /dev/null +++ b/rstudio-1.1.383-0.build.sh @@ -0,0 +1,64 @@ +#! /bin/bash + +PKG=rstudio +VERSION=1.1.383 +BUILD=0 +PREFIX=/pkg/$PKG-$VERSION-$BUILD +#PREFIX=/dev/shm/$PKG-$VERSION-$BUILD + +set -xe +umask 022 + +BUILD_TMPDIR=/dev/shm/$PKG-$VERSION-$BUILD.build.tmp +test -d $BUILD_TMPDIR && rm -rf $BUILD_TMPDIR +mkdir -p $BUILD_TMPDIR/home +export TMPDIR=$BUILD_TMPDIR +export HOME=$BUILD_TMPDIR/home + +exec $PREFIX/profile <<-EOF + PATH=$PREFIX/bin:\$PATH +EOF +. $PREFIX/profile + +export MAKEFLAGS="-j $(nproc)" + +BUILD=$PREFIX/build + +mkdir -p $BUILD +cd $BUILD + +mkdir -p disable-sudo +echo 'exec "$@"' >disable-sudo/sudo +chmod +x disable-sudo/sudo +PATH=$BUILD/disable-sudo:$PATH + +QTPREFIX=/usr/local/qt5 + +test -e v$VERSION.tar.gz || wget https://github.com/rstudio/rstudio/archive/v$VERSION.tar.gz +test -d rstudio-$VERSION || tar xf v$VERSION.tar.gz +cd rstudio-$VERSION + +perl -pi -e "s(/opt/rstudio-tools)($PREFIX/rstudio-tools)g" dependencies/common/install-boost src/cpp/CMakeLists.txt + +( cd dependencies/common; ./install-common ) + +IFS=. read -ra VER<<<$VERSION +export RSTUDIO_VERSION_MAJOR=${VER[0]} +export RSTUDIO_VERSION_MINOR=${VER[1]} +export RSTUDIO_VERSION_PATCH=${VER[2]} + +cmake . \ + -DRSTUDIO_TARGET=Desktop \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DQT_QMAKE_EXECUTABLE=${QTPREFIX}/bin/qmake \ + -DCMAKE_INSTALL_RPATH=$PREFIX/lib\;$QTPREFIX/lib \ + -DRSTUDIO_GIT_REVISION_HASH=ARSCH + +make +make install + +exit From d7e2a8d8b116e2879b5a0939ed80e5dde4be4a00 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 10 Oct 2017 13:01:25 +0200 Subject: [PATCH 2/2] rstudio: Remove shipped pandoc binaries Two users reported the problem to our Helpdesk, that there is a problem [1][2]. [1] https://github.com/rstudio/rmarkdown/blob/98ab4af5be763f1d026cb9636698d5384196a136/PANDOC.md [2] https://github.com/rstudio/rmarkdown/issues/498 --- rstudio-1.1.383-0.build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/rstudio-1.1.383-0.build.sh b/rstudio-1.1.383-0.build.sh index 154042a..7aac038 100755 --- a/rstudio-1.1.383-0.build.sh +++ b/rstudio-1.1.383-0.build.sh @@ -61,4 +61,5 @@ cmake . \ make make install +rm -r $PREFIX/bin/pandoc exit