Removed quarto-cli-bin dependency

This commit is contained in:
Aleksandr Beliaev 2022-02-19 00:20:38 +13:00
parent 58ec0b6489
commit c005fc2eb3
2 changed files with 14 additions and 8 deletions

View file

@ -1,9 +1,8 @@
pkgbase = rstudio-desktop
pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
pkgver = 2022.02.0+443
pkgrel = 2
pkgrel = 3
url = https://www.rstudio.com/products/rstudio/
arch = i686
arch = x86_64
license = AGPL3
makedepends = git
@ -32,7 +31,6 @@ pkgbase = rstudio-desktop
depends = hunspell-en_US
depends = mathjax2
depends = pandoc
depends = quarto-cli-bin
depends = yaml-cpp
optdepends = git: for git support
optdepends = subversion: for subversion support
@ -47,6 +45,7 @@ pkgbase = rstudio-desktop
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/v14.17.5/node-v14.17.5-linux-x64.tar.gz
source = https://s3.amazonaws.com/rstudio-buildtools/quarto/0.9.16/quarto-0.9.16-linux-amd64.tar.gz
source = qt.conf
source = cran_multithread.patch
source = sigstksz_gcc11.patch
@ -54,6 +53,7 @@ pkgbase = rstudio-desktop
sha256sums = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
sha256sums = 970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b
sha256sums = dc04c7e60235ff73536ba0d9e50638090f60cacabfd83184082dce3b330afc6e
sha256sums = 2bd66bf6f448e12b129c6daebea561db3df700e295984155f409e6dcdfd22d75
sha256sums = 723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921
sha256sums = c907e6eec5ef324ad498b44fb9926bb5baafc4e0778ca01f6ba9b49dd3a2a980
sha256sums = 7b8420db08f848f7baac0f3104c879ac7ce6e27e463f96a6b1c6589cd4b8df82

View file

@ -14,12 +14,14 @@ _srcname=rstudio-${_vermajor}.${_verminor}.${_verpatch}${_versuffix//+/-}
_gwtver=2.8.2
_ginver=2.1.2
_nodever=14.17.5
pkgrel=2
_quartover=0.9.16
pkgrel=3
pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
arch=('i686' 'x86_64')
arch=('x86_64')
url="https://www.rstudio.com/products/rstudio/"
license=('AGPL3')
depends=('r>=3.0.1' boost-libs qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns postgresql-libs sqlite3 soci clang hunspell-en_US mathjax2 pandoc quarto-cli-bin yaml-cpp)
depends=('r>=3.0.1' boost-libs qt5-sensors qt5-svg qt5-webengine qt5-xmlpatterns postgresql-libs sqlite3 soci clang hunspell-en_US mathjax2 pandoc yaml-cpp)
makedepends=(git 'cmake>=3.1.0' boost desktop-file-utils jdk8-openjdk apache-ant unzip openssl libcups pam patchelf wget yarn)
optdepends=('git: for git support'
'subversion: for subversion support'
@ -30,6 +32,7 @@ source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs
"https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-gin/gin-${_ginver}.zip"
"https://storage.googleapis.com/gwt-releases/gwt-${_gwtver}.zip"
"https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz"
"https://s3.amazonaws.com/rstudio-buildtools/quarto/${_quartover}/quarto-${_quartover}-linux-amd64.tar.gz"
"qt.conf"
"cran_multithread.patch"
"sigstksz_gcc11.patch")
@ -38,6 +41,7 @@ sha256sums=('36234218f118f5085e417411e137791072c00380bce6a016e551e6ecb404ae4d'
'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
'970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b'
'dc04c7e60235ff73536ba0d9e50638090f60cacabfd83184082dce3b330afc6e'
'2bd66bf6f448e12b129c6daebea561db3df700e295984155f409e6dcdfd22d75'
'723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921'
'c907e6eec5ef324ad498b44fb9926bb5baafc4e0778ca01f6ba9b49dd3a2a980'
'7b8420db08f848f7baac0f3104c879ac7ce6e27e463f96a6b1c6589cd4b8df82')
@ -60,12 +64,14 @@ prepare() {
cd "${srcdir}/${_srcname}/dependencies/common"
_pandocver=$(grep -oP "(?<=PANDOC_VERSION=\").*(?=\"$)" install-pandoc)
install -d pandoc/${_pandocver}
install -d quarto/bin
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/quarto quarto/bin/quarto
# Quarto
install -d quarto/bin
ln -sfT "${srcdir}/quarto-${_quartover}/bin/quarto" quarto/bin/quarto
# Nodejs
install -d node/${_nodever}