summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon2015-09-27 09:24:30 +0800
committerLeon2015-09-27 09:24:30 +0800
commit17c48ff2c4fe2a2896f61e10b0e9e9ab63c25606 (patch)
tree5502b3211c8356f7c9470a5c9a1b8659cad97211
parent410b66a474fb4a6a37530b7de1d7d1740c5721c7 (diff)
downloadaur-17c48ff2c4fe2a2896f61e10b0e9e9ab63c25606.tar.gz
0.99.484-4
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD18
2 files changed, 19 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 545a26a4485..d2e7a1e03f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,26 @@
# Generated by makepkg 4.2.1
-# Sat Sep 26 14:13:14 UTC 2015
+# Sun Sep 27 01:21:59 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 = 3
+ pkgrel = 4
url = http://www.rstudio.org/
install = rstudio-desktop-bin.install
arch = i686
arch = x86_64
license = GPL
+ makedepends = patchelf
depends = r>=2.11.1
depends = shared-mime-info
depends = gstreamer
depends = hicolor-icon-theme
- depends = clang
+ depends = libedit
+ depends = ncurses
provides = rstudio-desktop=0.99.484
conflicts = rstudio-desktop
conflicts = rstudio-desktop-git
conflicts = rstudio-desktop-preview-bin
+ options = !strip
source = http://download1.rstudio.org/rstudio-0.99.484-amd64.deb
md5sums = ee2a2ab6fce06e3936afd4b5968f7d0c
diff --git a/PKGBUILD b/PKGBUILD
index 73feb36c250..2beff3750f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,16 +13,17 @@ _EOF_
pkgname=rstudio-desktop-bin
pkgver=0.99.484
-pkgrel=3
+pkgrel=4
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' 'gstreamer' 'hicolor-icon-theme' 'clang')
+depends=('r>=2.11.1' 'shared-mime-info' 'gstreamer' 'hicolor-icon-theme' 'libedit' 'ncurses')
+makedepends=('patchelf')
#'qt5-imageformats' 'qt5-webkit'
conflicts=('rstudio-desktop' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin')
provides=("rstudio-desktop=${pkgver}")
-#options=(!strip)
+options=(!strip)
_x86md5=fe0c5d879c128c5d3d035bec73150fcc
@@ -54,14 +55,21 @@ package() {
#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
+
cd "$pkgdir/usr/lib/rstudio/bin/rsclang"
- ln -sf /usr/lib/libclang.so ./
+ patchelf --set-rpath '$ORIGIN/..' 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
- echo '#!/bin/bash
+ echo '#!/bin/sh
export QT_DIR=/usr/lib/rstudio/bin
export QT_PLUGIN_PATH=$QT_DIR/plugins
export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_PLUGIN_PATH/platforms