diff options
author | Stephen Martin | 2021-06-20 18:53:48 -0700 |
---|---|---|
committer | Stephen Martin | 2021-06-20 18:53:48 -0700 |
commit | 9946d3b822cb20834c984fb473718c65b542b83a (patch) | |
tree | 5667b681e44d9c1988c789b495764a3b7d65a544 | |
parent | b1901ab8b643de9c24807658260c5cbb18580143 (diff) | |
download | aur-9946d3b822cb20834c984fb473718c65b542b83a.tar.gz |
Implemented fixes (alpha).
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 46 |
2 files changed, 32 insertions, 19 deletions
@@ -32,8 +32,8 @@ pkgbase = rstudio-server-git conflicts = rstudio-server source = git+https://github.com/rstudio/rstudio.git source = rstudio-server.service - source = https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip - source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.2.zip + source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-gin/gin-2.1.2.zip + source = https://storage.googleapis.com/gwt-releases/gwt-2.8.2.zip source = https://nodejs.org/dist/v10.19.0/node-v10.19.0-linux-x64.tar.gz md5sums = SKIP md5sums = eea28f7865720f6c8d5de12f3f631880 @@ -42,4 +42,3 @@ pkgbase = rstudio-server-git md5sums = 441a8e19ab9cd9884cbd24f85840c7a6 pkgname = rstudio-server-git - @@ -23,8 +23,8 @@ install="${pkgname}.install" conflicts=('rstudio-server') source=('git+https://github.com/rstudio/rstudio.git' 'rstudio-server.service' - "https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip" - "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip" + "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-gin/gin-${_ginver}.zip" + "https://storage.googleapis.com/gwt-releases/gwt-${_gwtver}.zip" "https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz" ) md5sums=('SKIP' @@ -54,10 +54,12 @@ prepare () { cp -r "${srcdir}/gwt-${_gwtver}/"* lib/gwt/${_gwtver} cd "${srcdir}/${_gitname}/dependencies/common" - install -d pandoc + _pandocver=$(grep -oP "(?<=PANDOC_VERSION=\").*(?=\"$)" install-pandoc) + install -d pandoc /${_pandocver} + ln -sfT "/usr/share/myspell/dicts" dictionaries ln -sfT "/usr/share/mathjax2" mathjax-27 - ln -sfT "/usr/bin/pandoc" pandoc/pandoc + ln -sfT "/usr/bin/pandoc" pandoc/${_pandocver}/pandoc ln -sfT "/usr/bin/pandoc-citeproc" pandoc/pandoc-citeproc # Nodejs @@ -67,9 +69,14 @@ prepare () { yarn config set ignore-engines true yarn install + # Fix links for src/cpp/session/CMakeLists.txt + cd "${srcdir}/${_gitname}/dependencies" + ln -sfT common/dictionaries dictionaries + ln -sfT common/mathjax-27 mathjax-27 + ln -sfT common/pandoc pandoc cd ${srcdir}/${_gitname}/dependencies/common - ./install-dictionaries + # ./install-dictionaries msg "Downloading and installing R packages..." ./install-packages } @@ -83,13 +90,20 @@ build() { if [ -n $R_PROFILE_USER ]; then unset R_PROFILE_USER fi - # Configure with cmake in a new buld directory as recommended in the rstudio INSTALL file + + # Configure with cmake in a new build directory as recommended in the rstudio INSTALL file rm -rf ${srcdir}/$_gitname/build mkdir "${srcdir}/$_gitname/build" cd "${srcdir}/$_gitname/build" + # Configure cmake - #cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DCMAKE_DL_LIBRARIES=/usr/lib64/libdl.so -DCMAKE_LIBR_DOC_DIR=/usr/share/doc/R -DCMAKE_LIBR_EXECUTABLE=/usr/bin/R -DCMAKE_LIBR_HOME=/usr/lib64/R -DCMAKE_LIBR_INCLUDE_DIRS=/usr/include/R -DCMAKE_LIBR_CORE_LIBRARY=usr/lib64/R/lib/libR.so -DRSTUDIO_USE_SYSTEM_BOOST=Yes .. - cmake -DRSTUDIO_TARGET=Server -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server -DRSTUDIO_USE_SYSTEM_BOOST=yes -DBoost_NO_BOOST_CMAKE=ON -DRSTUDIO_USE_SYSTEM_SOCI=yes .. + cmake -DRSTUDIO_TARGET=Server \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio-server \ + -DRSTUDIO_USE_SYSTEM_BOOST=yes \ + -DRSTUDIO_USE_SYSTEM_YAML_CPP=yes \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DRSTUDIO_USE_SYSTEM_SOCI=yes .. } @@ -105,15 +119,15 @@ package() { install -Dm 644 "${pkgdir}/usr/lib/rstudio-server/extras/pam/rstudio" "${pkgdir}/etc/pam.d/rstudio" # rstudio home directory install -d "${pkgdir}/srv/rstudio-server" -# mv "${pkgdir}/usr/lib/rstudio-server/www" "${pkgdir}/srv/rstudio" -# rm -rf "${pkgdir}/usr/lib/rstudio-server/extras" install -d "${pkgdir}/usr/lib//systemd/system" install -Dm 644 "${srcdir}/rstudio-server.service" "${pkgdir}/usr/lib//systemd/system/rstudio-server.service" install -d "${pkgdir}/etc/rstudio" -# vars -mkdir -p ${pkgdir}/run/rstudio-server ${pkgdir}/lock/rstudio-server ${pkgdir}/var/log/rstudio-server ${pkgdir}/var/lib/rstudio-server -# lns -mkdir -p $pkgdir/usr/bin -ln -s /usr/lib/rstudio-server/bin/rserver $pkgdir/usr/bin/rserver -ln -s /usr/lib/rstudio-server/bin/rstudio-server $pkgdir/usr/bin/rstudio-server + + # vars + mkdir -p ${pkgdir}/run/rstudio-server ${pkgdir}/lock/rstudio-server ${pkgdir}/var/log/rstudio-server ${pkgdir}/var/lib/rstudio-server + + # lns + mkdir -p $pkgdir/usr/bin + ln -s /usr/lib/rstudio-server/bin/rserver $pkgdir/usr/bin/rserver + ln -s /usr/lib/rstudio-server/bin/rstudio-server $pkgdir/usr/bin/rstudio-server } |