[rstudio] 01/01: Succeeded in quilt-patching to at least get the build started

[Andreas Tille]

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

tille pushed a commit to branch master
in repository rstudio.

commit ca3b2ef9d92be88d81d45ec0c1b4cb4af63ee0da
Author: Andreas Tille <tille at debian.org>
Date:   Fri Apr 29 00:04:14 2016 +0200

    Succeeded in quilt-patching to at least get the build started
---
 debian/patches/remove_external_resources.diff | 38 ++++++++++++++++-----------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/debian/patches/remove_external_resources.diff b/debian/patches/remove_external_resources.diff
index f98da5b..729c28c 100644
--- a/debian/patches/remove_external_resources.diff
+++ b/debian/patches/remove_external_resources.diff
@@ -4,10 +4,12 @@ Description: prevent third party code installation
 Author: Bertrand Marc <beberking at gmail.com>
 --- a/src/cpp/session/CMakeLists.txt
 +++ b/src/cpp/session/CMakeLists.txt
-@@ -19,21 +19,9 @@ add_subdirectory(workers)
+@@ -17,38 +17,17 @@ project (SESSION)
  
- # verify that install-dictionaries, install-mathjax, install-pandoc,
- # and install-rmarkdown have been run
+ add_subdirectory(workers)
+ 
+-# 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()
@@ -17,30 +19,34 @@ Author: Bertrand Marc <beberking at gmail.com>
 -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/rmarkdown")
-   message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)")
- endif()
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown")
+-  message(FATAL_ERROR "rmarkdown package 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()
- if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/profvis")
-   message(FATAL_ERROR "profvis package not found (re-run install-dependencies script to install)")
- endif()
-@@ -44,11 +32,11 @@ if(WIN32)
+-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/profvis")
+-  message(FATAL_ERROR "profvis package 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")
+-   set(LIBCLANG_VERSION "3.5")
++   set(LIBCLANG_VERSION "3.6")
  endif()
 -set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}")
-+set(LIBCLANG_DIR "/usr/lib/llvm-3.5/include/clang/")
++set(LIBCLANG_DIR "/usr/lib/llvm-3.6/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/")
++set(LIBCLANG_HEADERS_DIR "/usr/lib/llvm-3.6/include/clang/")
  if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}")
    message(FATAL_ERROR "libclang builtin-headers not found  (re-run install-dependencies script to install)")
  endif()
-@@ -406,14 +394,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
+@@ -406,14 +385,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
     install(FILES ${R_MODULE_SRC_FILES}
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/modules)
  
@@ -55,7 +61,7 @@ Author: Bertrand Marc <beberking at gmail.com>
     # install pandoc
     if(RSTUDIO_PACKAGE_BUILD_SLES)
        # when producing a SUSE Linux Enterpise build, we want to install the 
-@@ -441,10 +421,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
+@@ -441,10 +412,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
     install(FILES ${PROFVIS_PACKAGE}
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/R/packages)
  
@@ -66,7 +72,7 @@ Author: Bertrand Marc <beberking at gmail.com>
     # install DataTables
     install(DIRECTORY "resources/grid"
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
-@@ -457,24 +433,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
+@@ -457,24 +424,6 @@ if (NOT RSTUDIO_SESSION_WIN64)
     install(DIRECTORY "resources/notebook"
             DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
  

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