diff options
Diffstat (limited to 'sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch')
-rw-r--r-- | sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch deleted file mode 100644 index ed0fc8ebce4b..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-1.0.44-clang-pandoc.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- rstudio-1.0.44-orig/src/cpp/session/CMakeLists.txt 2016-10-19 08:32:41.000000000 +1100 -+++ rstudio-1.0.44/src/cpp/session/CMakeLists.txt 2016-12-01 23:44:30.130725331 +1100 -@@ -25,24 +25,6 @@ - if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") - message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") - endif() --if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") -- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") --endif() -- --# verify libclang is installed --if(WIN32) -- set(LIBCLANG_VERSION "3.4") --else() -- set(LIBCLANG_VERSION "3.5") --endif() --set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") --if(NOT EXISTS "${LIBCLANG_DIR}") -- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") --endif() --set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") --if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") -- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") --endif() - - - # include files -@@ -420,18 +402,6 @@ - install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26" - DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") - -- # install pandoc -- if(RSTUDIO_PACKAGE_BUILD_SLES) -- # when producing a SUSE Linux Enterpise build, we want to install the -- # static Pandoc binaries (see dependencies/common/install-pandoc) -- set(PANDOC_EXTENSION_DIR "/static") -- endif() -- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.17.2${PANDOC_EXTENSION_DIR}") -- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") -- install(FILES ${PANDOC_FILES} -- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE -- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) -- - # install PDF.js - install(DIRECTORY "resources/pdfjs" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) -@@ -452,24 +422,6 @@ - install(DIRECTORY "resources/pagedtable" - DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) - -- # install libclang -- if(WIN32) -- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") -- install(PROGRAMS ${LIBCLANG_32_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) -- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") -- install(PROGRAMS ${LIBCLANG_64_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) -- else() -- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") -- install(PROGRAMS ${LIBCLANG_FILES} -- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) -- endif() -- -- # install libclang builtin-headers -- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" -- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") -- - # install 64 bit binaries if we are on win64 - if(WIN32) - if(NOT ("$ENV{PROGRAMW6432}" STREQUAL "")) |