summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon2016-12-23 15:16:56 +0800
committerLeon2016-12-23 15:16:56 +0800
commit8d3123d6c29c0c0bb16415db0938e2a6c79ec19e (patch)
tree8a03dfd0675083415c8d29956c770d8145d2dba4
parent70aaa116c509813242a798caa5609089e7ab6d98 (diff)
downloadaur-8d3123d6c29c0c0bb16415db0938e2a6c79ec19e.tar.gz
1.0.136-2
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD26
2 files changed, 17 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ff4cbae020b..f28852454d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
# Generated by makepkg 5.0.1
-# Fri Dec 23 05:19:03 UTC 2016
+# Fri Dec 23 07:16:19 UTC 2016
pkgbase = rstudio-desktop-bin
pkgdesc = A new integrated development environment (IDE) for R (binary version from RStudio official website)
pkgver = 1.0.136
- pkgrel = 1
+ pkgrel = 2
url = http://www.rstudio.org/
install = rstudio-desktop-bin.install
arch = i686
arch = x86_64
license = GPL
- makedepends = patchelf
depends = r
depends = gstreamer0.10-base
depends = hicolor-icon-theme
diff --git a/PKGBUILD b/PKGBUILD
index c31aa5c75c4..d493bfb015d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,13 +13,13 @@
pkgname=rstudio-desktop-bin
pkgver=1.0.136
-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' 'gstreamer0.10-base' 'hicolor-icon-theme' 'libxcomposite' 'libxslt' 'shared-mime-info' 'libxrandr' 'pandoc' 'pandoc-citeproc')
-makedepends=('patchelf')
+#makedepends=('patchelf')
conflicts=('rstudio-desktop' 'rstudio-desktop-git' 'rstudio-desktop-preview-bin')
provides=("rstudio-desktop=${pkgver}")
options=(!strip)
@@ -52,19 +52,19 @@ package() {
tar zxpf data.tar.gz -C "$pkgdir"
install -dm755 "$pkgdir/usr/bin"
- 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"
+ #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"
- patchelf --set-rpath '$ORIGIN/..' libclang.so
+# 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/../..'
+# cd "$pkgdir/usr/lib/rstudio/bin/plugins"
+# ls */*.so | xargs -n1 patchelf --set-rpath '$ORIGIN/../..'
find "$pkgdir/usr" -type d -print0 | xargs -0 chmod 755
find "$pkgdir/usr" -type f -name '*.so.*' -print0 | xargs -0 chmod 644
@@ -72,11 +72,15 @@ package() {
cd "$pkgdir/usr/lib/rstudio/bin"
ls libQt*.so.*| grep '\.[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}$'|
while read x;do
- ln -sf "$x" "${x%.+([0-9]).+([0-9])}"
+ if [[ ! -e "${x%.+([0-9]).+([0-9])}" ]];then
+ ln -s "$x" "${x%.+([0-9]).+([0-9])}"
+ fi
done
ls lib*.so.* | grep '\.so\.[0-9]\{1,\}\.[0-9]\{1,\}$'|
while read x;do
- ln -sf "$x" "${x%.+([0-9])}"
+ if [[ ! -e "${x%.+([0-9])}" ]];then
+ ln -s "$x" "${x%.+([0-9])}"
+ fi
done
cd "$pkgdir/usr/bin"