rstudio: rstudio-server: Update to 2026.04.0+526.

* patches/rstudio-server-install.patch: Update file.
* patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch,
  patches/rstudio-server-multi-version/0002-launchAndTrackSession-Configure-R-version-from-activ.patch,
  patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch,
  patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch,
  patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch,
  patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch,
  patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch:
  Update to latest version.
* guix-science/packages/rstudio.scm (dtl-for-rstudio,
utfcpp-for-rstudio): New variables.
(rstudio-server): Update to 2026.04.0+526.
[arguments]: Do not use #:OUT-OF-SOURCE?, add extra configure flags;
update generated cmake files; rename phase 'unpack-dictionary to
'unpack-extras and unpack GWT sources; update patching in
'patch-paths; update location of script in 'generate-server-options.
[native-inputs]: Replace openjdk11:jdk with openjdk:jdk; add
googletest and r-here; add origin for gwt sources.
[inputs]: Replace boost-1.88 with boost; add dtl-for-rstudio, libgit2,
and utfcpp-for-rstudio.

1 files changed, 18 insertions, 9 deletions

diff --git a/patches/rstudio-server-multi-version/0002-launchAndTrackSession-Configure-R-version-from-activ.patch b/patches/rstudio-server-multi-version/0002-launchAndTrackSession-Configure-R-version-from-activ.patch
index b39088c..3e75fdb 100644
--- a/patches/rstudio-server-multi-version/0002-launchAndTrackSession-Configure-R-version-from-activ.patch
+++ b/patches/rstudio-server-multi-version/0002-launchAndTrackSession-Configure-R-version-from-activ.patch
@@ -1,4 +1,4 @@
-From 2005f097b76582e5781a32aafa7cfcf35e369e7b Mon Sep 17 00:00:00 2001
+From faf9b22bc1caa538009356a3be1f0ee3ac8205f0 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Fri, 18 Dec 2020 10:32:01 +0100
 Subject: [PATCH 2/7] launchAndTrackSession: Configure R version from active
@@ -20,11 +20,11 @@ procedure to configure the R environment using the R version that has
 been recorded in the active session.
 (launchAndTrackSession): Register loadRVersion as a config filter.
 ---
- .../server/session/ServerSessionManager.cpp   | 47 +++++++++++++++++++
- 1 file changed, 47 insertions(+)
+ .../server/session/ServerSessionManager.cpp   | 49 +++++++++++++++++++
+ 1 file changed, 49 insertions(+)
 
 diff --git a/src/cpp/server/session/ServerSessionManager.cpp b/src/cpp/server/session/ServerSessionManager.cpp
-index ab7aab1842..fa67ed0b56 100644
+index 17bcd10b56..e107b89dff 100644
 --- a/src/cpp/server/session/ServerSessionManager.cpp
 +++ b/src/cpp/server/session/ServerSessionManager.cpp
 @@ -2,6 +2,7 @@
@@ -35,7 +35,15 @@ index ab7aab1842..fa67ed0b56 100644
   *
   * Unless you have received this program directly from Posit Software pursuant
   * to the terms of a commercial license agreement with Posit Software, then
-@@ -24,10 +25,14 @@
+@@ -14,6 +15,7 @@
+  */
+ 
+ #include <server/session/ServerSessionManager.hpp>
++#include <session/SessionScopes.hpp>
+ 
+ #include <boost/format.hpp>
+ 
+@@ -22,10 +24,14 @@
  #include <core/SocketRpc.hpp>
  #include <core/system/System.hpp>
  #include <core/system/Process.hpp>
@@ -50,7 +58,7 @@ index ab7aab1842..fa67ed0b56 100644
  #include <session/SessionConstants.hpp>
  
  #include <monitor/MonitorClient.hpp>
-@@ -373,6 +378,45 @@ void setProcessConfigFilter(const core::system::ProcessConfigFilter& filter)
+@@ -380,6 +386,46 @@ void setProcessConfigFilter(const core::system::ProcessConfigFilter& filter)
     END_LOCK_MUTEX
  }
  
@@ -60,7 +68,8 @@ index ab7aab1842..fa67ed0b56 100644
 +  FilePath storageDir =
 +    system::xdg::userDataDir(user.getUsername(), user.getHomePath());
 +  std::shared_ptr<r_util::IActiveSessionsStorage> sessionStorage =
-+    std::shared_ptr<r_util::IActiveSessionsStorage>(new r_util::FileActiveSessionsStorage(storageDir));
++    std::shared_ptr<r_util::IActiveSessionsStorage>(new r_util::FileActiveSessionsStorage(storageDir, rstudio::session::filePathToProjectId(storageDir, FilePath(server::options().getOverlayOption(kSessionSharedStoragePath)))));
++
 +  std::unique_ptr<r_util::ActiveSessions> activeSessions =
 +    std::unique_ptr<r_util::ActiveSessions>(new r_util::ActiveSessions(sessionStorage, storageDir));
 +  std::vector<boost::shared_ptr<r_util::ActiveSession> > sessions =
@@ -96,7 +105,7 @@ index ab7aab1842..fa67ed0b56 100644
  // default session launcher -- does the launch then tracks the pid
  // for later reaping
  Error SessionManager::launchAndTrackSession(
-@@ -383,6 +427,9 @@ Error SessionManager::launchAndTrackSession(
+@@ -390,6 +436,9 @@ Error SessionManager::launchAndTrackSession(
     using namespace rstudio::core::system;
     std::string runAsUser = realUserIsRoot() ? profile.context.username : "";
  
@@ -107,5 +116,5 @@ index ab7aab1842..fa67ed0b56 100644
     LOCK_MUTEX(s_configFilterMutex)
     {
 -- 
-2.52.0
+2.54.0