2022.07.0+548

4 files changed, 19 insertions, 151 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28918ff50d5e..927dc1f4f178 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rstudio-desktop
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 2022.02.3+492
+	pkgver = 2022.07.0+548
 	pkgrel = 1
 	url = https://www.rstudio.com/products/rstudio/
 	arch = x86_64
@@ -42,19 +42,13 @@ pkgbase = rstudio-desktop
 	conflicts = rstudio-desktop-preview
 	conflicts = rstudio-desktop-git
 	noextract = gin-2.1.2.zip
-	source = rstudio-2022.02.3+492.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v2022.02.3+492.tar.gz
-	source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-gin/gin-2.1.2.zip
-	source = https://storage.googleapis.com/gwt-releases/gwt-2.8.2.zip
-	source = https://nodejs.org/dist/v14.17.5/node-v14.17.5-linux-x64.tar.gz
+	source = rstudio-2022.07.0+548.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v2022.07.0+548.tar.gz
+	source = https://nodejs.org/dist/v16.14.0/node-v16.14.0-linux-x64.tar.gz
 	source = qt.conf
-	source = 10952.patch
 	source = pandoc_version.patch
-	sha256sums = e0e520d992445db85dc30bdfe3fb6477f50605ce96f0b89eac19b618860032d9
-	sha256sums = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
-	sha256sums = 970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b
-	sha256sums = dc04c7e60235ff73536ba0d9e50638090f60cacabfd83184082dce3b330afc6e
+	sha256sums = 51061c4b92b6ec11bc07ca01b260c0b332d5b069aefd01b012182ae4086e9983
+	sha256sums = 2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b
 	sha256sums = 723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921
-	sha256sums = 71c41818d099c07d928aa9689a5fd57bb3dc187b9788a8d5cc528ef6208b7726
-	sha256sums = 71cc9986a02c209960309f0e1dd50f08a8f7e59c1bc09ec45d10058a89299939
+	sha256sums = 286925c442c1818979714feeec1577f03ae8a3527d2478b0f55238e2272a0b9e
 
 pkgname = rstudio-desktop
