diff options
author | László Kupcsik <koopac@gmail.com> | 2023-09-20 22:21:32 +0200 |
---|---|---|
committer | László Kupcsik <koopac@gmail.com> | 2023-09-27 22:24:42 +0200 |
commit | 217d974d847c0f8007fdf98275599b0486b9e0f2 (patch) | |
tree | 7c57da8110dba4d601296b131e5d4f92ca748f48 /pkgs/applications/editors/rstudio/use-system-quarto.patch | |
parent | 774c35c2a1bc4a9fa8e748ea69fe236cac0ec899 (diff) |
rstudio: 2022.07.1+554 -> 2023.09.0+463
Updates rstudio to current version, fixes plotting and enables quarto and markdown rendering. Visual mode for markdown editing is still not functional. * Remove unneeded patch * Eliminate false quarto version warning * Fix pandoc and quarto paths * Adjust patch name to reflect purpose * Remove panmirror for now * Update quartoSrc Co-authored-by: Justin Bedő <cu@cua0.org> Also contributed: b-rodrigues and kupac
Diffstat (limited to 'pkgs/applications/editors/rstudio/use-system-quarto.patch')
-rw-r--r-- | pkgs/applications/editors/rstudio/use-system-quarto.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/pkgs/applications/editors/rstudio/use-system-quarto.patch b/pkgs/applications/editors/rstudio/use-system-quarto.patch new file mode 100644 index 0000000000000..89653219dbea6 --- /dev/null +++ b/pkgs/applications/editors/rstudio/use-system-quarto.patch @@ -0,0 +1,46 @@ +--- a/src/cpp/session/CMakeLists.txt ++++ b/src/cpp/session/CMakeLists.txt +@@ -36,18 +36,14 @@ + else() + set(RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR "${RSTUDIO_DEPENDENCIES_DIR}/dictionaries") + endif() +- ++ + if(EXISTS "${RSTUDIO_TOOLS_ROOT}/mathjax-27") + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_TOOLS_ROOT}/mathjax-27") + else() + set(RSTUDIO_DEPENDENCIES_MATHJAX_DIR "${RSTUDIO_DEPENDENCIES_DIR}/mathjax-27") + endif() + +- if(EXISTS "${RSTUDIO_TOOLS_ROOT}/quarto") +- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_TOOLS_ROOT}/quarto") +- else() +- set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "${RSTUDIO_DEPENDENCIES_DIR}/quarto") +- endif() ++ set(RSTUDIO_DEPENDENCIES_QUARTO_DIR "@quarto@") + + endif() + +@@ -56,7 +52,7 @@ + # - 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/tools") ++ set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "@pandoc@/bin") + elseif(EXISTS "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + set(RSTUDIO_DEPENDENCIES_PANDOC_DIR "${RSTUDIO_TOOLS_ROOT}/pandoc/${PANDOC_VERSION}") + else() +@@ -66,11 +62,9 @@ + + # validate our dependencies exist + foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR +- RSTUDIO_DEPENDENCIES_MATHJAX_DIR +- RSTUDIO_DEPENDENCIES_PANDOC_DIR +- RSTUDIO_DEPENDENCIES_QUARTO_DIR) ++ RSTUDIO_DEPENDENCIES_MATHJAX_DIR) ++ + +- + # skip quarto if not enabled + if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED) + continue() |