summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Büchau2022-01-04 11:13:50 +0100
committerYann Büchau2022-01-04 12:32:35 +0100
commit80aa1b343c778b2a4dabf7d36e8e4c399a828167 (patch)
tree6714fe5664456efbdc0d3fe46b0ccfcbfc90dbb9
parentd340ae1d4d65b254df94da423ba6aaef74b6b701 (diff)
downloadaur-80aa1b343c778b2a4dabf7d36e8e4c399a828167.tar.gz
Apply mjandrews' patch to use quarto
- https://aur.archlinux.org/packages/rstudio-server-git/#comment-832867
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore7
-rw-r--r--PKGBUILD10
3 files changed, 17 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 45ac3c10626d..46f6cb8ceab2 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.4.1717.r350.g0c2d46e04b
+ pkgver = 2021.09.0+351.r1191.gbcb324f6f5
pkgrel = 1
url = http://www.rstudio.org/
install = rstudio-server-git.install
@@ -8,6 +8,7 @@ pkgbase = rstudio-server-git
arch = x86_64
license = AGPL3
makedepends = git
+ makedepends = quarto-cli-bin
makedepends = cmake>=3.4.3
makedepends = boost>=1.69
makedepends = jdk8-openjdk
@@ -35,11 +36,11 @@ pkgbase = rstudio-server-git
source = rstudio-server.service
source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-gin/gin-2.1.2.zip
source = https://storage.googleapis.com/gwt-releases/gwt-2.8.2.zip
- source = https://nodejs.org/dist/v10.19.0/node-v10.19.0-linux-x64.tar.gz
+ source = https://nodejs.org/dist/v14.17.5/node-v14.17.5-linux-x64.tar.gz
md5sums = SKIP
md5sums = eea28f7865720f6c8d5de12f3f631880
md5sums = e2617189fe5c138945b8cc95f26bd476
md5sums = c295406d68c5ef364e445068599aa6d4
- md5sums = 441a8e19ab9cd9884cbd24f85840c7a6
+ md5sums = 3cd3b18e1412067aabd2e1b23b93106e
pkgname = rstudio-server-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9dc5e252d1e0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.zip
+*.gz
+*.pkg*
+src/
+pkg/
+rstudio/
+
diff --git a/PKGBUILD b/PKGBUILD
index 50b67b7d50cb..68556e4dec66 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,17 +8,17 @@
#
pkgname=rstudio-server-git
_gitname="rstudio"
-pkgver=v1.4.1717.r350.g0c2d46e04b
+pkgver=2021.09.0+351.r1191.gbcb324f6f5
_gwtver=2.8.2
_ginver=2.1.2
-_nodever=10.19.0
+_nodever=14.17.5
pkgrel=1
pkgdesc="A new integrated development environment (IDE) for R programming language"
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' 'hunspell-en_US')
-makedepends=('git' 'cmake>=3.4.3' 'boost>=1.69' 'jdk8-openjdk' 'apache-ant' 'unzip' 'bzip2' 'pango' 'pam' 'zlib' 'wget' 'yarn')
+makedepends=('git' 'quarto-cli-bin' '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+https://github.com/rstudio/rstudio.git'
@@ -31,7 +31,7 @@ md5sums=('SKIP'
'eea28f7865720f6c8d5de12f3f631880'
'e2617189fe5c138945b8cc95f26bd476'
'c295406d68c5ef364e445068599aa6d4'
- '441a8e19ab9cd9884cbd24f85840c7a6')
+ '3cd3b18e1412067aabd2e1b23b93106e')
pkgver() {
@@ -59,6 +59,7 @@ prepare () {
ln -sfT "/usr/share/myspell/dicts" dictionaries
ln -sfT "/usr/share/mathjax2" mathjax-27
+ ln -sfT /opt/quarto quarto
ln -sfT "/usr/bin/pandoc" pandoc/${_pandocver}/pandoc
ln -sfT "/usr/bin/pandoc-citeproc" pandoc/${_pandocvec}/pandoc-citeproc
@@ -72,6 +73,7 @@ prepare () {
# Fix links for src/cpp/session/CMakeLists.txt
cd "${srcdir}/${_gitname}/dependencies"
ln -sfT common/dictionaries dictionaries
+ ln -sfT common/quarto quarto
ln -sfT common/mathjax-27 mathjax-27
ln -sfT common/pandoc pandoc