diff options
| author | Tim Biermann <tbier@posteo.de> | 2021-01-20 13:36:09 +0000 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2021-01-20 13:36:58 +0000 |
| commit | 0154c5253a933bab1321e6259e7273f210bc5c60 (patch) | |
| tree | 0f0cbf2e114c18417762858231ac80e6487f6d45 /rstudio/Pkgfile | |
| parent | 90bd1f58b805117d4fa93bf0f80dde7010ae1bfd (diff) | |
| download | contrib-0154c5253a933bab1321e6259e7273f210bc5c60.tar.gz contrib-0154c5253a933bab1321e6259e7273f210bc5c60.tar.xz | |
rstudio: 1.3.1093 -> 1.4.1103
Diffstat (limited to 'rstudio/Pkgfile')
| -rw-r--r-- | rstudio/Pkgfile | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/rstudio/Pkgfile b/rstudio/Pkgfile index 17dc9d224..f289f3670 100644 --- a/rstudio/Pkgfile +++ b/rstudio/Pkgfile @@ -1,15 +1,16 @@ # Description: RStudio - an Interface for GNU R # URL: https://www.rstudio.com/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: ant boost hyphen libevent mathjax openjdk8 pandoc-bin qtwebengine r +# Depends on: ant boost hyphen libevent libsoci mathjax nodejs openjdk8 pandoc-bin qtwebengine r name=rstudio -version=1.3.1093 +version=1.4.1103 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.3.1056-boost-1.74.0.patch) + rstudio-1.2.5042-boost-1.73.0.patch rstudio-1.3.1056-boost-1.74.0.patch + pandoc-version.patch) git=(https://github.com/rstudio/rstudio.git) build() { @@ -19,26 +20,32 @@ build() { 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 + # it's probing for an old pandoc-version, fixing that + patch -Np1 -d $name-$version -i $SRC/pandoc-version.patch + + export R_LIBS_USER="$PKG/usr/lib/R/library/" + + (pushd $name-$version/dependencies/common + local pandoc_version=$(prt-get current pandoc-bin) + install -d pandoc node/10.19.0/bin ln -sfT /usr/share/myspell/dicts dictionaries 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/" + ln -sfT /usr/bin/ "pandoc/${pandoc_version/\-1/}" + ln -sfT /usr/bin/node node/10.19.0/bin/node bash install-packages - popd + unset pandoc_version) export PATH="/usr/lib/java/openjdk8/jre/bin/:${PATH}" - cmake -S $name-$version -B build -G Ninja\ + cmake -S $name-$version -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr/lib/rstudio \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ -D RSTUDIO_TARGET=Desktop \ -D RSTUDIO_USE_SYSTEM_BOOST=ON \ - -D QT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake \ + -D RSTUDIO_USE_SYSTEM_SOCI=ON \ -D Boost_NO_BOOST_CMAKE=ON \ + -D QT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake \ -D RSTUDIO_BUNDLE_QT=FALSE \ -Wno-dev @@ -48,6 +55,7 @@ build() { install -dm755 $PKG/usr/bin/ ln -s /usr/lib/$name/bin/$name $PKG/usr/bin/$name sed -i 's|/usr/lib/rstudio/bin/rstudio|/usr/bin/rstudio|g' $PKG/usr/share/applications/rstudio.desktop + find $PKG \(\ -iname '*README*' -o \ -iname '*COPYING*' -o \ |