4 files changed, 71 insertions, 41 deletions
diff --git a/development/rstudio-desktop/README b/development/rstudio-desktop/README
index c21cf89f67..5ee939f0a8 100644
--- a/development/rstudio-desktop/README
+++ b/development/rstudio-desktop/README
@@ -1,5 +1,26 @@
-RStudio is a cross-platform IDE for the R statistical computing
-environment. It is available in desktop and server versions.
-This is the Linux desktop version.
+RStudio IDE: the most popular coding environment for R
 
-This script repackages the Debian package provided by RStudio.
+the RStudio integrated development environment (IDE) is a set of tools
+built to help you be more productive with R and Python. It includes a
+console, syntax-highlighting editor that supports direct code execution.
+It also features tools for plotting, viewing history, debugging and
+managing your workspace.
+
+RStudio is available in desktop and server versions. This is the DESKTOP
+version, featuring:
+
+* Syntax highlighting, code completion, and smart indentation
+* Execute R code directly from the source editor
+* Quickly jump to function definitions
+* View content changes in real-time with the Visual Markdown Editor
+* Easily manage multiple working directories
+* Integrated R help and documentation
+* Interactive debugger
+* Extensive package development tools
+
+At the moment, the script just repackages the Fedora/Redhat binaries,
+provided by upstream.
+
+NOTE
+RStudio currently only supports 64-bit systems. The last 32-bit version
+is 1.1.463, provided by "rstudio-desktop-legacy", available at SBo.
diff --git a/development/rstudio-desktop/rstudio-desktop.SlackBuild b/development/rstudio-desktop/rstudio-desktop.SlackBuild
index 22db996363..bb963e3e1f 100644
--- a/development/rstudio-desktop/rstudio-desktop.SlackBuild
+++ b/development/rstudio-desktop/rstudio-desktop.SlackBuild
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for rstudio-desktop
 
-# Copyright 2018 Ekin Akoglu, Erdemli/Mersin, Turkey
+# Copyright 2023 Petar Petrov, slackalaxy at gmail dot com
+# Copyright 2022-2023 Isaac Yu <isaacyu1@isaacyu1.com>
+# Copyright 2018 Ekin Akoglu, Erdemli/Mersin, Turkey <ekinakoglu@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +24,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=rstudio-desktop
-SRCNAM=rstudio
-VERSION=${VERSION:-1.1.463}
+VERSION=${VERSION:-2023.09.1+494}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,27 +40,29 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
 
-if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
-  PACKAGESUFFIX="i386"
-elif [ "$ARCH" = "x86_64" ]; then
-  PACKAGESUFFIX="amd64"
-else
-  echo "$ARCH is not supported." >&2
+if [ "$ARCH" != "x86_64" ]; then
+  printf "\n\n$ARCH is not supported... \n"
   exit 1
 fi
 
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-ar x $CWD/${SRCNAM}-${VERSION}-${PACKAGESUFFIX}.deb
-tar xvzf data.tar.gz
+cd $TMP
+rm -rf rstudio-${VERSION/+/-}
+mkdir rstudio-${VERSION/+/-}
+cd rstudio-${VERSION/+/-}
+bsdtar -xvf $CWD/rstudio-${VERSION/+/-}-$ARCH.rpm
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,20 +70,23 @@ 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
+mkdir -p $PKG/usr/{bin,lib64}
+cp -a usr/lib/rstudio $PKG/usr/lib64
+cp -a usr/share $PKG/usr
 
-rm -f $PKG/_gpgbuilder
-rm -f $PKG/control.tar.gz
-rm -r $PKG/data.tar.gz
-rm -f $PKG/debian-binary
+cd $PKG/usr/bin
+ln -s ../lib64/rstudio/rstudio .
+cd -
 
-mkdir -p $PKG/usr/bin
-ln -sf /usr/lib/rstudio/bin/rstudio $PKG/usr/bin
+# We use the symlink in /usr/bin
+sed -i 's:/usr/lib/rstudio/rstudio:rstudio:' $PKG/usr/share/applications/rstudio.desktop
+
+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/doc/$PRGNAM-$VERSION
 cp -a \
-  $PKG/usr/lib/rstudio/{COPYING,INSTALL,NOTICE,README.md,SOURCE} \
+  $PKG/usr/lib64/rstudio/resources/app/{COPYING,NOTICE,README.md,SOURCE} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -86,4 +95,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/rstudio-desktop/rstudio-desktop.info b/development/rstudio-desktop/rstudio-desktop.info
index 5037e20be0..10dfa1bb7d 100644
--- a/development/rstudio-desktop/rstudio-desktop.info
+++ b/development/rstudio-desktop/rstudio-desktop.info
@@ -1,10 +1,10 @@
 PRGNAM="rstudio-desktop"
-VERSION="1.1.463"
-HOMEPAGE="http://rstudio.com"
-DOWNLOAD="https://download1.rstudio.org/rstudio-1.1.463-i386.deb"
-MD5SUM="8a6755fa9fae2bafce289df3358aaf63"
-DOWNLOAD_x86_64="https://download1.rstudio.org/rstudio-1.1.463-amd64.deb"
-MD5SUM_x86_64="bc50d6bd34926c1cc3ae4a209d67d649"
-REQUIRES="R"
-MAINTAINER="Ekin Akoglu"
-EMAIL="ekinakoglu@gmail.com"
+VERSION="2023.09.1+494"
+HOMEPAGE="https://posit.co/"
+DOWNLOAD="UNSUPPORTED"
+MD5SUM=""
+DOWNLOAD_x86_64="https://download1.rstudio.org/electron/rhel8/x86_64/rstudio-2023.09.1-494-x86_64.rpm"
+MD5SUM_x86_64="dec51845fb2f4185d64fe3c38cbce110"
+REQUIRES="R postgresql"
+MAINTAINER="Petar Petrov"
+EMAIL="slackalaxy@gmail.com"
diff --git a/development/rstudio-desktop/slack-desc b/development/rstudio-desktop/slack-desc
index 80ad384c8e..4683bf3cb3 100644
--- a/development/rstudio-desktop/slack-desc
+++ b/development/rstudio-desktop/slack-desc
@@ -12,7 +12,7 @@ rstudio-desktop: RStudio is a cross-platform IDE for the R statistical computing
 rstudio-desktop: environment. It is available in desktop and server versions.
 rstudio-desktop: This is the Linux desktop version.
 rstudio-desktop:
-rstudio-desktop: See http://www.rstudio.com
+rstudio-desktop: https://posit.co/
 rstudio-desktop:
 rstudio-desktop:
 rstudio-desktop: