diff --git a/.SRCINFO b/.SRCINFO index 6e447d13c8d39..11e44224d5564 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = rstudio-desktop pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language pkgver = 2023.09.0.463 - pkgrel = 1 + pkgrel = 2 url = https://www.rstudio.com/products/rstudio/ arch = x86_64 license = AGPL3 @@ -18,7 +18,6 @@ pkgbase = rstudio-desktop makedepends = patchelf makedepends = wget makedepends = yarn - makedepends = quarto depends = r>=3.3.0 depends = boost-libs depends = qt5-sensors diff --git a/PKGBUILD b/PKGBUILD index f0bbb38456e57..3405c4538b084 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ _nodever=16.14.0 _pandocver="current" _quarto="FALSE" -pkgrel=1 +pkgrel=2 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language" arch=('x86_64') url="https://www.rstudio.com/products/rstudio/" @@ -41,14 +41,6 @@ sha256sums=('b9bf940513ee7a2d96d636963a400e60bfc263865f9b90e69866f5164a53a684' noextract=("gin-${_ginver}.zip") -# Choose build options: either with or without quarto -if (pacman -Q quarto >/dev/null 2>/dev/null) ; then - _quarto="TRUE" - makedepends+=('quarto') -else - _quarto="FALSE" -fi - prepare() { cd ${srcdir}/${_srcname} # Do not use outdated version name of pandoc @@ -78,13 +70,15 @@ prepare() { build() { # Quarto set up - if [ ${_quarto} = "TRUE" ]; then + if (pacman -Q quarto >/dev/null 2>/dev/null) ; then + _quarto="TRUE" msg "Quarto is installed, include it to build" cd "${srcdir}/${_srcname}/dependencies" install -d quarto/bin/tools ln -sfT /usr/bin/quarto quarto/bin/quarto ln -sfT /usr/bin/pandoc quarto/bin/tools/pandoc else + _quarto="FALSE" msg "Quarto is not installed, use Pandoc" cd "${srcdir}/${_srcname}/dependencies" install -d pandoc/${_pandocver}/bin/tools