[rstudio] 03/05: Add a patch to prevent external dependency check and external resources copy.

[Bertrand Marc]

This is an automated email from the git hooks/post-receive script.

bbk-guest pushed a commit to branch master
in repository rstudio.

commit adf3296b9c05757c56ac0f39b093a68a346b3afe
Author: Bertrand Marc <beberking at gmail.com>
Date:   Sat Sep 26 16:59:04 2015 +0200

    Add a patch to prevent external dependency check and external resources copy.
---
 debian/patches/remove_external_resources.diff | 90 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 91 insertions(+)

diff --git a/debian/patches/remove_external_resources.diff b/debian/patches/remove_external_resources.diff
new file mode 100644
index 0000000..3056be8
--- /dev/null
+++ b/debian/patches/remove_external_resources.diff
@@ -0,0 +1,90 @@
+Description: prevent third party code installation
+ This should be sent upstream and discussed to exclude any third party code in
+ clean way.
+Author: Bertrand Marc <beberking at gmail.com>
+--- a/src/cpp/session/CMakeLists.txt
++++ b/src/cpp/session/CMakeLists.txt
+@@ -19,18 +19,6 @@
+ 
+ # verify that install-dictionaries, install-mathjax, install-pandoc,
+ # and install-rmarkdown have been run
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries")
+-  message(FATAL_ERROR "Dictionaries not found (re-run install-dependencies script to install)")
+-endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23")
+-  message(FATAL_ERROR "Mathjax 2.3 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()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rsconnect")
+-  message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)")
+-endif()
+ 
+ 
+ # verify libclang is installed
+@@ -39,11 +27,11 @@
+ else()
+    set(LIBCLANG_VERSION "3.5")
+ endif()
+-set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
++set(LIBCLANG_DIR "/usr/lib/llvm-3.5/include/clang/")
+ 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")
++set(LIBCLANG_HEADERS_DIR "/usr/lib/llvm-3.5/include/clang/")
+ if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
+   message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
+ endif()
+@@ -390,14 +378,6 @@
+    install(FILES ${R_MODULE_SRC_FILES}
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/modules)
+ 
+-   # install hunspell dictionaries
+-   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/dictionaries"
+-           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
+-
+-   # install mathjax for local html preview
+-   install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-23"
+-           DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources")
+-
+    # install pandoc
+    if(RSTUDIO_PACKAGE_BUILD_SLES)
+       # when producing a SUSE Linux Enterpise build, we want to install the 
+@@ -415,10 +395,6 @@
+    install(FILES ${RSCONNECT_PACKAGE}
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/packages)
+ 
+-   # install PDF.js
+-   install(DIRECTORY "resources/pdfjs"
+-           DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+-
+    # install DataTables
+    install(DIRECTORY "resources/grid"
+            DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
+@@ -427,24 +403,6 @@
+    install(DIRECTORY "resources/help_resources"
+            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 ""))
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..80c8880
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+remove_external_resources.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/rstudio.git