diff options
author | Artem Klevtsov | 2018-01-14 19:57:06 +0700 |
---|---|---|
committer | Artem Klevtsov | 2018-01-14 19:57:06 +0700 |
commit | f9bbe0ac34e760261527f18dc53348d87b17993e (patch) | |
tree | 9ab3dc5c2199e28932f4b57cfcb4de1f2adffc22 /PKGBUILD | |
parent | 00452ffb4846c7717812751b810c135f70af80bb (diff) | |
download | aur-f9bbe0ac34e760261527f18dc53348d87b17993e.tar.gz |
Remove patch.
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 26 |
1 files changed, 12 insertions, 14 deletions
@@ -2,7 +2,7 @@ pkgname=rstudio-desktop-git _gitname=rstudio -pkgver=1.1.371 +pkgver=v1.1.371.r729.g401e38621d _gwtver=2.8.1 _ginver=2.1.2 _clangver=5.0.0 @@ -11,11 +11,11 @@ pkgdesc="A powerful and productive integrated development environment (IDE) for arch=('i686' 'x86_64') url="https://www.rstudio.com/products/rstudio/" license=('AGPL3') -depends=('boost-libs>=1.5' 'r>=2.11.1' hicolor-icon-theme shared-mime-info pango hunspell-en mathjax pandoc clang qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webkit qt5-xmlpatterns) +depends=('boost-libs>=1.63' 'r>=2.11.1' hicolor-icon-theme shared-mime-info pango hunspell-en mathjax pandoc clang qt5-base qt5-declarative qt5-location qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns) makedepends=(git 'cmake>=2.8' 'boost>=1.63' java-environment apache-ant unzip openssl libcups pam wget) optdepends=('git: for git support' - 'subversion: for subversion suuport' - 'openssh-askpass: for a git ssh access') + 'subversion: for subversion suuport' + 'openssh-askpass: for a git ssh access') provides=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview') conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview') install="${pkgname}.install" @@ -23,40 +23,38 @@ install="${pkgname}.install" source=("git+https://github.com/rstudio/rstudio.git" "https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip" "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip" - openssl-socketproxy.patch) + "https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip") md5sums=('SKIP' 'e2617189fe5c138945b8cc95f26bd476' 'ddd572887957fd5cdfde3469bd8c1102' - 'd571313f511ad4a17014c4aef6d01bbc') + '0e03798b8e53096c4a906bde05e32378') pkgver() { cd "${srcdir}/${_gitname}" - git describe --tags --abbrev=0 | sed 's|v||g' + git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g' } prepare() { - msg "Apply socketproxy-openssl.patch..." - cd "${srcdir}/${_gitname}" - patch -p1 < ${srcdir}/openssl-socketproxy.patch - msg "Extracting dependencies..." cd "${srcdir}/${_gitname}/src/gwt" + install -d dictionaries install -d lib/{gin,gwt} install -d lib/gin/${_ginver} install -d lib/gwt/${_gwtver} + unzip -qo "${srcdir}/core-dictionaries.zip" -d dictionaries unzip -qo "${srcdir}/gin-${_ginver}.zip" -d lib/gin/${_ginver} cp -r "${srcdir}/gwt-${_gwtver}/"* lib/gwt/${_gwtver} - + cd "${srcdir}/${_gitname}/dependencies/common" install -d pandoc libclang/{3.5,builtin-headers} - + ln -sfT /usr/share/myspell/dicts dictionaries ln -sfT /usr/share/mathjax mathjax-26 ln -sfT /usr/bin/pandoc pandoc/pandoc ln -sfT /usr/bin/pandoc-citeproc pandoc/pandoc-citeproc ln -sfT /usr/lib/libclang.so libclang/3.5/libclang.so ln -sfT /usr/lib/clang/$_clangver/include libclang/builtin-headers/3.5 - + msg "Downloading and installing R packages..." bash install-packages } |