development/rstudio-desktop: Updated for version 1.1.423.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 32 insertions, 73 deletions

diff --git a/development/rstudio-desktop/README b/development/rstudio-desktop/README
index bac6ee0199..702b56484f 100644
--- a/development/rstudio-desktop/README
+++ b/development/rstudio-desktop/README
@@ -2,6 +2,4 @@ RStudio is a cross-platform IDE for the R statistical computing
 environment. It is available in desktop and server versions. 
 This builds the linux desktop version. 
 
-RStudio's standard build process downloads various build tools
-5 of which are indicated as downloads along with the source tarball 
-to enable a completely offline build.
+This script repackages the Debian package provided by RStudio.
diff --git a/development/rstudio-desktop/doinst.sh b/development/rstudio-desktop/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/development/rstudio-desktop/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/development/rstudio-desktop/rstudio-desktop.SlackBuild b/development/rstudio-desktop/rstudio-desktop.SlackBuild
index 96920b2710..f964a85a5c 100644
--- a/development/rstudio-desktop/rstudio-desktop.SlackBuild
+++ b/development/rstudio-desktop/rstudio-desktop.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for rstudio-desktop
 
-# Copyright 2014 Michael I. Stewart  Sydney, Australia
+# Copyright 2018 Ekin Akoglu, Erdemli/Mersin, Turkey
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,22 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-SPRGNAM=rstudio
-PRGNAM=$SPRGNAM-desktop
-VERSION=${VERSION:-0.98.501}
-MVERSION=c097d85
-GIN_VER=1.5
-GWT_SDK_VER=2.5.1
-JUNIT_JAR=junit-4.9b3.jar
-MATHJAX=mathjax-20
-
-LVERSION=v$VERSION-0-g$MVERSION
+SRCNAM=rstudio
+PRGNAM=rstudio-desktop
+VERSION=${VERSION:-1.1.423}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,28 +41,31 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i86 -mtune=i686"
   LIBDIRSUFFIX=""
+  PACKAGESUFFIX="i386"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
+  PACKAGESUFFIX="i386"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+  PACKAGESUFFIX="amd64"
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
+  PACKAGESUFFIX="i386"
 fi
 
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP
-rm -rf $SPRGNAM-$SPRGNAM-$MVERSION
-tar xvf $CWD/$SPRGNAM-$SPRGNAM-$LVERSION.tar.gz
-cd $SPRGNAM-$SPRGNAM-$MVERSION
+cd $PKG
+ar x $CWD/${SRCNAM}-${VERSION}-${PACKAGESUFFIX}.deb
+tar xvzf data.tar.gz
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -77,48 +73,20 @@ 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 {} \;
 
-# Fix build with boost-1.58
-# http://stackoverflow.com/questions/25866378/cant-build-rstudio-ide-with-boost-1-56-0
-find . \( -name *.cpp -or -name *.hpp \) -exec \
-  sed -i -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' {} \;
-
-cd dependencies/common
-unzip -qd dictionaries $CWD/core-dictionaries.zip
-unzip -q $CWD/$MATHJAX.zip
-
-GWT_DIR=../../src/gwt
-LIB_DIR=$GWT_DIR/lib
-mkdir -p $LIB_DIR
-
-GIN_ZIP=$CWD/gin-$GIN_VER.zip
-mkdir -p "$LIB_DIR/gin/$GIN_VER"
-unzip -qd "$LIB_DIR/gin/$GIN_VER" "$GIN_ZIP"
-
-GWT_SDK=gwt-$GWT_SDK_VER
-GWT_SDK_ZIP=$CWD/gwt-$GWT_SDK_VER.zip
-
-mkdir -p "$LIB_DIR/gwt"
-unzip -qd "$LIB_DIR" "$GWT_SDK_ZIP"
-mv "$LIB_DIR/$GWT_SDK" "$LIB_DIR/gwt/$GWT_SDK_VER"
-
-cp "$CWD/$JUNIT_JAR" "$LIB_DIR/$JUNIT_JAR"
-
-cd ../..
-mkdir -p build
-cd build
-  cmake .. -DRSTUDIO_TARGET=Desktop -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/lib${LIBDIRSUFFIX}/rstudio
-  make
-  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
 
+rm -f $PKG/_gpgbuilder
+rm -f $PKG/control.tar.gz
+rm -r $PKG/data.tar.gz
+rm -f $PKG/debian-binary
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 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}
diff --git a/development/rstudio-desktop/rstudio-desktop.info b/development/rstudio-desktop/rstudio-desktop.info
index 33864ba76f..cebefb4b16 100644
--- a/development/rstudio-desktop/rstudio-desktop.info
+++ b/development/rstudio-desktop/rstudio-desktop.info
@@ -1,20 +1,10 @@
 PRGNAM="rstudio-desktop"
-VERSION="0.98.501"
+VERSION="1.1.423"
 HOMEPAGE="http://rstudio.com"
-DOWNLOAD="https://github.com/rstudio/rstudio/tarball/v0.98.501/rstudio-rstudio-v0.98.501-0-gc097d85.tar.gz \
-          https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip \
-          https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip \
-          https://s3.amazonaws.com/rstudio-buildtools/gwt-2.5.1.zip \
-          https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip \
-          https://s3.amazonaws.com/rstudio-buildtools/junit-4.9b3.jar"
-MD5SUM="41c6a570080c4ec7db0364e20d907990 \
-        0e03798b8e53096c4a906bde05e32378 \
-        2409168cc18bf5f341e107e6887fe359 \
-        6ada64bdd849abd0d954c44d42187340 \
-        480ede551eeffec08162a7a913eee906 \
-        542e08e4fac8819735331966c5c16016"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
-REQUIRES="R apache-ant jdk"
-MAINTAINER="Michael Stewart"
-EMAIL="michael.stewart@sydney.edu.au"
+DOWNLOAD="https://download1.rstudio.org/rstudio-1.1.423-i386.deb"
+MD5SUM="8515d8f5c78ac15b331bd9be0c1ea412"
+DOWNLOAD_x86_64="https://download1.rstudio.org/rstudio-1.1.423-amd64.deb"
+MD5SUM_x86_64="f6e385c13ff7a1218891937f016e9383"
+REQUIRES="R"
+MAINTAINER="Ekin Akoglu"
+EMAIL="ekinakoglu@gmail.com"