Update to 0.99.632. Change deps

3 files changed, 62 insertions, 51 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7a53f1e56a73..991dff40196c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = rstudio-desktop-git
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 0.99.212
+	pkgver = 0.99.632
 	pkgrel = 1
-	url = http://www.rstudio.org/
+	url = https://www.rstudio.com/products/rstudio/
 	install = rstudio-desktop-git.install
 	arch = i686
 	arch = x86_64
@@ -24,15 +24,24 @@ pkgbase = rstudio-desktop-git
 	depends = hicolor-icon-theme
 	depends = shared-mime-info
 	depends = qt5-webkit
+	depends = hunspell-en
+	depends = mathjax
+	depends = pandoc-bin
 	optdepends = git: for git support
 	optdepends = subversion: for subversion suuport
 	optdepends = openssh-askpass: for a git ssh access
 	provides = rstudio-desktop
 	provides = rstudio-desktop-bin
+	provides = rstudio-desktop-preview
 	conflicts = rstudio-desktop
 	conflicts = rstudio-desktop-bin
+	conflicts = rstudio-desktop-preview
 	source = git+https://github.com/rstudio/rstudio.git
+	source = https://s3.amazonaws.com/rstudio-buildtools/gin-1.5.zip
+	source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.7.0.zip
 	md5sums = SKIP
+	md5sums = 2409168cc18bf5f341e107e6887fe359
+	md5sums = a8f3704a597b392910ea060284f21a03
 
 pkgname = rstudio-desktop-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b9a6ddd52d77..b378b650a216 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,69 +3,75 @@
 pkgname=rstudio-desktop-git
 _gitname=rstudio
 pkgver=0.99.632
+_gwtver=2.7.0
+_ginver=1.5
 pkgrel=1
 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
 arch=('i686' 'x86_64')
 url="https://www.rstudio.com/products/rstudio/"
 license=('AGPL3')
-depends=('boost-libs>=1.5' 'r>=2.11.1' 'hicolor-icon-theme' 'shared-mime-info' 'qt5-webkit')
+depends=('boost-libs>=1.5' 'r>=2.11.1' 'hicolor-icon-theme' 'shared-mime-info' 'qt5-webkit' 'hunspell-en' 'mathjax' 'pandoc-bin')
 makedepends=('git' 'cmake>=2.8' 'boost>=1.5' 'java-runtime' 'apache-ant' 'unzip' 'openssl' 'pango' 'libcups' 'qt5-svg' 'pam' 'wget')
 optdepends=('git: for git support'
 	    'subversion: for subversion suuport'
 	    'openssh-askpass: for a git ssh access')
-provides=('rstudio-desktop' 'rstudio-desktop-bin')
-conflicts=('rstudio-desktop' 'rstudio-desktop-bin')
+provides=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview')
+conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview')
 install="${pkgname}.install"
 
