From 15411b8475e866fa92956214df0eeed023e2b605 Mon Sep 17 00:00:00 2001 From: Aleksandr Beliaev Date: Tue, 24 Sep 2024 12:33:36 +1200 Subject: [PATCH] v2024.09.0.375 --- .SRCINFO | 17 +++--- ...ode.patch => 0001-enable_system_node.patch | 53 +++++++++---------- PKGBUILD | 41 ++++++-------- 3 files changed, 53 insertions(+), 58 deletions(-) rename 0002-allow_system_node.patch => 0001-enable_system_node.patch (52%) diff --git a/.SRCINFO b/.SRCINFO index bc7a169d8e25f..8750384e610c2 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.04.2.764 - pkgrel = 2 + pkgver = 2024.09.0.375 + pkgrel = 5 url = https://github.com/rstudio/rstudio arch = x86_64 license = AGPL-3.0-only @@ -9,11 +9,14 @@ pkgbase = rstudio-desktop makedepends = cmake>=3.29 makedepends = boost makedepends = ninja + makedepends = npm + makedepends = gyp makedepends = desktop-file-utils - makedepends = jdk8-openjdk + makedepends = jdk11-openjdk makedepends = apache-ant makedepends = unzip makedepends = openssl + makedepends = python-setuptools makedepends = libcups makedepends = pam makedepends = patchelf @@ -38,17 +41,17 @@ pkgbase = rstudio-desktop optdepends = quarto: for Quarto projects support options = !emptydirs options = !debug - source = rstudio-2024.04.2.764.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v2024.04.2+764.tar.gz + source = rstudio-2024.09.0.375.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v2024.09.0+375.tar.gz source = git+https://github.com/quarto-dev/quarto.git#branch=release/rstudio-cherry-blossom source = https://github.com/SOCI/soci/archive/refs/tags/v4.0.3.tar.gz source = qt.conf - source = 0002-allow_system_node.patch + source = 0001-enable_system_node.patch source = 0003-fix_boost_186.patch - sha256sums = 89b0d6741b6bd4dac52fd8bd9372d4f1919c97dd41056a03c975d0570eaf439e + sha256sums = 8a29b77c53a3db8379d824a9f4a491843036003d105ed71981cd40fe39d2c8c8 sha256sums = SKIP sha256sums = 4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928 sha256sums = 723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921 - sha256sums = ad4bd3076ff2bff7d075e3928a7e55c618fa744e3bf5d3d387bf70e01ff96c2f + sha256sums = fa20d753ba2d2dcf64705bd8cd0bd4d01090bfee9c8173d4312d1050d26121f3 sha256sums = 7b3384fc7349a69e866ef0db21f196a2cafa3a9e2fb7f1edaead773b991dac72 pkgname = rstudio-desktop diff --git a/0002-allow_system_node.patch b/0001-enable_system_node.patch similarity index 52% rename from 0002-allow_system_node.patch rename to 0001-enable_system_node.patch index 517a45eabf7d5..e3ccda1dfac8b 100644 --- a/0002-allow_system_node.patch +++ b/0001-enable_system_node.patch @@ -1,24 +1,24 @@ -diff -ru rstudio-desktop.original/src/rstudio-2024.04.1-748/src/cpp/conf/rsession-dev.conf rstudio-desktop/src/rstudio-2024.04.1-748/src/cpp/conf/rsession-dev.conf ---- rstudio-desktop.original/src/rstudio-2024.04.1-748/src/cpp/conf/rsession-dev.conf 2024-05-07 06:31:08.000000000 +1200 -+++ rstudio-desktop/src/rstudio-2024.04.1-748/src/cpp/conf/rsession-dev.conf 2024-05-21 19:32:00.206198890 +1200 -@@ -39,7 +39,7 @@ - external-pandoc-path=${RSTUDIO_DEPENDENCIES_PANDOC_DIR} - external-quarto-path=${RSTUDIO_DEPENDENCIES_QUARTO_DIR} +diff -ru rstudio-2024.09.0-375/src/cpp/conf/rsession-dev.conf rstudio-2024.09.0-375.new/src/cpp/conf/rsession-dev.conf +--- rstudio-2024.09.0-375/src/cpp/conf/rsession-dev.conf 2024-09-17 05:02:32.000000000 +1200 ++++ rstudio-2024.09.0-375.new/src/cpp/conf/rsession-dev.conf 2024-09-24 11:25:57.648251605 +1200 +@@ -41,7 +41,7 @@ external-libclang-path=${RSTUDIO_DEPENDENCIES_DIR}/common/libclang --external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/18.18.2/bin/node + + # node version below should match RSTUDIO_INSTALLED_NODE_VERSION +-external-node-path=${RSTUDIO_DEPENDENCIES_DIR}/common/node/20.15.1-patched/bin/node +external-node-path=/usr/bin/node # enable copilot copilot-enabled=1 -diff -ru rstudio-desktop.original/src/rstudio-2024.04.1-748/src/cpp/session/CMakeLists.txt rstudio-desktop/src/rstudio-2024.04.1-748/src/cpp/session/CMakeLists.txt ---- rstudio-desktop.original/src/rstudio-2024.04.1-748/src/cpp/session/CMakeLists.txt 2024-05-07 06:31:08.000000000 +1200 -+++ rstudio-desktop/src/rstudio-2024.04.1-748/src/cpp/session/CMakeLists.txt 2024-05-21 10:33:50.351362947 +1200 -@@ -697,10 +697,12 @@ +diff -ru rstudio-2024.09.0-375/src/cpp/session/CMakeLists.txt rstudio-2024.09.0-375.new/src/cpp/session/CMakeLists.txt +--- rstudio-2024.09.0-375/src/cpp/session/CMakeLists.txt 2024-09-17 05:02:32.000000000 +1200 ++++ rstudio-2024.09.0-375.new/src/cpp/session/CMakeLists.txt 2024-09-24 11:27:41.827637114 +1200 +@@ -700,10 +700,12 @@ DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") # install node - install( -- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}/" +- DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/node/${RSTUDIO_INSTALLED_NODE_VERSION}-patched/" - DESTINATION "${RSTUDIO_INSTALL_BIN}/node" - USE_SOURCE_PERMISSIONS) + if(NOT RSTUDIO_USE_SYSTEM_NODE) @@ -30,40 +30,40 @@ diff -ru rstudio-desktop.original/src/rstudio-2024.04.1-748/src/cpp/session/CMak # install quarto (or pandoc if quarto disabled) if(QUARTO_ENABLED) -diff -ru rstudio-desktop.original/src/rstudio-2024.04.1-748/src/cpp/session/SessionOptions.cpp rstudio-desktop/src/rstudio-2024.04.1-748/src/cpp/session/SessionOptions.cpp ---- rstudio-desktop.original/src/rstudio-2024.04.1-748/src/cpp/session/SessionOptions.cpp 2024-05-07 06:31:08.000000000 +1200 -+++ rstudio-desktop/src/rstudio-2024.04.1-748/src/cpp/session/SessionOptions.cpp 2024-05-21 19:33:46.308996710 +1200 -@@ -709,7 +709,7 @@ - std::string* pPath) +diff -ru rstudio-2024.09.0-375/src/cpp/session/SessionOptions.cpp rstudio-2024.09.0-375.new/src/cpp/session/SessionOptions.cpp +--- rstudio-2024.09.0-375/src/cpp/session/SessionOptions.cpp 2024-09-17 05:02:32.000000000 +1200 ++++ rstudio-2024.09.0-375.new/src/cpp/session/SessionOptions.cpp 2024-09-24 11:28:57.490536726 +1200 +@@ -713,7 +713,7 @@ { #if defined(__linux__) && !defined(RSTUDIO_PACKAGE_BUILD) -- FilePath dependenciesPath = resourcePath.completePath("../../dependencies/common/node/18.18.2"); + // node version should match RSTUDIO_INSTALLED_NODE_VERSION +- FilePath dependenciesPath = resourcePath.completePath("../../dependencies/common/node/20.15.1-patched"); + FilePath dependenciesPath = resourcePath.completePath("/usr"); resolvePath(dependenciesPath, pPath); #else resolvePath(resourcePath, pPath); -diff -ru rstudio-desktop.original/src/rstudio-2024.04.1-748/src/gwt/build.xml rstudio-desktop/src/rstudio-2024.04.1-748/src/gwt/build.xml ---- rstudio-desktop.original/src/rstudio-2024.04.1-748/src/gwt/build.xml 2024-05-07 06:31:08.000000000 +1200 -+++ rstudio-desktop/src/rstudio-2024.04.1-748/src/gwt/build.xml 2024-05-21 19:28:10.023896075 +1200 +diff -ru rstudio-2024.09.0-375/src/gwt/build.xml rstudio-2024.09.0-375.new/src/gwt/build.xml +--- rstudio-2024.09.0-375/src/gwt/build.xml 2024-09-17 05:02:32.000000000 +1200 ++++ rstudio-2024.09.0-375.new/src/gwt/build.xml 2024-09-24 11:30:26.016707136 +1200 @@ -85,8 +85,8 @@ -- +- - + + -diff -ru rstudio-desktop.original/src/rstudio-2024.04.1-748/src/node/CMakeNodeTools.txt rstudio-desktop/src/rstudio-2024.04.1-748/src/node/CMakeNodeTools.txt ---- rstudio-desktop.original/src/rstudio-2024.04.1-748/src/node/CMakeNodeTools.txt 2024-05-07 06:31:08.000000000 +1200 -+++ rstudio-desktop/src/rstudio-2024.04.1-748/src/node/CMakeNodeTools.txt 2024-05-21 19:28:34.497148803 +1200 +diff -ru rstudio-2024.09.0-375/src/node/CMakeNodeTools.txt rstudio-2024.09.0-375.new/src/node/CMakeNodeTools.txt +--- rstudio-2024.09.0-375/src/node/CMakeNodeTools.txt 2024-09-17 05:02:32.000000000 +1200 ++++ rstudio-2024.09.0-375.new/src/node/CMakeNodeTools.txt 2024-09-24 11:30:51.146568219 +1200 @@ -19,7 +19,7 @@ # set the node version if(NOT DEFINED RSTUDIO_NODE_VERSION) -- set(RSTUDIO_NODE_VERSION "18.18.2") +- set(RSTUDIO_NODE_VERSION "20.14.0") + set(RSTUDIO_NODE_VERSION "Current") endif() if(DEFINED ENV{RSTUDIO_NODE_VERSION}) @@ -94,4 +94,3 @@ diff -ru rstudio-desktop.original/src/rstudio-2024.04.1-748/src/node/CMakeNodeTo + "/usr") endif() - diff --git a/PKGBUILD b/PKGBUILD index 10ce92ae7c91e..0ba1c2c187f66 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,10 +2,10 @@ pkgname=rstudio-desktop _vermajor=2024 -_verminor=04 -_verpatch=2 -_versuffix=764 -_gitcommit=e4392fc +_verminor=09 +_verpatch=0 +_versuffix=375 +_gitcommit=c8fc7ae _gitname=rstudio-rstudio-${_gitcommit} pkgver=${_vermajor}.${_verminor}.${_verpatch}.${_versuffix} _srcname=rstudio-${_vermajor}.${_verminor}.${_verpatch}-${_versuffix} @@ -13,13 +13,13 @@ _pandocver="current" _sociver="4.0.3" _quarto="FALSE" -pkgrel=2 +pkgrel=5 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language" arch=('x86_64') url="https://github.com/rstudio/rstudio" license=('AGPL-3.0-only') depends=('r>=3.3.0' 'boost-libs' 'qt5-sensors' 'qt5-svg' 'qt5-webengine' 'qt5-xmlpatterns' 'postgresql-libs' 'sqlite3' 'clang' 'hunspell-en_US' 'mathjax2' 'pandoc' 'yaml-cpp') -makedepends=('git' 'cmake>=3.29' 'boost' 'ninja' 'desktop-file-utils' 'jdk8-openjdk' 'apache-ant' 'unzip' 'openssl' 'libcups' 'pam' 'patchelf' 'wget' 'yarn') +makedepends=('git' 'cmake>=3.29' 'boost' 'ninja' 'npm' 'gyp' 'desktop-file-utils' 'jdk11-openjdk' 'apache-ant' 'unzip' 'openssl' 'python-setuptools' 'libcups' 'pam' 'patchelf' 'wget' 'yarn') optdepends=('git: for git support' 'subversion: for subversion support' 'openssh-askpass: for a git ssh access' @@ -29,28 +29,29 @@ source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs "git+https://github.com/quarto-dev/quarto.git#branch=release/rstudio-cherry-blossom" "https://github.com/SOCI/soci/archive/refs/tags/v${_sociver}.tar.gz" "qt.conf" - "0002-allow_system_node.patch" + "0001-enable_system_node.patch" "0003-fix_boost_186.patch") -sha256sums=('89b0d6741b6bd4dac52fd8bd9372d4f1919c97dd41056a03c975d0570eaf439e' +sha256sums=('8a29b77c53a3db8379d824a9f4a491843036003d105ed71981cd40fe39d2c8c8' 'SKIP' '4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928' '723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921' - 'ad4bd3076ff2bff7d075e3928a7e55c618fa744e3bf5d3d387bf70e01ff96c2f' + 'fa20d753ba2d2dcf64705bd8cd0bd4d01090bfee9c8173d4312d1050d26121f3' '7b3384fc7349a69e866ef0db21f196a2cafa3a9e2fb7f1edaead773b991dac72') options=('!emptydirs' '!debug') prepare() { cd ${srcdir}/${_srcname} - msg "Do not use outdated version name of pandoc" - sed -i '/PANDOC_VERSION/s/2.18/current/' "${srcdir}/${_srcname}/CMakeGlobals.txt" msg "Suppress _FORTIFY_SOURCE mismatch warnings" sed -i 's/D_FORTIFY_SOURCE=2/D_FORTIFY_SOURCE=3/' "${srcdir}/${_srcname}/src/cpp/CMakeLists.txt" + + sed -i 's/add_subdirectory(package)/# add_subdirectory(package)/' "${srcdir}/${_srcname}/CMakeLists.txt" # Add option to use system node - patch -p3 < ${srcdir}/0002-allow_system_node.patch + patch -p1 < ${srcdir}/0001-enable_system_node.patch + # fix boost 1.86 incompatibility patch -p1 < ${srcdir}/0003-fix_boost_186.patch @@ -121,21 +122,13 @@ build() { export R_LIBS_USER="${srcdir}/${_srcname}/dependencies/R" _JOBS="$(grep -oP -- "-j\s*\K[0-9]+" <<< "${MAKEFLAGS}")" || _JOBS="1" mkdir -p "${R_LIBS_USER}" - local RPACKAGES=( - digest - purrr - rmarkdown - testthat - xml2 - yaml - ) - for RPKG in ${RPACKAGES[*]}; do + for RPKG in rmarkdown renv testthat xml2 yaml; do RINSTALLCMD="if("'!'"require($RPKG, quietly = TRUE)) { options(Ncpus = ${_JOBS} ); install.packages('$RPKG', lib='$R_LIBS_USER', repos='https://cran.rstudio.com/') }" echo "> $RINSTALLCMD" Rscript -e "$RINSTALLCMD" done - export PATH=/usr/lib/jvm/java-8-openjdk/jre/bin/:${PATH} + export PATH=/usr/lib/jvm/java-11-openjdk/jre/bin/:${PATH} export RSTUDIO_TOOLS_ROOT="${srcdir}/${_srcname}/dependencies" export RSTUDIO_NODE_PATH=/usr/ export RSTUDIO_VERSION_MAJOR=${_vermajor} @@ -159,7 +152,7 @@ build() { export CMAKE_INSTALL_PREFIX=/usr/lib/rstudio local _CMAKE_RSTUDIO_OPTIONS=( - -DRSTUDIO_TARGET=Desktop + -DRSTUDIO_TARGET=Electron -DCMAKE_BUILD_TYPE=Release -DRSTUDIO_USE_SYSTEM_BOOST=yes -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake @@ -182,7 +175,7 @@ package() { # Symlink main binary install -d "${pkgdir}/usr/bin" - ln -s "/usr/lib/rstudio/bin/rstudio" "${pkgdir}/usr/bin/rstudio" + ln -s "/usr/lib/rstudio/rstudio" "${pkgdir}/usr/bin/rstudio" # BUGFIX: qt5-webengine isn't init'ing properly. Likely an Rstudio bug. install -Dm 644 "${srcdir}/qt.conf" "${pkgdir}/usr/lib/qt/libexec/qt.conf"