summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon2015-09-26 22:04:33 +0800
committerLeon2015-09-26 22:04:33 +0800
commitdd6453b52c541ef33c7246d9c368af94b338c4c0 (patch)
treead8b0a2893053e35ea1e35e22ad5f7749aeaa0f9
parentf644c86c2892b43a1b225c53fcf1cad2260d7a11 (diff)
downloadaur-dd6453b52c541ef33c7246d9c368af94b338c4c0.tar.gz
0.99.484-2
-rw-r--r--.SRCINFO8
-rw-r--r--.gitignore5
-rw-r--r--PKGBUILD26
3 files changed, 31 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 424437c97ba..bc2145f24f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by makepkg 4.2.1
+# Sat Sep 26 13:54:30 UTC 2015
pkgbase = rstudio-desktop-bin
pkgdesc = A new integrated development environment (IDE) for R (binary version from RStudio official website)
pkgver = 0.99.484
- pkgrel = 1
+ pkgrel = 2
url = http://www.rstudio.org/
install = rstudio-desktop-bin.install
arch = i686
@@ -9,11 +11,15 @@ pkgbase = rstudio-desktop-bin
license = GPL
depends = r>=2.11.1
depends = shared-mime-info
+ depends = gstreamer
+ depends = hicolor-icon-theme
+ depends = clang
provides = rstudio-desktop=0.99.484
conflicts = rstudio-desktop
conflicts = rstudio-desktop-git
conflicts = rstudio-desktop-preview-bin
source = http://download1.rstudio.org/rstudio-0.99.484-amd64.deb
+ md5sums = ee2a2ab6fce06e3936afd4b5968f7d0c
pkgname = rstudio-desktop-bin
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..7a44327aa67
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+!PKGBUILD
+!.gitignore
+!.SRCINFO
+!.rstudio-desktop-bin.install
diff --git a/PKGBUILD b/PKGBUILD
index 4bc3da6a42b..bab6a5085a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,12 +13,13 @@ _EOF_
pkgname=rstudio-desktop-bin
pkgver=0.99.484
-pkgrel=1
+pkgrel=2
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>=2.11.1' 'shared-mime-info' 'gstreamer0.10-base')
+depends=('r>=2.11.1' 'shared-mime-info' 'gstreamer' 'hicolor-icon-theme' 'clang')
+#'qt5-imageformats' 'qt5-webkit'
conflicts=('rstudio-desktop' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin')
provides=("rstudio-desktop=${pkgver}")
#options=(!strip)
@@ -30,10 +31,12 @@ _x64md5=ee2a2ab6fce06e3936afd4b5968f7d0c
case "$CARCH" in
'i686')
_arch=i386
+ _archx=
md5sums=($_x86md5)
;;
'x86_64')
_arch=amd64
+ _archx=64
md5sums=($_x64md5)
;;
esac
@@ -47,15 +50,24 @@ package() {
tar zxpf data.tar.gz -C "$pkgdir"
install -dm755 "$pkgdir/usr/bin"
- # cd "$pkgdir/usr/lib/rstudio/bin"
- # rm lib*.so.*
+ #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/rsclang"
+ ln -sf /usr/lib/libclang.so ./
find "$pkgdir/usr" -type d -print0 | xargs -0 chmod 755
cd "$pkgdir/usr/bin"
- ln -s -f ../lib/rstudio/bin/rstudio rstudio-bin
+ #ln -s -f ../lib/rstudio/bin/rstudio rstudio-bin
+ echo '#!/bin/bash
+export QT_DIR=/usr/lib/rstudio/bin
+export QT_PLUGIN_PATH=$QT_DIR/plugins
+export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_PLUGIN_PATH/platforms
+exec /usr/lib/rstudio/bin/rstudio
+' > "$pkgdir/usr/bin/rstudio-bin"
+
+ sed -i 's|/usr/lib/rstudio/bin/rstudio|/usr/bin/rstudio-bin|' "$pkgdir/usr/share/applications/rstudio.desktop"
}
# vim:ft=sh tabstop=2 expandtab