summaryrefslogtreecommitdiff
path: root/patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2026-03-09 14:47:59 +0100
committerRicardo Wurmus <rekado@elephly.net>2026-03-16 11:11:37 +0100
commit9ae43360bb0bd018d4b0a2a6997b6953ff94d814 (patch)
treec2b7ffea6295f7f96de1dbfceeb69a8667de5cb0 /patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch
parent0cba59f29e1adb47e3b4cca4ec70b0f80fe0e180 (diff)
gnu: rstudio-server: Update to 2024.12.1+563.
* guix-science/packages/rstudio.scm (rstudio-server): Update to 2024.12.1+563. [arguments]: Adjust patches. * patches/rstudio-server-install.patch: New file. * patches/rstudio-server-panmirror.patch: New 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: Port to latest version.
Diffstat (limited to 'patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch')
-rw-r--r--patches/rstudio-server-multi-version/0004-handleConnection-Switch-R-version-when-switching-pro.patch12
1 files changed, 6 insertions, 6 deletions
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 e9450d4..c3af0e0 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 @@
1From 5edf5e8facd090359dfa40eaf858b7d40ead3fa4 Mon Sep 17 00:00:00 2001 1From b31dfc6f120c01ff6612b682b56d92449eb82ef8 Mon Sep 17 00:00:00 2001
2From: Ricardo Wurmus <rekado@elephly.net> 2From: Ricardo Wurmus <rekado@elephly.net>
3Date: Sat, 19 Dec 2020 00:57:26 +0100 3Date: Sat, 19 Dec 2020 00:57:26 +0100
4Subject: [PATCH 4/7] handleConnection: Switch R version when switching 4Subject: [PATCH 4/7] handleConnection: Switch R version when switching
@@ -13,7 +13,7 @@ project switch back to the default.
13 2 files changed, 30 insertions(+), 5 deletions(-) 13 2 files changed, 30 insertions(+), 5 deletions(-)
14 14
15diff --git a/src/cpp/session/SessionHttpMethods.cpp b/src/cpp/session/SessionHttpMethods.cpp 15diff --git a/src/cpp/session/SessionHttpMethods.cpp b/src/cpp/session/SessionHttpMethods.cpp
16index a90648c23c..e5d1cabcc2 100644 16index 2b313f2b77..19669a3623 100644
17--- a/src/cpp/session/SessionHttpMethods.cpp 17--- a/src/cpp/session/SessionHttpMethods.cpp
18+++ b/src/cpp/session/SessionHttpMethods.cpp 18+++ b/src/cpp/session/SessionHttpMethods.cpp
19@@ -2,6 +2,7 @@ 19@@ -2,6 +2,7 @@
@@ -24,7 +24,7 @@ index a90648c23c..e5d1cabcc2 100644
24 * 24 *
25 * Unless you have received this program directly from Posit Software pursuant 25 * Unless you have received this program directly from Posit Software pursuant
26 * to the terms of a commercial license agreement with Posit Software, then 26 * to the terms of a commercial license agreement with Posit Software, then
27@@ -692,6 +693,33 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection, 27@@ -711,6 +712,33 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
28 activeSession().setWorkingDir(projDir); 28 activeSession().setWorkingDir(projDir);
29 } 29 }
30 30
@@ -58,7 +58,7 @@ index a90648c23c..e5d1cabcc2 100644
58 if (options().switchProjectsWithUrl()) 58 if (options().switchProjectsWithUrl())
59 { 59 {
60 r_util::SessionScope scope; 60 r_util::SessionScope scope;
61@@ -744,10 +772,6 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection, 61@@ -763,10 +791,6 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
62 { 62 {
63 FilePath projFile = resolveAliasedPath(switchToProject); 63 FilePath projFile = resolveAliasedPath(switchToProject);
64 std::string projDir = createAliasedPath(projFile.getParent()); 64 std::string projDir = createAliasedPath(projFile.getParent());
@@ -70,10 +70,10 @@ index a90648c23c..e5d1cabcc2 100644
70 module_context::sharedProjectScratchPath(), 70 module_context::sharedProjectScratchPath(),
71 version, 71 version,
72diff --git a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java 72diff --git a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
73index ec76b2cb55..f8a5b7f3b1 100644 73index 0ab01f9945..26c332b58d 100644
74--- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java 74--- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
75+++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java 75+++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
76@@ -1136,7 +1136,8 @@ public class Projects implements OpenProjectFileEvent.Handler, 76@@ -1131,7 +1131,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
77 { 77 {
78 // perform quit 78 // perform quit
79 applicationQuit_.performQuit(null, saveChanges, 79 applicationQuit_.performQuit(null, saveChanges,