diff --git a/10952.patch b/10952.patch
deleted file mode 100644
index 817048727f4b..000000000000
--- a/10952.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 8fc8516d9a707d047a4b02168b59828ed8ea51f6 Mon Sep 17 00:00:00 2001
-From: Tim Mok <tim.mok@rstudio.com>
-Date: Mon, 11 Apr 2022 10:52:13 -0400
-Subject: [PATCH] Update Quarto to v0.9.230
-
-Change default and Mac Pandoc lookup locations when using packaged Quarto
----
- dependencies/common/install-quarto                   | 2 +-
- dependencies/tools/upload-quarto.sh                  | 2 +-
- dependencies/windows/install-dependencies.cmd        | 2 +-
- src/cpp/session/CMakeLists.txt                       | 2 +-
- src/cpp/session/SessionOptions.cpp                   | 2 +-
- src/cpp/session/include/session/SessionConstants.hpp | 2 +-
- src/cpp/session/modules/quarto/SessionQuarto.cpp     | 4 ++--
- src/cpp/session/session-options.json                 | 2 +-
- 8 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/dependencies/common/install-quarto b/dependencies/common/install-quarto
-index fb96028a713..2003fc2dbba 100755
---- a/dependencies/common/install-quarto
-+++ b/dependencies/common/install-quarto
-@@ -26,7 +26,7 @@ if [ "$(arch)" = "aarch64" ]; then
- fi
- 
- # variables that control download + installation process
--QUARTO_VERSION="0.9.80"
-+QUARTO_VERSION="0.9.230"
- QUARTO_SUBDIR="quarto"
- QUARTO_URL_BASE="https://s3.amazonaws.com/rstudio-buildtools/quarto/${QUARTO_VERSION}"
- 
-diff --git a/dependencies/tools/upload-quarto.sh b/dependencies/tools/upload-quarto.sh
-index ad4140988d8..e6e6ae6773c 100755
---- a/dependencies/tools/upload-quarto.sh
-+++ b/dependencies/tools/upload-quarto.sh
-@@ -5,7 +5,7 @@
- # tools (awscli) installed, and configured with a valid AWS account.
- 
- # Modify to set the Quarto version to upload
--QUARTO_VERSION=0.9.80
-+QUARTO_VERSION=0.9.230
- 
- BASEURL="https://github.com/quarto-dev/quarto-cli/releases/download/"
- AWS_BUCKET="s3://rstudio-buildtools"
-diff --git a/dependencies/windows/install-dependencies.cmd b/dependencies/windows/install-dependencies.cmd
-index 15660710524..0511a94dfea 100644
---- a/dependencies/windows/install-dependencies.cmd
-+++ b/dependencies/windows/install-dependencies.cmd
-@@ -39,7 +39,7 @@ set PANDOC_VERSION=2.16.2
- set PANDOC_NAME=pandoc-%PANDOC_VERSION%
- set PANDOC_FILE=%PANDOC_NAME%-windows-x86_64.zip
- 
--set QUARTO_VERSION=0.9.80
-+set QUARTO_VERSION=0.9.230
- set QUARTO_FILE=quarto-%QUARTO_VERSION%-win.zip
- 
- set LIBCLANG_VERSION=5.0.2
-diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
-index 0485e3e6ca8..a2aebf8a7bd 100644
---- a/src/cpp/session/CMakeLists.txt
-+++ b/src/cpp/session/CMakeLists.txt
-@@ -56,7 +56,7 @@ endif()
- # - by default, we use quarto + quarto's bundled pandoc
- # - if quarto is not enabled, use pandoc fallback
- if(QUARTO_ENABLED)
--   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin")
-+   set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_DEPENDENCIES_QUARTO_DIR}/bin/tools")
- elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
-    set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}")
- else()
-diff --git a/src/cpp/session/include/session/SessionConstants.hpp b/src/cpp/session/include/session/SessionConstants.hpp
-index 13e72e5a5b5..69b29685252 100644
---- a/src/cpp/session/include/session/SessionConstants.hpp
-+++ b/src/cpp/session/include/session/SessionConstants.hpp
-@@ -138,7 +138,7 @@
- #define kSessionTmpDir             "rstudio-rsession"
- 
- #ifdef QUARTO_ENABLED
--# define kDefaultPandocPath        "bin/quarto/bin"
-+# define kDefaultPandocPath        "bin/quarto/bin/tools"
- #else
- # define kDefaultPandocPath        "bin/pandoc"
- #endif
-diff --git a/src/cpp/session/modules/quarto/SessionQuarto.cpp b/src/cpp/session/modules/quarto/SessionQuarto.cpp
-index abea5b8620c..d359adf4e95 100644
---- a/src/cpp/session/modules/quarto/SessionQuarto.cpp
-+++ b/src/cpp/session/modules/quarto/SessionQuarto.cpp
-@@ -207,10 +207,10 @@ void detectQuartoInstallation()
- {
- #ifdef QUARTO_ENABLED
-    // required quarto version (quarto features don't work w/o it)
--   const Version kQuartoRequiredVersion("0.9.80");
-+   const Version kQuartoRequiredVersion("0.9.230");
- 
-    // recommended quarto version (a bit more pestery than required)
--   const Version kQuartoRecommendedVersion("0.9.80");
-+   const Version kQuartoRecommendedVersion("0.9.230");
- 
-    // reset
-    s_userInstalledPath = FilePath();
-diff --git a/src/cpp/session/session-options.json b/src/cpp/session/session-options.json
-index e79189b8196..ac1f16ba07d 100644
---- a/src/cpp/session/session-options.json
-+++ b/src/cpp/session/session-options.json
-@@ -694,7 +694,7 @@
-             "name": "external-pandoc-path",
-             "type": "core::FilePath",
-             "memberName": "pandocPath_",
--            "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/quarto/bin"},
-+            "defaultValue": {"code": "kDefaultPandocPath", "description": "bin/quarto/bin/tools"},
-             "description": "Specifies the path to pandoc binaries."
-          },
-          {
diff --git a/PKGBUILD b/PKGBUILD
index d612ec888748..ba9a32b69a31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,16 @@
 
 pkgname=rstudio-desktop
 _vermajor="2022"
-_verminor="02"
-_verpatch="3"
-_versuffix="+492"
+_verminor="07"
+_verpatch="0"
+_versuffix="+548"
 _gitcommit="8acbd38"
 _gitname=rstudio-rstudio-${_gitcommit}
 pkgver=${_vermajor}.${_verminor}.${_verpatch}${_versuffix}
 _srcname=rstudio-${_vermajor}.${_verminor}.${_verpatch}${_versuffix//+/-}
 _gwtver=2.8.2
 _ginver=2.1.2
-_nodever=14.17.5
+_nodever=16.14.0
 _pandocver="current"
 _quarto="FALSE"
 
@@ -32,36 +32,23 @@ optdepends=('git: for git support'
 provides=('rstudio-desktop')
 conflicts=('rstudio-desktop' 'rstudio-desktop-bin' 'rstudio-desktop-preview' 'rstudio-desktop-git')
 source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v${_vermajor}.${_verminor}.${_verpatch}${_versuffix}.tar.gz"
-        "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/google-gin/gin-${_ginver}.zip"
-        "https://storage.googleapis.com/gwt-releases/gwt-${_gwtver}.zip"
         "https://nodejs.org/dist/v${_nodever}/node-v${_nodever}-linux-x64.tar.gz"
         "qt.conf"
-        "10952.patch"
         "pandoc_version.patch")
 
-sha256sums=('e0e520d992445db85dc30bdfe3fb6477f50605ce96f0b89eac19b618860032d9'
-            'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
-            '970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b'
-            'dc04c7e60235ff73536ba0d9e50638090f60cacabfd83184082dce3b330afc6e'
+sha256sums=('51061c4b92b6ec11bc07ca01b260c0b332d5b069aefd01b012182ae4086e9983'
+            '2c69e7b040c208b61ebf9735c63d2e5bcabfed32ef05a9b8dd5823489ea50d6b'
             '723626bfe05dafa545e135e8e61a482df111f488583fef155301acc5ecbbf921'
-            '71c41818d099c07d928aa9689a5fd57bb3dc187b9788a8d5cc528ef6208b7726'
-            '71cc9986a02c209960309f0e1dd50f08a8f7e59c1bc09ec45d10058a89299939')
+            '286925c442c1818979714feeec1577f03ae8a3527d2478b0f55238e2272a0b9e')
 
 noextract=("gin-${_ginver}.zip")
 
 prepare() {
     cd ${srcdir}/${_srcname}
-    # Fix for quarto/pandoc location
-    # https://github.com/rstudio/rstudio/pull/10952
-    patch -p1 < ${srcdir}/10952.patch
     # Do not use outdated version name of pandoc
     patch -p1 < ${srcdir}/pandoc_version.patch
 
     msg "Extracting dependencies..."
-    cd "${srcdir}/${_srcname}/src/gwt"
-    install -d lib/gin/${_ginver} lib/gwt/${_gwtver}
-    unzip -qo "${srcdir}/gin-${_ginver}.zip" -d lib/gin/${_ginver}
-    cp -r "${srcdir}/gwt-${_gwtver}/"* lib/gwt/${_gwtver}
 
     cd "${srcdir}/${_srcname}/dependencies/common"
     #_pandocver=$(grep -oP "(?<=PANDOC_VERSION=\").*(?=\"$)" install-pandoc)
diff --git a/pandoc_version.patch b/pandoc_version.patch
index 1f81c1579a7a..c3110a051769 100644
--- a/pandoc_version.patch
+++ b/pandoc_version.patch
@@ -1,12 +1,11 @@
-diff -ur a/CMakeGlobals.txt b/CMakeGlobals.txt
---- a/CMakeGlobals.txt	2022-03-18 10:10:38.000000000 +1300
-+++ b/CMakeGlobals.txt	2022-04-28 10:46:17.695649880 +1200
-@@ -214,7 +214,7 @@
+--- rstudio-2022.07.0-548/CMakeGlobals.txt	2022-07-07 07:59:49.000000000 +1200
++++ rstudio-2022.07.0-548.patched/CMakeGlobals.txt	2022-07-08 09:24:27.069195093 +1200
+@@ -231,7 +231,7 @@
  endif()
  
  # pandoc version
--set(PANDOC_VERSION "2.16.2" CACHE INTERNAL "Pandoc version")
+-set(PANDOC_VERSION "2.18" CACHE INTERNAL "Pandoc version")
 +set(PANDOC_VERSION "current" CACHE INTERNAL "Pandoc version")
  
- # quarto support
- if(LINUX AND UNAME_M STREQUAL aarch64)
+ # detect Centos 7, because we don't support Quarto on Centos7
+ set(IS_CENTOS7 FALSE)