2024.12.1.563

This commit is contained in:
xiota 2025-03-01 04:54:44 +00:00
parent 9b66a094ce
commit 5483e3e131
2 changed files with 16 additions and 15 deletions

View file

@ -1,6 +1,6 @@
pkgbase = rstudio-desktop
pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
pkgver = 2024.12.1
pkgver = 2024.12.1.563
pkgrel = 1
url = https://github.com/rstudio/rstudio
arch = x86_64
@ -19,10 +19,14 @@ pkgbase = rstudio-desktop
makedepends = python-setuptools
makedepends = wget
makedepends = yarn
depends = boost-libs
depends = dbus
depends = hicolor-icon-theme
depends = hunspell-en_US
depends = libboost_chrono.so
depends = libboost_filesystem.so
depends = libboost_iostreams.so
depends = libboost_program_options.so
depends = libboost_thread.so
depends = libcups
depends = mathjax2
depends = nspr
@ -38,7 +42,7 @@ pkgbase = rstudio-desktop
conflicts = rstudio-desktop
options = !emptydirs
options = !debug
source = rstudio-2024.12.1-c5bcd0e.tar.gz::https://github.com/rstudio/rstudio/archive/c5bcd0ec4fb959b2a9fcd656f12eb62092f0617e.tar.gz
source = rstudio-2024.12.1.563-c5bcd0e.tar.gz::https://github.com/rstudio/rstudio/archive/c5bcd0ec4fb959b2a9fcd656f12eb62092f0617e.tar.gz
source = quarto::git+https://github.com/quarto-dev/quarto.git#branch=release/rstudio-cranberry-hibiscus
source = soci-4.0.3.tar.gz::https://github.com/SOCI/soci/archive/refs/tags/v4.0.3.tar.gz
sha256sums = SKIP

View file

@ -12,11 +12,13 @@
: ${_quarto_branch:=release/rstudio-cranberry-hibiscus}
: ${_quarto:=false}
_quarto=f
: ${_commit:=c5bcd0ec4fb959b2a9fcd656f12eb62092f0617e}
_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 +26,14 @@ license=('AGPL-3.0-only')
arch=('x86_64')
depends=(
'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 +142,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 +179,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 +218,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"