Upstream patchfix release

3 files changed, 9 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a7c1564f791..7e3f9e5a667b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = rstudio-desktop
 	pkgdesc = A powerful and productive integrated development environment (IDE) for R programming language
-	pkgver = 2022.02.1+461
-	pkgrel = 3
+	pkgver = 2022.02.2+485
+	pkgrel = 1
 	url = https://www.rstudio.com/products/rstudio/
 	arch = x86_64
 	license = AGPL3
@@ -42,7 +42,7 @@ pkgbase = rstudio-desktop
 	conflicts = rstudio-desktop-preview
 	conflicts = rstudio-desktop-git
 	noextract = gin-2.1.2.zip
-	source = rstudio-2022.02.1+461.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v2022.02.1+461.tar.gz
+	source = rstudio-2022.02.2+485.tar.gz::https://github.com/rstudio/rstudio/archive/refs/tags/v2022.02.2+485.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
@@ -50,9 +50,8 @@ pkgbase = rstudio-desktop
 	source = cran_multithread.patch
 	source = sigstksz_gcc11.patch
 	source = 10952.patch
-	source = quarto_pandoc_location.patch
 	source = pandoc_version.patch
-	sha256sums = 41e48e21ddc0a9c1ebf06ff16d846b0389720f2ee66d3fcfd5ff0707578b597d
+	sha256sums = a9351fcd3bb4ab1f7d526b289dad06f02800d5b883655d9a49fa4b7c1ce6b299
 	sha256sums = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
 	sha256sums = 970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b
 	sha256sums = dc04c7e60235ff73536ba0d9e50638090f60cacabfd83184082dce3b330afc6e
@@ -60,7 +59,6 @@ pkgbase = rstudio-desktop
 	sha256sums = c907e6eec5ef324ad498b44fb9926bb5baafc4e0778ca01f6ba9b49dd3a2a980
 	sha256sums = 7b8420db08f848f7baac0f3104c879ac7ce6e27e463f96a6b1c6589cd4b8df82
 	sha256sums = 71c41818d099c07d928aa9689a5fd57bb3dc187b9788a8d5cc528ef6208b7726
-	sha256sums = f496c8d012ec7211b7d76240932c1b33fc76c5bb756b354eb00dd5c4344baeab
 	sha256sums = 71cc9986a02c209960309f0e1dd50f08a8f7e59c1bc09ec45d10058a89299939
 
 pkgname = rstudio-desktop
diff --git a/PKGBUILD b/PKGBUILD
index a97df77d9d97..157853693553 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=rstudio-desktop
 _vermajor="2022"
 _verminor="02"
-_verpatch="1"
-_versuffix="+461"
-_gitcommit=fc9e217
+_verpatch="2"
+_versuffix="+485"
+_gitcommit="8acbd38"
 _gitname=rstudio-rstudio-${_gitcommit}
 pkgver=${_vermajor}.${_verminor}.${_verpatch}${_versuffix}
 _srcname=rstudio-${_vermajor}.${_verminor}.${_verpatch}${_versuffix//+/-}
@@ -17,7 +17,7 @@ _nodever=14.17.5
 _pandocver="current"
 _quarto="FALSE"
 
-pkgrel=3
+pkgrel=1
 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
 arch=('x86_64')
 url="https://www.rstudio.com/products/rstudio/"
@@ -39,10 +39,9 @@ source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs
         "cran_multithread.patch"
         "sigstksz_gcc11.patch"
         "10952.patch"
-        "quarto_pandoc_location.patch"
         "pandoc_version.patch")
 
-sha256sums=('41e48e21ddc0a9c1ebf06ff16d846b0389720f2ee66d3fcfd5ff0707578b597d'
+sha256sums=('a9351fcd3bb4ab1f7d526b289dad06f02800d5b883655d9a49fa4b7c1ce6b299'
             'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
             '970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b'
             'dc04c7e60235ff73536ba0d9e50638090f60cacabfd83184082dce3b330afc6e'
@@ -50,7 +49,6 @@ sha256sums=('41e48e21ddc0a9c1ebf06ff16d846b0389720f2ee66d3fcfd5ff0707578b597d'
             'c907e6eec5ef324ad498b44fb9926bb5baafc4e0778ca01f6ba9b49dd3a2a980'
             '7b8420db08f848f7baac0f3104c879ac7ce6e27e463f96a6b1c6589cd4b8df82'
             '71c41818d099c07d928aa9689a5fd57bb3dc187b9788a8d5cc528ef6208b7726'
-            'f496c8d012ec7211b7d76240932c1b33fc76c5bb756b354eb00dd5c4344baeab'
             '71cc9986a02c209960309f0e1dd50f08a8f7e59c1bc09ec45d10058a89299939')
 
 noextract=("gin-${_ginver}.zip")
@@ -64,7 +62,6 @@ prepare() {
     # Fix for quarto/pandoc location
     # https://github.com/rstudio/rstudio/pull/10952
     patch -p1 < ${srcdir}/10952.patch
-    patch -p1 < ${srcdir}/quarto_pandoc_location.patch
     # Do not use outdated version name of pandoc
     patch -p1 < ${srcdir}/pandoc_version.patch
 
diff --git a/quarto_pandoc_location.patch b/quarto_pandoc_location.patch
deleted file mode 100644
index 6c9a040ea862..000000000000
--- a/quarto_pandoc_location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur a/src/cpp/session/modules/quarto/SessionQuartoXRefs.cpp b/src/cpp/session/modules/quarto/SessionQuartoXRefs.cpp
---- a/src/cpp/session/modules/quarto/SessionQuartoXRefs.cpp	2022-04-27 22:28:07.480284489 +1200
-+++ b/src/cpp/session/modules/quarto/SessionQuartoXRefs.cpp	2022-04-27 20:59:01.396159620 +1200
-@@ -188,7 +188,7 @@
-    core::system::ProcessResult result;
- 
-    error = module_context::runPandoc(
--      FilePath(config.bin_path).completeChildPath("pandoc").getAbsolutePath(),
-+      FilePath(config.bin_path).completeChildPath("tools/pandoc").getAbsolutePath(),
-       args,
-       contents,
-       options,