patches: Update rstudio-server-multi-version patches.

Replace the patches with newer versions suitable for version
2023.06.1+524 of rstudio-server.

* 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: Replace.

1 files changed, 11 insertions, 11 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 0cd1c7c..260fdd5 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 54e7fb9c835b3ec8afcb5db55b03a8ead3ff6088 Mon Sep 17 00:00:00 2001
+From 18e50173670e22fc14eb64d999745f87d544d047 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
@@ -13,18 +13,18 @@ project switch back to the default.
  2 files changed, 30 insertions(+), 5 deletions(-)
 
 diff --git a/src/cpp/session/SessionHttpMethods.cpp b/src/cpp/session/SessionHttpMethods.cpp
-index 2fd08c028b..3e66f13dd7 100644
+index a90648c23c..e5d1cabcc2 100644
 --- a/src/cpp/session/SessionHttpMethods.cpp
 +++ b/src/cpp/session/SessionHttpMethods.cpp
 @@ -2,6 +2,7 @@
   * SessionHttpMethods.hpp
   *
-  * Copyright (C) 2021 by RStudio, PBC
-+ * Copyright (C) 2020 Ricardo Wurmus
+  * Copyright (C) 2022 by Posit Software, PBC
++ * Copyright (C) 2020-2025 Ricardo Wurmus
   *
-  * Unless you have received this program directly from RStudio pursuant
-  * to the terms of a commercial license agreement with RStudio, then
-@@ -667,6 +668,33 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
+  * Unless you have received this program directly from Posit Software pursuant
+  * to the terms of a commercial license agreement with Posit Software, then
+@@ -692,6 +693,33 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
                    activeSession().setWorkingDir(projDir);
                 }
  
@@ -58,7 +58,7 @@ index 2fd08c028b..3e66f13dd7 100644
                 if (options().switchProjectsWithUrl())
                 {
                    r_util::SessionScope scope;
-@@ -721,10 +749,6 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
+@@ -744,10 +772,6 @@ void handleConnection(boost::shared_ptr<HttpConnection> ptrConnection,
                       {
                          FilePath projFile = resolveAliasedPath(switchToProject);
                          std::string projDir = createAliasedPath(projFile.getParent());
@@ -70,10 +70,10 @@ index 2fd08c028b..3e66f13dd7 100644
                                                             module_context::sharedProjectScratchPath(),
                                                             version,
 diff --git a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-index 71ce880487..63937c4806 100644
+index ec76b2cb55..f8a5b7f3b1 100644
 --- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
 +++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-@@ -1127,7 +1127,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
+@@ -1136,7 +1136,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
                          {
                             // perform quit
                             applicationQuit_.performQuit(null, saveChanges,
@@ -84,5 +84,5 @@ index 71ce880487..63937c4806 100644
                       };
  
 -- 
-2.33.0
+2.49.0