development/rstudio-desktop: Updated for version 1.1.442.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

5 files changed, 31 insertions, 24 deletions

diff --git a/development/rstudio-desktop/README b/development/rstudio-desktop/README
index 702b56484f5a..c21cf89f67e3 100644
--- a/development/rstudio-desktop/README
+++ b/development/rstudio-desktop/README
@@ -1,5 +1,5 @@
-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 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.
 
 This script repackages the Debian package provided by RStudio.
diff --git a/development/rstudio-desktop/doinst.sh b/development/rstudio-desktop/doinst.sh
index 5fb28930db0b..aea0f894eb32 100644
--- a/development/rstudio-desktop/doinst.sh
+++ b/development/rstudio-desktop/doinst.sh
@@ -1,3 +1,13 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/development/rstudio-desktop/rstudio-desktop.SlackBuild b/development/rstudio-desktop/rstudio-desktop.SlackBuild
index f964a85a5cdc..29619a59ae90 100644
--- a/development/rstudio-desktop/rstudio-desktop.SlackBuild
+++ b/development/rstudio-desktop/rstudio-desktop.SlackBuild
@@ -22,9 +22,9 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-SRCNAM=rstudio
 PRGNAM=rstudio-desktop
-VERSION=${VERSION:-1.1.423}
+SRCNAM=rstudio
+VERSION=${VERSION:-1.1.442}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -41,22 +41,13 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i86 -mtune=i686"
-  LIBDIRSUFFIX=""
-  PACKAGESUFFIX="i386"
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
+if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ]; then
   PACKAGESUFFIX="i386"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
   PACKAGESUFFIX="amd64"
 else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-  PACKAGESUFFIX="i386"
+  echo "$ARCH is not supported." >&2
+  exit 1
 fi
 
 set -e
@@ -71,7 +62,7 @@ find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -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
@@ -81,7 +72,13 @@ rm -f $PKG/control.tar.gz
 rm -r $PKG/data.tar.gz
 rm -f $PKG/debian-binary
 
+mkdir -p $PKG/usr/bin
+ln -sf /usr/lib/rstudio/bin/rstudio $PKG/usr/bin
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  $PKG/usr/lib/rstudio/{COPYING,INSTALL,NOTICE,README.md,SOURCE} \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/rstudio-desktop/rstudio-desktop.info b/development/rstudio-desktop/rstudio-desktop.info
index cebefb4b16b1..c180f2214810 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.423"
+VERSION="1.1.442"
 HOMEPAGE="http://rstudio.com"
-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"
+DOWNLOAD="https://download1.rstudio.org/rstudio-1.1.442-i386.deb"
+MD5SUM="090fcb1fec90e3d621bc89e113c8dc28"
+DOWNLOAD_x86_64="https://download1.rstudio.org/rstudio-1.1.442-amd64.deb"
+MD5SUM_x86_64="2c0805a6a8f12b06c7e6b343692288fd"
 REQUIRES="R"
 MAINTAINER="Ekin Akoglu"
 EMAIL="ekinakoglu@gmail.com"
diff --git a/development/rstudio-desktop/slack-desc b/development/rstudio-desktop/slack-desc
index 58654b77278b..80ad384c8e83 100644
--- a/development/rstudio-desktop/slack-desc
+++ b/development/rstudio-desktop/slack-desc
@@ -10,7 +10,7 @@ rstudio-desktop: rstudio-desktop (R Statistical IDE)
 rstudio-desktop:
 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 builds the linux desktop version.
+rstudio-desktop: This is the Linux desktop version.
 rstudio-desktop:
 rstudio-desktop: See http://www.rstudio.com
 rstudio-desktop: