2024.09.0.375-7

2026-03-14 23:16:48 +01:00 · 2024-09-29 05:13:27 +00:00 · 2024-09-29 05:13:27 +00:00 · fe70636e2d
commit fe70636e2d
parent 6d138782c0
3 changed files with 42 additions and 43 deletions
--- 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.09.0.375
-	pkgrel = 6
+	pkgrel = 7
 	url = https://github.com/rstudio/rstudio
 	arch = x86_64
 	license = AGPL-3.0-only
@ -12,21 +12,28 @@ pkgbase = rstudio-desktop
 	makedepends = jdk11-openjdk
 	makedepends = libcups
 	makedepends = ninja
-	makedepends = nvm
+	makedepends = npm
 	makedepends = openssl
 	makedepends = pam
 	makedepends = python
 	makedepends = python-setuptools
 	makedepends = wget
 	makedepends = yarn
+	depends = boost-libs
+	depends = dbus
+	depends = hicolor-icon-theme
 	depends = hunspell-en_US
+	depends = libcups
 	depends = mathjax2
+	depends = nspr
+	depends = nss
 	depends = pandoc
 	depends = r
 	optdepends = git: for git support
-	optdepends = subversion: for subversion support
+	optdepends = nodejs: for copilot support
 	optdepends = openssh-askpass: for a git ssh access
 	optdepends = quarto: for Quarto projects support
+	optdepends = subversion: for subversion support
 	provides = rstudio-desktop
 	conflicts = rstudio-desktop
 	options = !emptydirs
@ -34,10 +41,8 @@ pkgbase = rstudio-desktop
 	source = rstudio-2024.09.0.375-c8fc7ae.tar.gz::https://github.com/rstudio/rstudio/archive/c8fc7aee6dc218d5687553f9041c6b1e5ea268ff.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
-	source = 0003-fix_boost_186.patch
 	sha256sums = 8a814995b12769135c25b9753d89cbae4cc39d7e5dca057acc0d7f0c29c0d6f6
 	sha256sums = SKIP
 	sha256sums = 4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928
-	sha256sums = 7b3384fc7349a69e866ef0db21f196a2cafa3a9e2fb7f1edaead773b991dac72

 pkgname = rstudio-desktop
--- a/0003-fix_boost_186.patch
+++ b/0003-fix_boost_186.patch
@ -1,11 +0,0 @@
--- rstudio-2024.04.2-764.original/src/cpp/core/json/JsonRpc.cpp	2024-06-05 09:19:10.000000000 +1200
-+++ rstudio-2024.04.2-764/src/cpp/core/json/JsonRpc.cpp	2024-09-04 07:34:10.202186197 +1200
-@@ -193,7 +193,7 @@
-    
- bool JsonRpcResponse::hasAfterResponse() const
- {
-   return afterResponse_;
-+   return (bool)afterResponse_;
- }
-    
-    
--- a/59
+++ b/59
@ -18,15 +18,21 @@
 _pkgname="rstudio-desktop"
 pkgname="$_pkgname"
 pkgver=2024.09.0.375
-pkgrel=6
+pkgrel=7
 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
 url="https://github.com/rstudio/rstudio"
 license=('AGPL-3.0-only')
 arch=('x86_64')

 depends=(
+  'boost-libs'
+  'dbus'
+  'hicolor-icon-theme'
  'hunspell-en_US'
+  'libcups'
  'mathjax2'
+  'nspr'
+  'nss'
  'pandoc'
  'r'
 )
@ -38,7 +44,7 @@ makedepends=(
  'jdk11-openjdk'
  'libcups'
  'ninja'
-  'nvm' # AUR
+  'npm'
  'openssl'
  'pam'
  'python'
@ -48,9 +54,10 @@ makedepends=(
 )
 optdepends=(
  'git: for git support'
-  'subversion: for subversion support'
+  'nodejs: for copilot support'
  'openssh-askpass: for a git ssh access'
  'quarto: for Quarto projects support'
+  'subversion: for subversion support'
 )

 if [[ "${_quarto::1}" == "t" ]]; then
@ -70,31 +77,19 @@ source=(
  "rstudio-$pkgver-${_commit::7}.$_pkgext"::"https://github.com/rstudio/rstudio/archive/$_commit.$_pkgext"
  "quarto"::"git+https://github.com/quarto-dev/quarto.git#branch=${_quarto_branch}"
  "soci-$_sociver.tar.gz"::"https://github.com/SOCI/soci/archive/refs/tags/v${_sociver}.tar.gz"
-  '0003-fix_boost_186.patch'
 )
 sha256sums=(
  '8a814995b12769135c25b9753d89cbae4cc39d7e5dca057acc0d7f0c29c0d6f6'
  'SKIP'
  '4b1ff9c8545c5d802fbe06ee6cd2886630e5c03bf740e269bb625b45cf934928'
-  '7b3384fc7349a69e866ef0db21f196a2cafa3a9e2fb7f1edaead773b991dac72'
 )

 _nvm_env() {
  export HOME="$SRCDEST/node-home"
-  export NVM_DIR="$SRCDEST/node-nvm"
-
-  # set up nvm
-  source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
-  nvm install $_nodeversion
-  nvm use $_nodeversion
-
-  _npm_path="$(which npm | sed -E 's&/[^/]+$&&')"
-  export RSTUDIO_NODE_VERSION=$(echo "$_npm_path" | sed -E 's&^\S+/v([0-9\.]+)/\S+$&\1&')
 }

 prepare() (
  _nvm_env
-  npm install yarn

  cd "$_pkgsrc"
  # Do not use outdated version name of pandoc
@ -104,19 +99,28 @@ prepare() (
  sed -i 's/D_FORTIFY_SOURCE=2/D_FORTIFY_SOURCE=3/' "src/cpp/CMakeLists.txt"

  # fix npm/node paths
-  install -dm755 "$srcdir/$_pkgsrc/dependencies/common/node"
-  ln -sfT "$NVM_DIR/versions/node/v$RSTUDIO_NODE_VERSION" "$srcdir/$_pkgsrc/dependencies/common/node/${RSTUDIO_NODE_VERSION}-patched"
+  sed -E -e 's&set\(RSTUDIO_NODE_PATH .*\)&set(RSTUDIO_NODE_PATH "/usr/bin")&' \
+    -i cmake/globals.cmake

-  sed -E -e 's&PATHS "/opt/rstudio-tools/dependencies/common/node/\$\{RSTUDIO_NODE_VERSION\}"&PATHS "'"${_npm_path}"'"&' \
-    -i src/node/CMakeNodeTools.txt
+  sed -E -e 's&^external-node-path=.*$&external-node-path=/usr/bin/node&' \
+    -i src/cpp/conf/rsession-dev.conf

-  sed -E -e 's&(common/node)/([0-9\.]+)-(patched)&\1/'"${RSTUDIO_NODE_VERSION}"'-\3&' \
-    -i src/cpp/conf/rsession-dev.conf src/cpp/session/SessionOptions.cpp
+  sed -E -e 's&DIRECTORY "\$\{RSTUDIO_DEPENDENCIES_DIR\}/common/node/\$\{RSTUDIO_INSTALLED_NODE_VERSION\}-patched/"&DIRECTORY "/usr"&' \
+    -e 's&(# install node)&\1\nif(FALSE)&' \
+    -e 's&(# install quarto)&endif()\n\1&' \
+    -i src/cpp/session/CMakeLists.txt

-  sed -E -e '/"node\.version"/s&value="[0-9\.]+"&value="'"${RSTUDIO_NODE_VERSION}"'"&' \
+  sed -E -e 's&"\S+/common/node/\S+"&"/usr"&' \
+    -i src/cpp/session/SessionOptions.cpp
+
+  sed -E -e '/"node\.version"/s&value="[0-9\.]+"&value="Current"&' \
+    -e '/"node\.dir"/s&value="\S+"&value="/usr"&' \
+    -e 's&"\S+/common/node/\S+/bin/yarn"&"/usr/bin/yarn"&' \
    -i src/gwt/build.xml

-  sed -E -e 's&set\(RSTUDIO_NODE_VERSION "[0-9\.]+"\)&set(RSTUDIO_NODE_VERSION "'"${RSTUDIO_NODE_VERSION}"'")&' \
+  sed -E -e 's&PATHS "/opt/rstudio-tools/dependencies/common/node/\$\{RSTUDIO_NODE_VERSION\}"&PATHS "/usr"&' \
+    -e 's&"\S+CMAKE_CURRENT_LIST_DIR\S+/dependencies/common/node/\S+"&"/usr"&g' \
+    -e 's&set\(RSTUDIO_NODE_VERSION "[0-9\.]+"\)&set(RSTUDIO_NODE_VERSION "Current")&' \
    -i src/node/CMakeNodeTools.txt

  # fix os-release path
@ -124,7 +128,8 @@ prepare() (
    -i cmake/modules/OsRelease.cmake

  # fix boost 1.86 incompatibility
-  patch -p1 -i "$srcdir/0003-fix_boost_186.patch"
+  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}
@ -244,8 +249,8 @@ build() (
    -DRSTUDIO_TARGET=Electron
    -DRSTUDIO_USE_SYSTEM_BOOST=YES
    -DRSTUDIO_USE_SYSTEM_SOCI=NO
-    -DRSTUDIO_NODE_VERSION="$RSTUDIO_NODE_VERSION"
-    -DRSTUDIO_INSTALLED_NODE_VERSION="$RSTUDIO_NODE_VERSION"
+    -DRSTUDIO_NODE_VERSION="Current"
+    -DRSTUDIO_INSTALLED_NODE_VERSION="Current"
    -DQUARTO_ENABLED=${_quarto}
    -DBUILD_TESTING=OFF
    -Wno-dev
@ -256,7 +261,7 @@ build() (

 package() {
  # Install the program
-  DESTDIR="${pkgdir}" cmake --install build
+  DESTDIR="$pkgdir" cmake --install build

  # Symlink main binary
  install -d "${pkgdir}/usr/bin"