rstudio: Upgrade to 2021.09.0+351

Switch to OpenJDK 11, like upstream did. Fix version splitting, which
otherwise prevents startup.

guix-science/packages/rstudio.scm

@@ -75,18 +75,18 @@ for assistive technology like screen readers.")
 (define-public rstudio-server
   (package
     (name "rstudio-server")
-    (version "1.4.1717")
+    (version "2021.09.0+351")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/rstudio/rstudio.git")
-                    (commit (string-append "v" version))))
+                    (commit version)))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0lcnx5spcp5dypvdb7jf8515gnrwx5gk374xf7lri47wqwv5pkgm"))
+                "1lxncx6m2gakjpwzz3nflv5ljk69abwa8zizhvcysr7s192hsbv5"))
               (patches
-               (search-patches "rstudio-server-1.4.1717-unbundle.patch"
+               (search-patches "rstudio-server-2021.09.0+351-unbundle.patch"
                                "rstudio-server-1.4.1103-soci-searchpath.patch"))
               (modules '((guix build utils)))
               (snippet
@@ -166,11 +166,12 @@ for assistive technology like screen readers.")
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
              ;; set proper version information
-             (match (string-split ,version #\.)
-               ((major minor patch)
+             (match (string-split ,version (char-set #\. #\+))
+               ((major minor patch suffix)
                 (setenv "RSTUDIO_VERSION_MAJOR" major)
                 (setenv "RSTUDIO_VERSION_MINOR" minor)
-                (setenv "RSTUDIO_VERSION_PATCH" patch)))
+                (setenv "RSTUDIO_VERSION_PATCH" patch)
+                (setenv "RSTUDIO_VERSION_SUFFIX" (string-append "+" suffix))))
              (setenv "PACKAGE_OS" "GNU Guix")
              ;; Otherwise fuse-box will try to write to /gnu/store/…/.fusebox.
              (setenv "FUSEBOX_TEMP_FOLDER" "/tmp/")
@@ -193,7 +194,7 @@ for assistive technology like screen readers.")
      `(("unzip" ,unzip)
        ;; gwt-components are built using ant
        ("ant" ,ant)
-       ("jdk" ,icedtea "jdk")
+       ("jdk" ,openjdk11 "jdk")
        ;; For building panmirror. XXX: Maybe put panmirror into its own package?
        ("node" ,node)
        ("node-fuse-box" ,node-fuse-box-3.7.1)
@@ -327,11 +328,6 @@ user's @file{~/.local/share/rstudio/r-versions}.")))
                               "/bin/qmake")))
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'relax-qt-version
-             (lambda _
-               (substitute* "src/cpp/desktop/CMakeLists.txt"
-                 (("5\\.4") "5.9"))
-               #t))
            (add-after 'install 'wrap-program
              (lambda* (#:key inputs outputs #:allow-other-keys)
                (let* ((out (assoc-ref outputs "out"))

rstudio-server-1.4.1717-unbundle.patch → rstudio-server-2021.09.0+351-unbundle.patch

@@ -1,25 +1,25 @@
-commit 4e5a8565bb8562db3f6a2ee29dff9fded744c764
+commit 67717d392e1bb6641874ac298a0f9c865da4dc68
 Author: Lars-Dominik Braun <lars@6xq.net>
 Date:   Fri Jun 11 11:15:40 2021 +0200
 
     Unbundle MathJax and Pandoc
 
 diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
-index 54d15d9055..58cb1a9c2c 100644
+index a80e62fa84..a19bdc4609 100644
 --- a/src/cpp/session/CMakeLists.txt
 +++ b/src/cpp/session/CMakeLists.txt
 @@ -48,9 +48,7 @@ else()
-
  endif()
 
--foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
--            "${RSTUDIO_DEPENDENCIES_MATHJAX_DIR}"
--            "${RSTUDIO_DEPENDENCIES_PANDOC_DIR}")
-+foreach(DEP "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}")
-    if(NOT EXISTS "${DEP}")
-       message(FATAL_ERROR "${DEP} not found (re-run install-dependencies script to install")
-    endif()
-@@ -574,16 +572,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD)
+ # validate our dependencies exist
+-foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
+-            RSTUDIO_DEPENDENCIES_MATHJAX_DIR
+-            RSTUDIO_DEPENDENCIES_PANDOC_DIR)
++foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR)
+
+    # validate existence
+    if(NOT EXISTS "${${VAR}}")
+@@ -587,16 +585,6 @@ if(NOT RSTUDIO_SESSION_WIN32 AND NOT RSESSION_ALTERNATE_BUILD)
     install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR}"
             DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")