summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2021-06-20 19:07:59 -0700
committerStephen Martin2021-06-20 19:07:59 -0700
commitd340ae1d4d65b254df94da423ba6aaef74b6b701 (patch)
treecb259dc973206be7eb29b2c49bb34079924d8f5c
parent9946d3b822cb20834c984fb473718c65b542b83a (diff)
downloadaur-d340ae1d4d65b254df94da423ba6aaef74b6b701.tar.gz
Hunspell fix.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD10
2 files changed, 6 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1bfd60b2a265..45ac3c10626d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rstudio-server-git
pkgdesc = A new integrated development environment (IDE) for R programming language
- pkgver = v1.3.1073.r4250.gbdf0b8b38b
+ pkgver = v1.4.1717.r350.g0c2d46e04b
pkgrel = 1
url = http://www.rstudio.org/
install = rstudio-server-git.install
@@ -29,6 +29,7 @@ pkgbase = rstudio-server-git
depends = sqlite3
depends = soci
depends = yaml-cpp
+ depends = hunspell-en_US
conflicts = rstudio-server
source = git+https://github.com/rstudio/rstudio.git
source = rstudio-server.service
diff --git a/PKGBUILD b/PKGBUILD
index b4ffea75108d..50b67b7d50cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
#
pkgname=rstudio-server-git
_gitname="rstudio"
-pkgver=v1.3.1073.r4250.gbdf0b8b38b
+pkgver=v1.4.1717.r350.g0c2d46e04b
_gwtver=2.8.2
_ginver=2.1.2
_nodever=10.19.0
@@ -17,7 +17,7 @@ pkgdesc="A new integrated development environment (IDE) for R programming langua
arch=('i686' 'x86_64')
url="http://www.rstudio.org/"
license=('AGPL3')
-depends=('r>=3.0.1' 'boost-libs>=1.69' 'openssl' 'mathjax2' 'pandoc' 'clang' 'postgresql-libs' 'sqlite3' 'soci' 'yaml-cpp')
+depends=('r>=3.0.1' 'boost-libs>=1.69' 'openssl' 'mathjax2' 'pandoc' 'clang' 'postgresql-libs' 'sqlite3' 'soci' 'yaml-cpp' 'hunspell-en_US')
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')
@@ -55,12 +55,12 @@ prepare () {
cd "${srcdir}/${_gitname}/dependencies/common"
_pandocver=$(grep -oP "(?<=PANDOC_VERSION=\").*(?=\"$)" install-pandoc)
- install -d pandoc /${_pandocver}
+ install -d pandoc/${_pandocver}
ln -sfT "/usr/share/myspell/dicts" dictionaries
ln -sfT "/usr/share/mathjax2" mathjax-27
ln -sfT "/usr/bin/pandoc" pandoc/${_pandocver}/pandoc
- ln -sfT "/usr/bin/pandoc-citeproc" pandoc/pandoc-citeproc
+ ln -sfT "/usr/bin/pandoc-citeproc" pandoc/${_pandocvec}/pandoc-citeproc
# Nodejs
install -d node/${_nodever}
@@ -83,8 +83,6 @@ prepare () {
build() {
- cd "${srcdir}/$_gitname/dependencies/common"
-
# Small hack
# unset user Rprofile.r variable for building
if [ -n $R_PROFILE_USER ]; then