summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Klevtsov2016-01-11 14:25:21 +0700
committerArtem Klevtsov2016-01-11 14:25:21 +0700
commite39decf5d5db7d52c78d2c10b1454fbf5cf9ea94 (patch)
tree9c4eec753488e9ba1d1bc539335f10a3b4e1aa29
parent6dee69d7a766e35f8da05bea9d9309a6362c2f84 (diff)
downloadaur-e39decf5d5db7d52c78d2c10b1454fbf5cf9ea94.tar.gz
Remove temp fix
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
2 files changed, 5 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2bf99e9b7496..ef4e47ed3a7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Jan 10 15:41:40 UTC 2016
+# Mon Jan 11 07:24:57 UTC 2016
pkgbase = rstudio-desktop-git
pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
- pkgver = 0.99.842
+ pkgver = 0.99.849
pkgrel = 1
url = https://www.rstudio.com/products/rstudio/
install = rstudio-desktop-git.install
diff --git a/PKGBUILD b/PKGBUILD
index ff81ada4e6cf..9724ed9f22f4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=rstudio-desktop-git
_gitname=rstudio
-pkgver=0.99.842
+pkgver=0.99.849
_gwtver=2.7.0
_ginver=1.5
pkgrel=1
@@ -45,10 +45,6 @@ prepare() {
msg "Downloading and installing R 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() {
@@ -67,9 +63,10 @@ package() {
make DESTDIR="${pkgdir}" install
# Install the license
install -Dm 644 ../COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+ # Remove unnecessary directories
+ rm -rf "${pkgdir}/usr/lib/rstudio/resources/"{dictionaries,mathjax-23,libclang}
# Creaate symlinks
install -d "${pkgdir}/usr/bin"
- rm -rf "${pkgdir}/usr/lib/rstudio/resources/"{dictionaries,mathjax-23,libclang}
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"