diff --git a/.SRCINFO b/.SRCINFO index 7d126b6c3bae5..6e447d13c8d39 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.06.2.561 - pkgrel = 3 + pkgver = 2023.09.0.463 + pkgrel = 1 url = https://www.rstudio.com/products/rstudio/ arch = x86_64 license = AGPL3 @@ -18,6 +18,7 @@ pkgbase = rstudio-desktop makedepends = patchelf makedepends = wget makedepends = yarn + makedepends = quarto depends = r>=3.3.0 depends = boost-libs depends = qt5-sensors @@ -37,12 +38,12 @@ pkgbase = rstudio-desktop optdepends = openssh-askpass: for a git ssh access optdepends = quarto: for Quarto projects support noextract = gin-2.1.2.zip - source = rstudio-2023.06.2.561.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v2023.06.2+561.tar.gz + source = rstudio-2023.09.0.463.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v2023.09.0+463.tar.gz source = https://github.com/quarto-dev/quarto/archive/refs/heads/release/rstudio-cherry-blossom.zip source = https://nodejs.org/dist/v16.14.0/node-v16.14.0-linux-x64.tar.gz source = qt.conf source = pandoc_version.patch - sha256sums = 83469a4b7311d745c24d7d9e55c44aa4325dda3bdde50a903e2f9ead47d75cc7 + sha256sums = b9bf940513ee7a2d96d636963a400e60bfc263865f9b90e69866f5164a53a684 sha256sums = df3a040f0cf4ce1892519082dd6822a8ca433e9e4f02d9394ab2931733f7e5a6 sha256sums = 2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b sha256sums = 723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921 diff --git a/PKGBUILD b/PKGBUILD index 254cbfa92990d..f0bbb38456e57 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,10 +2,10 @@ pkgname=rstudio-desktop _vermajor=2023 -_verminor=06 -_verpatch=2 -_versuffix=561 -_gitcommit=de44a31 +_verminor=09 +_verpatch=0 +_versuffix=463 +_gitcommit=b51c81c _gitname=rstudio-rstudio-${_gitcommit} pkgver=${_vermajor}.${_verminor}.${_verpatch}.${_versuffix} _srcname=rstudio-${_vermajor}.${_verminor}.${_verpatch}-${_versuffix} @@ -15,7 +15,7 @@ _nodever=16.14.0 _pandocver="current" _quarto="FALSE" -pkgrel=3 +pkgrel=1 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language" arch=('x86_64') url="https://www.rstudio.com/products/rstudio/" @@ -33,7 +33,7 @@ source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs "qt.conf" "pandoc_version.patch") -sha256sums=('83469a4b7311d745c24d7d9e55c44aa4325dda3bdde50a903e2f9ead47d75cc7' +sha256sums=('b9bf940513ee7a2d96d636963a400e60bfc263865f9b90e69866f5164a53a684' 'df3a040f0cf4ce1892519082dd6822a8ca433e9e4f02d9394ab2931733f7e5a6' '2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b' '723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921' @@ -41,6 +41,14 @@ sha256sums=('83469a4b7311d745c24d7d9e55c44aa4325dda3bdde50a903e2f9ead47d75cc7' 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 @@ -70,15 +78,13 @@ prepare() { build() { # Quarto set up - if (pacman -Q quarto >/dev/null 2>/dev/null) ; then - _quarto="TRUE" + if [ ${_quarto} = "TRUE" ]; then 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