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

The changes have been rebased on top of version 1.4.1717 and include a
bug fix.  Previous versions would fail to look up the user's active
sessions (and thus fail to restore a previously set version of R) when
rserver did not run as the same user account as the rsession
process (e.g. root).

1 files changed, 4 insertions, 4 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 0fbeb86..0cd1c7c 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 a41c5e9ce141713b12ad552205c27db41193c477 Mon Sep 17 00:00:00 2001
+From 54e7fb9c835b3ec8afcb5db55b03a8ead3ff6088 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
@@ -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 89c3eb04b9..4ebeb6881d 100644
+index 71ce880487..63937c4806 100644
 --- a/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
 +++ b/src/gwt/src/org/rstudio/studio/client/projects/Projects.java
-@@ -1131,7 +1131,8 @@ public class Projects implements OpenProjectFileHandler,
+@@ -1127,7 +1127,8 @@ public class Projects implements OpenProjectFileEvent.Handler,
                          {
                             // perform quit
                             applicationQuit_.performQuit(null, saveChanges,
@@ -84,5 +84,5 @@ index 89c3eb04b9..4ebeb6881d 100644
                       };
  
 -- 
-2.31.1
+2.33.0