File 0001-Unbundle-mathjax-and-pandoc.patch of Package rstudio

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Unbundle-mathjax-and-pandoc.patch of Package rstudio (Revision 9a94b1f06f14eb50a452eded1d42083f)

Currently displaying revision 9a94b1f06f14eb50a452eded1d42083f , Show latest

From 29dab1f5996b759ff3c97362e13a316f25641575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 13 Jan 2020 11:27:06 +0100
Subject: [PATCH 1/8] Unbundle mathjax and pandoc

Use find_file() & find_program() functions to find the dependencies in the
dependencies/ subdirectory first. If they are not there, use the system paths
instead.
---
 src/cpp/session/CMakeLists.txt | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/cpp/session/CMakeLists.txt b/src/cpp/session/CMakeLists.txt
index 1dfc977..56e2838 100644
--- a/src/cpp/session/CMakeLists.txt
+++ b/src/cpp/session/CMakeLists.txt
@@ -64,28 +64,6 @@ else()
 endif()
 
 
-# validate our dependencies exist
-foreach(VAR RSTUDIO_DEPENDENCIES_DICTIONARIES_DIR
-            RSTUDIO_DEPENDENCIES_MATHJAX_DIR
-            RSTUDIO_DEPENDENCIES_PANDOC_DIR
-            RSTUDIO_DEPENDENCIES_QUARTO_DIR)
-
- 
-   # skip quarto if not enabled
-   if("${VAR}" STREQUAL "RSTUDIO_DEPENDENCIES_QUARTO_DIR" AND NOT QUARTO_ENABLED)
-      continue()
-   endif()
-
-   # validate existence
-   if(NOT EXISTS "${${VAR}}")
-      message(FATAL_ERROR "${${VAR}} not found (re-run install-dependencies script to install")
-   endif()
-
-   # cache variables so they can be seen by configure_file
-   set("${VAR}" "${${VAR}}" CACHE INTERNAL "")
-   
-endforeach()
-
 # verify embedded packages are available
 foreach(PKG ${RSTUDIO_EMBEDDED_PACKAGES})
    file(GLOB PKG_FILES "${RSTUDIO_DEPENDENCIES_DIR}/common/${PKG}*.tar.gz")
-- 
2.31.1

Places

File 0001-Unbundle-mathjax-and-pandoc.patch of Package rstudio (Revision 9a94b1f06f14eb50a452eded1d42083f)

Places