Fix pandoc location when quarto is not installed

3 files changed, 29 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7f080972a7ed..0a7c1564f791 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 = 2
+	pkgrel = 3
 	url = https://www.rstudio.com/products/rstudio/
 	arch = x86_64
 	license = AGPL3
@@ -51,6 +51,7 @@ pkgbase = rstudio-desktop
 	source = sigstksz_gcc11.patch
 	source = 10952.patch
 	source = quarto_pandoc_location.patch
+	source = pandoc_version.patch
 	sha256sums = 41e48e21ddc0a9c1ebf06ff16d846b0389720f2ee66d3fcfd5ff0707578b597d
 	sha256sums = b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a
 	sha256sums = 970701dacc55170088f5eb327137cb4a7581ebb4734188dfcc2fad9941745d1b
@@ -60,5 +61,6 @@ pkgbase = rstudio-desktop
 	sha256sums = 7b8420db08f848f7baac0f3104c879ac7ce6e27e463f96a6b1c6589cd4b8df82
 	sha256sums = 71c41818d099c07d928aa9689a5fd57bb3dc187b9788a8d5cc528ef6208b7726
 	sha256sums = f496c8d012ec7211b7d76240932c1b33fc76c5bb756b354eb00dd5c4344baeab
+	sha256sums = 71cc9986a02c209960309f0e1dd50f08a8f7e59c1bc09ec45d10058a89299939
 
 pkgname = rstudio-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 53f062560df8..a97df77d9d97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,9 +14,10 @@ _srcname=rstudio-${_vermajor}.${_verminor}.${_verpatch}${_versuffix//+/-}
 _gwtver=2.8.2
 _ginver=2.1.2
 _nodever=14.17.5
+_pandocver="current"
 _quarto="FALSE"
 
-pkgrel=2
+pkgrel=3
 pkgdesc="A powerful and productive integrated development environment (IDE) for R programming language"
 arch=('x86_64')
 url="https://www.rstudio.com/products/rstudio/"
@@ -38,7 +39,8 @@ source=("rstudio-$pkgver.tar.gz::https://github.com/rstudio/rstudio/archive/refs
         "cran_multithread.patch"
         "sigstksz_gcc11.patch"
         "10952.patch"
-        "quarto_pandoc_location.patch")
+        "quarto_pandoc_location.patch"
+        "pandoc_version.patch")
 
 sha256sums=('41e48e21ddc0a9c1ebf06ff16d846b0389720f2ee66d3fcfd5ff0707578b597d'
             'b98e704164f54be596779696a3fcd11be5785c9907a99ec535ff6e9525ad5f9a'
@@ -48,7 +50,8 @@ sha256sums=('41e48e21ddc0a9c1ebf06ff16d846b0389720f2ee66d3fcfd5ff0707578b597d'
             'c907e6eec5ef324ad498b44fb9926bb5baafc4e0778ca01f6ba9b49dd3a2a980'
             '7b8420db08f848f7baac0f3104c879ac7ce6e27e463f96a6b1c6589cd4b8df82'
             '71c41818d099c07d928aa9689a5fd57bb3dc187b9788a8d5cc528ef6208b7726'
-            'f496c8d012ec7211b7d76240932c1b33fc76c5bb756b354eb00dd5c4344baeab')
+            'f496c8d012ec7211b7d76240932c1b33fc76c5bb756b354eb00dd5c4344baeab'
+            '71cc9986a02c209960309f0e1dd50f08a8f7e59c1bc09ec45d10058a89299939')
 
 noextract=("gin-${_ginver}.zip")
 
@@ -61,8 +64,9 @@ prepare() {
     # Fix for quarto/pandoc location
     # https://github.com/rstudio/rstudio/pull/10952
     patch -p1 < ${srcdir}/10952.patch
-    # Fix for missed path to new pandoc location in upstream
     patch -p1 < ${srcdir}/quarto_pandoc_location.patch
+    # Do not use outdated version name of pandoc
+    patch -p1 < ${srcdir}/pandoc_version.patch
 
     msg "Extracting dependencies..."
     cd "${srcdir}/${_srcname}/src/gwt"
@@ -71,7 +75,7 @@ prepare() {
     cp -r "${srcdir}/gwt-${_gwtver}/"* lib/gwt/${_gwtver}
 
     cd "${srcdir}/${_srcname}/dependencies/common"
-    _pandocver=$(grep -oP "(?<=PANDOC_VERSION=\").*(?=\"$)" install-pandoc)
+    #_pandocver=$(grep -oP "(?<=PANDOC_VERSION=\").*(?=\"$)" install-pandoc)
     install -d pandoc/${_pandocver}
  
     ln -sfT /usr/share/myspell/dicts dictionaries
@@ -105,6 +109,11 @@ build() {
         install -d quarto/bin/tools
         ln -sfT /usr/bin/quarto quarto/bin/quarto
         ln -sfT /usr/bin/pandoc quarto/bin/tools/pandoc
+    else
+        msg "Use pandoc, because Quarto is not used..."
+        cd "${srcdir}/${_srcname}/dependencies"
+        install -d pandoc/${_pandocver}/bin/tools
+        ln -sfT /usr/bin/pandoc pandoc/${_pandocver}/bin/tools/pandoc
     fi
 
     cd ${srcdir}
diff --git a/pandoc_version.patch b/pandoc_version.patch
new file mode 100644
index 000000000000..1f81c1579a7a
--- /dev/null
+++ b/pandoc_version.patch
@@ -0,0 +1,12 @@
+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 @@
+ endif()
+ 
+ # pandoc version
+-set(PANDOC_VERSION "2.16.2" CACHE INTERNAL "Pandoc version")
++set(PANDOC_VERSION "current" CACHE INTERNAL "Pandoc version")
+ 
+ # quarto support
+ if(LINUX AND UNAME_M STREQUAL aarch64)