diff --git a/repo/rstudio-desktop/PKGBUILD b/repo/rstudio-desktop/PKGBUILD index ca8a993..d07696d 100644 --- a/repo/rstudio-desktop/PKGBUILD +++ b/repo/rstudio-desktop/PKGBUILD @@ -16,7 +16,7 @@ _pkgname="rstudio-desktop" pkgname="$_pkgname" -pkgver=2024.12.1 +pkgver=2024.12.1.563 pkgrel=1 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language" url="https://github.com/rstudio/rstudio" @@ -24,10 +24,14 @@ license=('AGPL-3.0-only') arch=('x86_64') depends=("quarto-cli" - 'boost-libs' 'dbus' 'hicolor-icon-theme' 'hunspell-en_US' + 'libboost_chrono.so' # boost-libs + 'libboost_filesystem.so' # boost-libs + 'libboost_iostreams.so' # boost-libs + 'libboost_program_options.so' # boost-libs + 'libboost_thread.so' # boost-libs 'libcups' 'mathjax2' 'nspr' @@ -136,7 +140,7 @@ prepare() ( cd "$_pkgsrc" # Do not use outdated version name of pandoc - sed -E -e '/PANDOC_VERSION/s/2.[0-9]+/current/' -i "cmake/globals.cmake" + sed -E -e '/PANDOC_VERSION/s/"[0-9\.]+"/"'${_pandocver}'"/' -i "cmake/globals.cmake" # Suppress _FORTIFY_SOURCE mismatch warnings sed -i 's/D_FORTIFY_SOURCE=2/D_FORTIFY_SOURCE=3/' "src/cpp/CMakeLists.txt" @@ -173,10 +177,6 @@ prepare() ( sed -E 's&(STRINGS) "/etc/os-release" (OS_RELEASE)&\1 "/usr/lib/os-release" \2&' \ -i cmake/modules/OsRelease.cmake - # fix boost 1.86 incompatibility - sed -E -e 's&return afterResponse_;&return (bool)afterResponse_;&' \ - -i src/cpp/core/json/JsonRpc.cpp - cd "$srcdir/$_pkgsrc/dependencies/common" install -d pandoc/${_pandocver} @@ -216,11 +216,6 @@ build() ( ln -sfT /usr/bin/pandoc pandoc/${_pandocver}/bin/tools/pandoc fi - local _ldflags=( - -L"$srcdir/$_pkgsrc/dependencies/soci-$_soci_version/build/lib" - ) - export LDFLAGS+=" ${_ldflags[@]}" - cd "${srcdir}" echo "Downloading and installing R packages..." export R_LIBS_USER="$srcdir/$_pkgsrc/dependencies/R"