diff options
author | Stephen Martin | 2020-04-02 09:53:22 -0700 |
---|---|---|
committer | Stephen Martin | 2020-04-02 09:53:22 -0700 |
commit | aea1a5c143fcd4e01f07b2cdfe56f201702f95ec (patch) | |
tree | 41866d6bd6b057ca9a530636f3503850b15f15ef | |
parent | 1ba608ed6b94484a1e16325cfcfa416b55d89c09 (diff) | |
download | aur-aea1a5c143fcd4e01f07b2cdfe56f201702f95ec.tar.gz |
Removed SOCI patch (upstreamed).
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -1,6 +1,6 @@ pkgbase = rstudio-server-git pkgdesc = A new integrated development environment (IDE) for R programming language - pkgver = v1.2.5033.r3965.ga7aa56fcba + pkgver = v1.2.5033.r3971.g73fb0f3884 pkgrel = 1 url = http://www.rstudio.org/ install = rstudio-server-git.install @@ -29,7 +29,7 @@ pkgbase = rstudio-server-git depends = sqlite3 depends = soci conflicts = rstudio-server - source = git://github.com/rstudio/rstudio.git + source = git+https://github.com/rstudio/rstudio.git source = rstudio-server.service source = https://s3.amazonaws.com/rstudio-buildtools/gin-2.1.2.zip source = https://s3.amazonaws.com/rstudio-buildtools/gwt-2.8.2.zip @@ -8,7 +8,7 @@ # pkgname=rstudio-server-git _gitname="rstudio" -pkgver=v1.2.5033.r3965.ga7aa56fcba +pkgver=v1.2.5033.r3971.g73fb0f3884 _gwtver=2.8.2 _ginver=2.1.2 _nodever=10.19.0 @@ -21,7 +21,7 @@ depends=('r>=3.0.1' 'boost-libs>=1.69' 'openssl' 'mathjax2' 'pandoc' 'clang' 'po makedepends=('git' 'cmake>=3.4.3' 'boost>=1.69' 'jdk8-openjdk' 'apache-ant' 'unzip' 'bzip2' 'pango' 'pam' 'zlib' 'wget' 'yarn') install="${pkgname}.install" conflicts=('rstudio-server') -source=('git://github.com/rstudio/rstudio.git' +source=('git+https://github.com/rstudio/rstudio.git' 'rstudio-server.service' "https://s3.amazonaws.com/rstudio-buildtools/gin-${_ginver}.zip" "https://s3.amazonaws.com/rstudio-buildtools/gwt-${_gwtver}.zip" @@ -46,7 +46,7 @@ pkgver() { prepare () { cd ${srcdir}/$_gitname # Patching SOCI - patch -p1 < ${srcdir}/soci.patch + # patch -p1 < ${srcdir}/soci.patch # patch -p1 < ${srcdir}/rstudio_boost.patch msg "Extracting dependencies..." |