rstudio: Fix build of rstudio-server-multi-version.

The patches from the upstream fork were outdated and did not actually
work for version 2023.06.1+524.

* patches/rstudio-server-multi-version: Update patches from upstream.
* guix-science/packages/rstudio.scm (rstudio-server-multi-version)
[source]: Replace patches.
[arguments]: Add phase 'patch-gwt-build.
[native-inputs]: Add python-wrapper and python-lxml.

9 files changed, 153 insertions, 133 deletions

diff --git a/guix-science/packages/rstudio.scm b/guix-science/packages/rstudio.scm
index 84ec5a5..5aee9a7 100644
--- a/guix-science/packages/rstudio.scm
+++ b/guix-science/packages/rstudio.scm
@@ -31,6 +31,7 @@
   #:use-module (gnu packages java)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages node)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages statistics)
@@ -38,6 +39,7 @@
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web)
+  #:use-module (gnu packages xml)
   #:use-module (guix-science packages rstudio-node))
 
 (define-public mathjax
@@ -420,13 +422,28 @@ web browser.")
           (append
             (origin-patches (package-source rstudio-server))
             (search-patches
-              "patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch"
-              "patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.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")))))
+             "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")))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments rstudio-server)
+       ((#:phases phases)
+        #~(modify-phases #$phases
+            (add-after 'unpack 'patch-gwt-build
+              (lambda _
+                ;; Since we patch the menus we need to regenerate the
+                ;; i18n files.
+                (substitute* "src/gwt/build.xml"
+                  (("\\$\\{python.bin.detect\\}") (which "python"))
+                  (("/bin/sh") (which "sh")))))))))
+    ;; These are needed to generate i18n files.
+    (native-inputs
+     (modify-inputs (package-native-inputs rstudio-server)
+       (append python-lxml python-wrapper)))
     (description "This fork of RStudio allows users to switch to
 different versions of R from the toolbar or project settings.  R
 versions can be recorded in @file{/etc/rstudio/r-versions} and in the
diff --git a/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch b/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
index e5d0adb..ebeb271 100644
--- a/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
+++ b/patches/rstudio-server-multi-version/0001-handleClientInit-Store-R-versions-in-sessionInfo.patch
@@ -1,4 +1,4 @@
-From 34e2450a282148e5384c1018479e9df0718574f5 Mon Sep 17 00:00:00 2001
+From 1ebdce928959bf0a246ca88c471ec8cdcbede745 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Fri, 18 Dec 2020 10:26:44 +0100
 Subject: [PATCH 1/7] handleClientInit: Store R versions in sessionInfo.
@@ -11,19 +11,18 @@ version entries from /etc/rstudio/r-versions via the RVersionsScanner.
 Add discovered entries to a JSON array at the sessionInfo object
 r_versions_info->available_r_versions.
 ---
- src/cpp/session/SessionClientInit.cpp         | 35 +++++++++++++++----
- .../session/prefs/UserPrefsComputedLayer.cpp  |  2 +-
- 2 files changed, 30 insertions(+), 7 deletions(-)
+ src/cpp/session/SessionClientInit.cpp | 35 ++++++++++++++++++++++-----
+ 1 file changed, 29 insertions(+), 6 deletions(-)
 
 diff --git a/src/cpp/session/SessionClientInit.cpp b/src/cpp/session/SessionClientInit.cpp
-index f1b8f35716..b1180070b5 100644
+index f1b8f35716..38d263b337 100644
 --- a/src/cpp/session/SessionClientInit.cpp
 +++ b/src/cpp/session/SessionClientInit.cpp
 @@ -2,6 +2,7 @@
   * SessionClientInit.hpp
   *
   * Copyright (C) 2022 by Posit Software, PBC
-+ * Copyright (C) 2020-2025 Ricardo Wurmus
++ * Copyright (C) 2020-2026 Ricardo Wurmus
   *
   * Unless you have received this program directly from Posit Software pursuant
   * to the terms of a commercial license agreement with Posit Software, then
@@ -54,7 +53,7 @@ index f1b8f35716..b1180070b5 100644
 +       json::Object rVersionJson;
 +       rVersionJson["version"] = rEntry.number();
 +       rVersionJson["label"] = rEntry.label();
-+       rVersionJson["r_home_dir"] = rEntry.homeDir().getAbsolutePath();
++       rVersionJson["r_home"] = rEntry.homeDir().getAbsolutePath();
 +       rVersionJson["r_version_module"] = rEntry.module();
 +
 +       availableRVersionsJson.push_back(rVersionJson);
@@ -75,19 +74,6 @@ index f1b8f35716..b1180070b5 100644
  
     sessionInfo["show_user_home_page"] = options.showUserHomePage();
     sessionInfo["user_home_page_url"] = json::Value();
-diff --git a/src/cpp/session/prefs/UserPrefsComputedLayer.cpp b/src/cpp/session/prefs/UserPrefsComputedLayer.cpp
-index d368c3dd23..8118fff025 100644
---- a/src/cpp/session/prefs/UserPrefsComputedLayer.cpp
-+++ b/src/cpp/session/prefs/UserPrefsComputedLayer.cpp
-@@ -82,7 +82,7 @@ Error UserPrefsComputedLayer::readPrefs()
-                                                 kSessionSharedStoragePath)));
-    json::Object defaultRVersionJson;
-    defaultRVersionJson["version"] = versionSettings.defaultRVersion();
--   defaultRVersionJson["r_home"] = versionSettings.defaultRVersionHome();
-+   defaultRVersionJson["r_home_dir"] = versionSettings.defaultRVersionHome();
-    defaultRVersionJson["label"] = versionSettings.defaultRVersionLabel();
-    layer[kDefaultRVersion] = defaultRVersionJson;
- 
 -- 
