summaryrefslogtreecommitdiffstats
path: root/development/rstudio-desktop/rstudio-desktop.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'development/rstudio-desktop/rstudio-desktop.SlackBuild')
-rw-r--r--development/rstudio-desktop/rstudio-desktop.SlackBuild26
1 files changed, 8 insertions, 18 deletions
diff --git a/development/rstudio-desktop/rstudio-desktop.SlackBuild b/development/rstudio-desktop/rstudio-desktop.SlackBuild
index 66a2e31690..2e0bf0e4f0 100644
--- a/development/rstudio-desktop/rstudio-desktop.SlackBuild
+++ b/development/rstudio-desktop/rstudio-desktop.SlackBuild
@@ -27,13 +27,12 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=rstudio-desktop
SRCNAM=rstudio
-VERSION=${VERSION:-2022.02.3+492}
+VERSION=${VERSION:-2022.07.1+554}
SRCVER=${SRCVER:-$(echo $VERSION | sed 's/+/-/g')}
-GITCOMMIT_VER=8acbd38
-GWT_SDK_VER=${GWT_SDK_VER:-2.8.2}
-NODE_VER=${NODE_VER:-14.17.5}
+GITCOMMIT_VER=7872775
+NODE_VER=${NODE_VER:-16.14.0}
PANDOCVER=current
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -86,21 +85,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-GWT_DIR=src/gwt
-LIB_DIR=$GWT_DIR/lib
-mkdir -p $LIB_DIR
-
-GWT_SDK_ZIP=$CWD/gwt-$GWT_SDK_VER.zip
-
-mkdir -p $LIB_DIR/gwt
-unzip -qo $GWT_SDK_ZIP -d $LIB_DIR/gwt
-mv $LIB_DIR/gwt/gwt-$GWT_SDK_VER $LIB_DIR/gwt/$GWT_SDK_VER
-
# patches
patch -p1 < $CWD/pandoc_version.patch # Do not use outdated pandoc version number
+patch -p1 < $CWD/disable_quarto.patch # cmake ignores -DQUARTO_ENABLED for some reason
cd dependencies/common
mkdir -p pandoc/$PANDOCVER
@@ -186,6 +173,9 @@ cd build
make install DESTDIR=$PKG
cd ..
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
mkdir -p $PKG/usr/bin
(
cd $PKG/usr/bin