diff --git a/.SRCINFO b/.SRCINFO index c3ce2ca614d91..e6737a2951cf8 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 = 2024.12.1.563 - pkgrel = 1 + pkgrel = 2 url = https://github.com/rstudio/rstudio arch = x86_64 license = AGPL-3.0-only @@ -15,6 +15,7 @@ pkgbase = rstudio-desktop makedepends = nvm makedepends = openssl makedepends = pam + makedepends = postgresql-libs makedepends = python makedepends = python-setuptools makedepends = wget @@ -28,6 +29,7 @@ pkgbase = rstudio-desktop depends = libboost_program_options.so depends = libboost_thread.so depends = libcups + depends = libyaml-cpp.so depends = mathjax2 depends = nspr depends = nss @@ -36,6 +38,7 @@ pkgbase = rstudio-desktop optdepends = git: for git support optdepends = nodejs: for copilot support optdepends = openssh-askpass: for a git ssh access + optdepends = postgresql-libs: for postgresql optdepends = quarto: for Quarto projects support optdepends = subversion: for subversion support provides = rstudio-desktop diff --git a/PKGBUILD b/PKGBUILD index fed204c112fad..7dcf0067486d4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,7 +17,7 @@ _pkgname="rstudio-desktop" pkgname="$_pkgname" pkgver=2024.12.1.563 -pkgrel=1 +pkgrel=2 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language" url="https://github.com/rstudio/rstudio" license=('AGPL-3.0-only') @@ -33,6 +33,7 @@ depends=( 'libboost_program_options.so' # boost-libs 'libboost_thread.so' # boost-libs 'libcups' + 'libyaml-cpp.so' # yaml-cpp 'mathjax2' 'nspr' 'nss' @@ -47,9 +48,10 @@ makedepends=( 'java-environment' 'libcups' 'ninja' - 'nvm' # AUR + 'nvm' 'openssl' 'pam' + 'postgresql-libs' 'python' 'python-setuptools' 'wget' @@ -59,6 +61,7 @@ optdepends=( 'git: for git support' 'nodejs: for copilot support' 'openssh-askpass: for a git ssh access' + 'postgresql-libs: for postgresql' 'quarto: for Quarto projects support' 'subversion: for subversion support' ) @@ -197,6 +200,8 @@ prepare() ( ) build() ( + export CMAKE_POLICY_VERSION_MINIMUM=3.5 + _nvm_env _run_if_exists _build_soci @@ -263,8 +268,9 @@ build() ( -G Ninja -DCMAKE_BUILD_TYPE=None -DRSTUDIO_TARGET=Electron - -DRSTUDIO_USE_SYSTEM_BOOST=YES - -DRSTUDIO_USE_SYSTEM_SOCI=NO + -DRSTUDIO_USE_SYSTEM_BOOST=ON + -DRSTUDIO_USE_SYSTEM_SOCI=OFF + -DRSTUDIO_USE_SYSTEM_YAML_CPP=ON -DRSTUDIO_NODE_VERSION="Current" -DRSTUDIO_INSTALLED_NODE_VERSION="Current" -DQUARTO_ENABLED=${_quarto} @@ -286,8 +292,6 @@ package() { # See following script for potentially useful flags. # https://github.com/ozankiratli/dotfiles/blob/master/.config/sway/scripts/rstudio-wayland -#!/usr/bin/bash - name=rstudio flags_file="\${XDG_CONFIG_HOME:-\$HOME/.config}/\${name}-flags.conf" fallback_file="\${XDG_CONFIG_HOME:-\$HOME/.config}/electron-flags.conf"