-source=('git+https://github.com/rstudio/rstudio.git')
-md5sums=('SKIP')
+source=("git+https://github.com/rstudio/rstudio.git"
+        "https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip"
+        "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip")
+md5sums=('SKIP'
+         '2409168cc18bf5f341e107e6887fe359'
+         'a8f3704a597b392910ea060284f21a03')
 
 pkgver() {
-  cd ${srcdir}/${_gitname}
-  # Get the version number
-  git describe --tags --abbrev=0 | sed 's|v||g'
+    cd "${srcdir}/${_gitname}"
+    git describe --tags --abbrev=0 | sed 's|v||g'
 }
 
 prepare() {
-  cd "${srcdir}/${_gitname}/dependencies/common"
-  msg "Downloading and installing gwt"
-  ./install-gwt
-  msg "Downloading and installing dictionaries"
-  ./install-dictionaries
-  msg "Downloading and installing mathjax"
-  ./install-mathjax
-  msg "Downloading and installing pandoc"
-  ./install-pandoc
-  msg "Downloading and installing libclang"
-  ./install-libclang
-  msg "Downloading and installing packages"
-  ./install-packages
+    cd "${srcdir}/${_gitname}"
+    install -d src/gwt/lib/{gin,gwt/$_gwtver}
+    cp -r "${srcdir}/gwt-${_gwtver}/"* "src/gwt/lib/gwt/${_gwtver}"
+    unzip -qfod "src/gwt/lib/gin/${_ginver}" "${srcdir}/gin-${_ginver}.zip"
 
-  # temporary fix for the Qt 5.5
-  cd "${srcdir}/${_gitname}/src/cpp/desktop/3rdparty/qtsingleapplication"
-  sed -i 's|#include <QTime>|#include <QDataStream>\n#include <QTime>|' qtlocalpeer.cpp
+    cd "${srcdir}/${_gitname}/dependencies/common"
+    install -d dictionaries mathjax-23 pandoc libclang/{3.5,builtin-headers}
+
+    msg "Downloading and installing packages"
+    ./install-packages
+
+    # Temporary fix for the Qt 5.5
+    cd "${srcdir}/${_gitname}/src/cpp/desktop/3rdparty/qtsingleapplication"
+    sed -i 's|#include <QTime>|#include <QDataStream>\n#include <QTime>|' qtlocalpeer.cpp
 }
 
 build() {
-  # Unset user Rprofile.r variable for building
-  if [ -n $R_PROFILE_USER ]; then
-    unset R_PROFILE_USER
-  fi
-  # Configure with cmake in a new buld directory as recommended in the rstudio INSTALL file
-  rm -rf "${srcdir}/${_gitname}/build"
-  mkdir "${srcdir}/${_gitname}/build"
-  cd "${srcdir}/${_gitname}/build"
-  # Configure cmake 
-  cmake -DRSTUDIO_TARGET=Desktop \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio \
-	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 ..
+    rm -rf "${srcdir}/${_gitname}/build"
+    mkdir "${srcdir}/${_gitname}/build"
+    cd "${srcdir}/${_gitname}/build"
+    cmake -DRSTUDIO_TARGET=Desktop \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio \
+          -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 ..
 }
 
 package() {
-  cd "${srcdir}/${_gitname}/build"
-  # Install the program
-  make DESTDIR="${pkgdir}" install
-  # Install the license
-  install -Dm644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+    cd "${srcdir}/${_gitname}/build"
+    # Install the program
+    make DESTDIR="${pkgdir}" install
+    # Install the license
+    install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+    # Creaate symlinks
+    install -d "${pkgdir}/usr/bin"
+    ln -sf /usr/lib/rstudio/bin/rstudio "${pkgdir}/usr/bin/rstudio"
+    ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/rstudio/resources/dictionaries/"
+    ln -sf /usr/share/mathjax "${pkgdir}/usr/lib/rstudio/resources/mathjax-23/"
+    install -d "${pkgdir}/usr/lib/rstudio/bin/pandoc"
+    ln -sf /usr/bin/pandoc "${pkgdir}/usr/lib/rstudio/bin/pandoc/pandoc"
+    ln -sf /usr/bin/pandoc-citeproc "${pkgdir}/usr/lib/rstudio/bin/pandoc/pandoc-citeproc"
+    # Remove empty directories
+    rm -rf "${pkgdir}/usr/lib/rstudio/resources/libclang"
 }
diff --git a/rstudio-desktop-git.install b/rstudio-desktop-git.install
index 50cc63dbfd2d..94cf04745e7c 100644
--- a/rstudio-desktop-git.install
+++ b/rstudio-desktop-git.install
@@ -1,17 +1,13 @@
 post_install() {
-  xdg-icon-resource forceupdate --theme hicolor
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-mime-database /usr/share/mime &> /dev/null
   update-desktop-database -q
-  ln -sf /usr/lib/rstudio/bin/rstudio /usr/bin/rstudio
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
 post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database /usr/share/mime &> /dev/null
-  update-desktop-database -q
-  rm -f /usr/bin/rstudio
+  post_install
 }