v0.99.981

2 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08d17a1916c6..4a476384ffb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.0.0
-# Wed Feb 10 17:28:00 UTC 2016
+# Generated by makepkg 5.0.1
+# Sat Feb 27 09:46:08 UTC 2016
 pkgbase = rstudio-desktop-bin
 	pkgdesc = A new integrated development environment (IDE) for R (binary version from RStudio official website)
-	pkgver = 0.99.878
+	pkgver = 0.99.891
 	pkgrel = 1
 	url = http://www.rstudio.org/
 	install = rstudio-desktop-bin.install
@@ -17,14 +17,15 @@ pkgbase = rstudio-desktop-bin
 	depends = libxslt
 	depends = shared-mime-info
 	depends = libxrandr
-	depends = gtk2
-	provides = rstudio-desktop=0.99.878
+	depends = pandoc
+	depends = pandoc-citeproc
+	provides = rstudio-desktop=0.99.891
 	conflicts = rstudio-desktop
 	conflicts = rstudio-desktop-git
 	conflicts = rstudio-desktop-preview-bin
 	options = !strip
-	source = http://download1.rstudio.org/rstudio-0.99.878-amd64.deb
-	md5sums = 0fa7099868e60f5acdb0787ea9312468
+	source = http://download1.rstudio.org/rstudio-0.99.891-amd64.deb
+	md5sums = 840a403d91471dffc581964bf8be1827
 
 pkgname = rstudio-desktop-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index ad532c87622b..8ca9866ab22b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,22 +12,21 @@ print(cbind(links,md5sums))
 _EOF_
 
 pkgname=rstudio-desktop-bin
-pkgver=0.99.878
+pkgver=0.99.891
 pkgrel=1
 pkgdesc="A new integrated development environment (IDE) for R (binary version from RStudio official website)"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.rstudio.org/"
-depends=('r' 'gstreamer0.10-base' 'hicolor-icon-theme' 'libxcomposite' 'libxslt' 'shared-mime-info' 'libxrandr' 'gtk2')
+depends=('r' 'gstreamer0.10-base' 'hicolor-icon-theme' 'libxcomposite' 'libxslt' 'shared-mime-info' 'libxrandr' 'pandoc' 'pandoc-citeproc')
 makedepends=('patchelf')
-#'qt5-imageformats' 'qt5-webkit'
 conflicts=('rstudio-desktop' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin')
 provides=("rstudio-desktop=${pkgver}")
 options=(!strip)
 
 
-_x86md5=2b8fae049a2d5458107b9ed5e93aa6d9
-_x64md5=0fa7099868e60f5acdb0787ea9312468
+_x86md5=4b5214aefb0e685eaa54e141771252d5
+_x64md5=840a403d91471dffc581964bf8be1827
 
 case "$CARCH" in
 	'i686')
@@ -54,13 +53,6 @@ package() {
   tar zxpf data.tar.gz -C "$pkgdir"
   install -dm755 "$pkgdir/usr/bin"
 
-  #cd "$pkgdir/usr/lib/rstudio/bin"
-  #ls lib*.so.* | grep -v libedit | grep -v libtinfo | tr \\n \\0 |xargs -0 rm
-  #rm -rf plugins
-
-  #cd "$pkgdir/usr/lib/rstudio/bin/rsclang"
-  #ln -sf /usr/lib/libclang.so ./
-
   cd "$pkgdir/usr/lib/rstudio/bin"
   ln -sf /usr/lib/libncursesw.so.6 libtinfo.so.5
   ln -sf /usr/lib/libedit.so.0  libedit.so.2
@@ -68,6 +60,10 @@ package() {
   cd "$pkgdir/usr/lib/rstudio/bin/rsclang"
   patchelf --set-rpath '$ORIGIN/..' libclang.so
 
+  cd "$pkgdir/usr/lib/rstudio/bin/pandoc"
+  ln -sf /usr/bin/pandoc ./
+  ln -sf /usr/bin/pandoc-citeproc ./
+
   cd "$pkgdir/usr/lib/rstudio/bin/plugins"
   ls */*.so | xargs -n1 patchelf --set-rpath '$ORIGIN/../..'
 
@@ -91,7 +87,7 @@ export QT_DIR=/usr/lib/rstudio/bin
 export QT_PLUGIN_PATH=$QT_DIR/plugins
 export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_PLUGIN_PATH/platforms
 export KDEDIRS=/usr
-exec /usr/lib/rstudio/bin/rstudio
+exec /usr/lib/rstudio/bin/rstudio "$@"
 ' > "$pkgdir/usr/bin/rstudio-bin"
   chmod 755 "$pkgdir/usr/bin/rstudio-bin"