-2.49.0
+2.52.0
 
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
new file mode 100644
index 0000000..0d692eb
--- /dev/null
+++ b/patches/rstudio-server-multi-version/0002-launchAndTrackSession-Configure-R-version-from-activ.patch
@@ -0,0 +1,111 @@
+From 420d9a1885fe6c0eb42ce4e79851e9980e2e19c9 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
+ session.
+
+When switching projects the R version is recorded in the active
+session.  Before launching a new rsession process R environment
+variables need to be set to select the variant of libR.so that should
+be used to launch the embedded R.
+
+This needs to happen *after* the process is forked and has changed the
+UID to that of the target user account, so that we can read the user's
+session files.  We accomplish this by introducing a custom filter
+function that modifies the process configuration just before the child
+process replaces the fork.
+
+* src/cpp/server/ServerSessionManager.cpp (loadRVersion): New
+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(+)
+
+diff --git a/src/cpp/server/session/ServerSessionManager.cpp b/src/cpp/server/session/ServerSessionManager.cpp
+index d4da986378..279abc5336 100644
+--- a/src/cpp/server/session/ServerSessionManager.cpp
++++ b/src/cpp/server/session/ServerSessionManager.cpp
+@@ -2,6 +2,7 @@
+  * ServerSessionManager.cpp
+  *
+  * Copyright (C) 2022 by Posit Software, PBC
++ * Copyright (C) 2020-2026 Ricardo Wurmus
+  *
+  * Unless you have received this program directly from Posit Software pursuant
+  * to the terms of a commercial license agreement with Posit Software, then
+@@ -22,10 +23,14 @@
+ #include <shared_core/SafeConvert.hpp>
+ #include <core/SocketRpc.hpp>
+ #include <core/system/Process.hpp>
++#include <shared_core/system/User.hpp>
+ #include <core/system/PosixUser.hpp>
+ #include <core/system/Environment.hpp>
+ #include <core/json/JsonRpc.hpp>
+ 
++#include <core/r_util/RActiveSessions.hpp>
++#include <core/r_util/RActiveSessionsStorage.hpp>
++
+ #include <monitor/MonitorClient.hpp>
+ #include <session/SessionConstants.hpp>
+ 
+@@ -325,6 +330,45 @@ void setProcessConfigFilter(const core::system::ProcessConfigFilter& filter)
+    END_LOCK_MUTEX
+ }
+ 
++void loadRVersion(const core::system::User& user, core::system::ProcessConfig* config) {
++  // Get the active session (e.g. after switching projects) and set R
++  // variables according to the configured R version.
++  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::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 =
++    activeSessions->list(user.getHomePath(), false, false);
++
++  r_util::RVersion rVersion;
++  if (sessions.size() > 0) {
++    // Get the R version from the active user session.  This will
++    // have been set earlier when the user switched to a project.
++    std::string errorMsg;
++    bool success = r_environment::detectRVersion(FilePath((*sessions.front()).rVersionHome()).completePath("bin/R"),
++                                                 &rVersion, &errorMsg);
++
++    if (!success) {
++      rVersion = r_environment::rVersion();
++    }
++  } else {
++    rVersion = r_environment::rVersion();
++  }
++  core::system::Options rEnvVars = rVersion.environment();
++  config->environment.insert(config->environment.end(), rEnvVars.begin(), rEnvVars.end());
++
++  // mark this as the system default R version
++  core::system::setenv(&(config->environment),
++                       kRStudioDefaultRVersion,
++                       rVersion.number());
++  core::system::setenv(&(config->environment),
++                       kRStudioDefaultRVersionHome,
++                       rVersion.homeDir().getAbsolutePath());
++  return;
++}
++
+ // default session launcher -- does the launch then tracks the pid
+ // for later reaping
+ Error SessionManager::launchAndTrackSession(
+@@ -335,6 +379,9 @@ Error SessionManager::launchAndTrackSession(
+    using namespace rstudio::core::system;
+    std::string runAsUser = realUserIsRoot() ? profile.context.username : "";
+ 
++   LOG_DEBUG_MESSAGE("REKADO loading R version");
++   setProcessConfigFilter(loadRVersion);
++
+    core::system::ProcessConfigFilter configFilter;
+    LOCK_MUTEX(s_configFilterMutex)
+    {
+-- 
+2.52.0
+
diff --git a/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch b/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch
deleted file mode 100644
index 2b19cb0..0000000
--- a/patches/rstudio-server-multi-version/0002-sessionProcessConfig-Configure-R-version-from-active.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 242819ba38ed77e28629737dff9bfd5410ec1fdc 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] sessionProcessConfig: Configure R version from active
- session.
-
-When switching projects the R version is recorded in the active
-session.  Before launching a new rsession process R environment
-variables need to be set to select the variant of libR.so that should
-be used to launch the embedded R.
-
-* src/cpp/server/ServerSessionManager.cpp (sessionProcessConfig):
-Configure R environment using the R version that has been recorded in
-the active session.
----
- .../server/session/ServerSessionManager.cpp   | 44 ++++++++++++++++++-
- 1 file changed, 43 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpp/server/session/ServerSessionManager.cpp b/src/cpp/server/session/ServerSessionManager.cpp
-index d4da986378..28d3248606 100644
---- a/src/cpp/server/session/ServerSessionManager.cpp
-+++ b/src/cpp/server/session/ServerSessionManager.cpp
-@@ -2,6 +2,7 @@
-  * ServerSessionManager.cpp
-  *
-  * Copyright (C) 2022 by Posit Software, PBC
-+ * Copyright (C) 2020-2025 Ricardo Wurmus
-  *
-  * Unless you have received this program directly from Posit Software pursuant
-  * to the terms of a commercial license agreement with Posit Software, then
-@@ -22,10 +23,14 @@
- #include <shared_core/SafeConvert.hpp>
- #include <core/SocketRpc.hpp>
- #include <core/system/Process.hpp>
-+#include <shared_core/system/User.hpp>
- #include <core/system/PosixUser.hpp>
- #include <core/system/Environment.hpp>
- #include <core/json/JsonRpc.hpp>
- 
-+#include <core/r_util/RActiveSessions.hpp>
-+#include <core/r_util/RUserData.hpp>
-+
- #include <monitor/MonitorClient.hpp>
- #include <session/SessionConstants.hpp>
- 
-@@ -160,7 +165,44 @@ core::system::ProcessConfig sessionProcessConfig(
-    std::copy(extraArgs.begin(), extraArgs.end(), std::back_inserter(args));
- 
-    // append R environment variables
--   r_util::RVersion rVersion = r_environment::rVersion();
-+   // Get the active session (e.g. after switching projects) and set R
-+   // variables according to the configured R version.
-+
-+   // We cannot use core::system::userHomePath because it always
-+   // returns the server user's home directory.  This is /root when
-+   // rserver runs as root.  Instead we want to get the home directory
-+   // of the *target* user for which rsession will be run.  This is
-+   // why we launch a shell to determine the user's home directory.
-+   core::system::ProcessOptions poptions;
-+   core::system::ProcessResult presult;
-+   Error rError = core::system::runCommand(
-+            "/bin/sh -c 'echo -n ~" + context.username + "'",
-+            poptions,
-+            &presult);
-+   if (rError)
-+      LOG_ERROR(rError);
-+
-+   FilePath homeDir = FilePath(presult.stdOut);
-+   FilePath userScratchPath_ = core::system::xdg::userDataDir(context.username, homeDir);
-+
-+   r_util::ActiveSessions activeSessions(userScratchPath_);
-+   std::vector<boost::shared_ptr<r_util::ActiveSession> > sessions =
-+     activeSessions.list(homeDir, false);
-+
-+   r_util::RVersion rVersion;
-+   if (sessions.size() > 0) {
-+     // Get the R version from the active user session.  This will
-+     // have been set earlier when the user switched to a project.
-+     std::string errorMsg;
-+     bool success = r_environment::detectRVersion(FilePath((*sessions.front()).rVersionHome()).completePath("bin/R"),
-+                                   &rVersion, &errorMsg);
-+
-+     if (!success) {
-+       rVersion = r_environment::rVersion();
-+     }
-+   } else {
-+     rVersion = r_environment::rVersion();
-+   }
-    core::system::Options rEnvVars = rVersion.environment();
-    environment.insert(environment.end(), rEnvVars.begin(), rEnvVars.end());
-    
--- 
-2.49.0
-
diff --git a/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch b/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
index 5657898..3aa5a60 100644
--- a/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
+++ b/patches/rstudio-server-multi-version/0003-NewProjectWizard-Unhide-version-selector-widget.patch
@@ -1,4 +1,4 @@
-From 8fefabd12965d8ca7d5292bd3d5ee1ab87c57fcc Mon Sep 17 00:00:00 2001
+From e92f9dd65a93d4ecb64a1e1c8fdad4f5b2faabeb Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Fri, 18 Dec 2020 10:35:39 +0100
 Subject: [PATCH 3/7] NewProjectWizard: Unhide version selector widget.
@@ -23,5 +23,5 @@ index e112ca7bd0..f619c72d37 100644
        
        openInNewWindow_ = new CheckBox(constants_.openNewSessionLabel());
 -- 
-2.49.0
+2.52.0
 
diff --git a/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch b/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
index 260fdd5..e9450d4 100644
--- a/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
+++ b/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
@@ -1,4 +1,4 @@
-From 18e50173670e22fc14eb64d999745f87d544d047 Mon Sep 17 00:00:00 2001
+From 5edf5e8facd090359dfa40eaf858b7d40ead3fa4 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sat, 19 Dec 2020 00:57:26 +0100
 Subject: [PATCH 4/7] handleConnection: Switch R version when switching
@@ -84,5 +84,5 @@ index ec76b2cb55..f8a5b7f3b1 100644
                       };
  
 -- 
-2.49.0
+2.52.0
 
diff --git a/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch b/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
index 7d101a8..703372c 100644
--- a/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
+++ b/patches/rstudio-server-multi-version/0005-Add-version-switcher-widget-to-toolbar.patch
@@ -1,4 +1,4 @@
-From 7351620161e0261367d7dfe7bb582db0836badde Mon Sep 17 00:00:00 2001
+From 7411f08776c3282f2f4f8b551c7f99cdb9f92823 Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sat, 19 Dec 2020 23:33:16 +0100
 Subject: [PATCH 5/7] Add version switcher widget to toolbar.
@@ -283,5 +283,5 @@ index c3121e22d3..7d78daff78 100644
     public abstract AppCommand consoleClear();
     public abstract AppCommand interruptR();
 -- 
-2.49.0
+2.52.0
 
diff --git a/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch b/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
index 70f8201..6f295c1 100644
--- a/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
+++ b/patches/rstudio-server-multi-version/0006-Look-at-.local-share-rstudio-r-versions-for-custom-R.patch
@@ -1,4 +1,4 @@
-From c3f3da76ead0a6a2b3faea52ac4ec864d5ef4fd1 Mon Sep 17 00:00:00 2001
+From b448eb7ec494b99eb03e805d3df0befcbf7dfcdf Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sun, 20 Dec 2020 00:25:42 +0100
 Subject: [PATCH 6/7] Look at ~/.local/share/rstudio/r-versions for custom R
@@ -68,7 +68,7 @@ index ee06a3d536..1bb653b065 100644
     bool detectRVersion(const core::FilePath& rScriptPath,
                         core::r_util::RVersion* pVersion,
 diff --git a/src/cpp/session/SessionClientInit.cpp b/src/cpp/session/SessionClientInit.cpp
-index b1180070b5..673b3bd03a 100644
+index 38d263b337..23cf8a8eae 100644
 --- a/src/cpp/session/SessionClientInit.cpp
 +++ b/src/cpp/session/SessionClientInit.cpp
 @@ -561,8 +561,14 @@ void handleClientInit(const boost::function<void()>& initFunction,
@@ -88,5 +88,5 @@ index b1180070b5..673b3bd03a 100644
       {
         json::Object rVersionJson;
 -- 
-2.49.0
+2.52.0
 
diff --git a/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch b/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
index ec4da3e..0c99b23 100644
--- a/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
+++ b/patches/rstudio-server-multi-version/0007-detectRLocationsUsingR-Restore-R_HOME-at-the-end.patch
@@ -1,4 +1,4 @@
-From e95f6f73246a35580e12cdb80ca9639aefb0f196 Mon Sep 17 00:00:00 2001
+From 6318cf7c270783c5a1a043740128ca37b65db7ac Mon Sep 17 00:00:00 2001
 From: Ricardo Wurmus <rekado@elephly.net>
 Date: Sun, 20 Dec 2020 14:49:51 +0100
 Subject: [PATCH 7/7] detectRLocationsUsingR: Restore R_HOME at the end.
@@ -32,5 +32,5 @@ index a4e964d49d..3fee33ff49 100644
  }
  #endif
 -- 
-2.49.0
+2.52.0