1 |
hasufell 14/07/04 13:53:22 |
2 |
|
3 |
Added: rstudio-0.98.932-pandoc.patch |
4 |
rstudio-0.98.932-paths.patch |
5 |
Log: |
6 |
version bump wrt #513862 |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-0.98.932-pandoc.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: rstudio-0.98.932-pandoc.patch |
17 |
=================================================================== |
18 |
--- a/src/cpp/session/CMakeLists.txt |
19 |
+++ b/src/cpp/session/CMakeLists.txt |
20 |
@@ -25,9 +25,6 @@ |
21 |
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax") |
22 |
message(FATAL_ERROR "Mathjax not found (re-run install-dependencies script to install)") |
23 |
endif() |
24 |
-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") |
25 |
- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") |
26 |
-endif() |
27 |
if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown") |
28 |
message(FATAL_ERROR "rmarkdown package not found (re-run install-dependencies script to install)") |
29 |
endif() |
30 |
@@ -337,12 +334,6 @@ |
31 |
install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax" |
32 |
DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources") |
33 |
|
34 |
- # install pandoc |
35 |
- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.12.3") |
36 |
- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") |
37 |
- install(PROGRAMS ${PANDOC_FILES} |
38 |
- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) |
39 |
- |
40 |
# install rmarkdown package |
41 |
file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") |
42 |
install(FILES ${RMARKDOWN_PACKAGE} |
43 |
|
44 |
|
45 |
|
46 |
1.1 sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-0.98.932-paths.patch?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: rstudio-0.98.932-paths.patch |
52 |
=================================================================== |
53 |
diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt |
54 |
index cc10191..f75b85a 100644 |
55 |
--- a/CMakeGlobals.txt |
56 |
+++ b/CMakeGlobals.txt |
57 |
@@ -105,7 +105,7 @@ else() |
58 |
else() |
59 |
set(RSTUDIO_INSTALL_BIN bin) |
60 |
endif() |
61 |
- set(RSTUDIO_INSTALL_SUPPORTING .) |
62 |
+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) |
63 |
endif() |
64 |
|
65 |
# if the install prefix is /usr/local then tweak as appropriate |
66 |
diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt |
67 |
index 184e514..d09aac5 100644 |
68 |
--- a/src/cpp/server/CMakeLists.txt |
69 |
+++ b/src/cpp/server/CMakeLists.txt |
70 |
@@ -145,7 +145,7 @@ if (UNIX AND NOT APPLE) |
71 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in |
72 |
${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) |
73 |
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} |
74 |
- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) |
75 |
+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) |
76 |
|
77 |
# install configured redhat init.d script |
78 |
set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") |
79 |
@@ -153,7 +153,7 @@ if (UNIX AND NOT APPLE) |
80 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in |
81 |
${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) |
82 |
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} |
83 |
- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) |
84 |
+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) |
85 |
|
86 |
# install configured suse init.d script |
87 |
set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") |
88 |
@@ -161,13 +161,13 @@ if (UNIX AND NOT APPLE) |
89 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in |
90 |
${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) |
91 |
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} |
92 |
- DESTINATION ${RSERVER_INITD_SUSE_DIR}) |
93 |
+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) |
94 |
|
95 |
# install pam profile |
96 |
set(RSERVER_PAM_DIR "extras/pam") |
97 |
set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") |
98 |
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} |
99 |
- DESTINATION ${RSERVER_PAM_DIR}) |
100 |
+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) |
101 |
|
102 |
# install configured apparmor profile |
103 |
set(RSERVER_APPARMOR_DIR "extras/apparmor") |
104 |
@@ -175,9 +175,9 @@ if (UNIX AND NOT APPLE) |
105 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in |
106 |
${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) |
107 |
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} |
108 |
- DESTINATION ${RSERVER_APPARMOR_DIR}) |
109 |
+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) |
110 |
install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load |
111 |
- DESTINATION ${RSERVER_APPARMOR_DIR}) |
112 |
+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) |
113 |
|
114 |
# install configured upstart profile |
115 |
set(RSERVER_UPSTART_DIR "extras/upstart") |
116 |
@@ -185,12 +185,12 @@ if (UNIX AND NOT APPLE) |
117 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in |
118 |
${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) |
119 |
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} |
120 |
- DESTINATION ${RSERVER_UPSTART_DIR}) |
121 |
+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) |
122 |
set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") |
123 |
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in |
124 |
${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) |
125 |
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} |
126 |
- DESTINATION ${RSERVER_UPSTART_DIR}) |
127 |
+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) |
128 |
|
129 |
endif() |
130 |
|
131 |
diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp |
132 |
index 1eaf7c0..4b25fa1 100644 |
133 |
--- a/src/cpp/server/ServerOptions.cpp |
134 |
+++ b/src/cpp/server/ServerOptions.cpp |
135 |
@@ -307,8 +307,8 @@ ProgramStatus Options::read(int argc, |
136 |
|
137 |
// convert relative paths by completing from the system installation |
138 |
// path (this allows us to be relocatable) |
139 |
- resolvePath(resourcePath, &wwwLocalPath_); |
140 |
- resolvePath(resourcePath, &wwwSymbolMapsPath_); |
141 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); |
142 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); |
143 |
resolvePath(binaryPath, &authPamHelperPath_); |
144 |
resolvePath(binaryPath, &rsessionPath_); |
145 |
resolvePath(binaryPath, &rldpathPath_); |
146 |
diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp |
147 |
index 44b3d55..a48cdb6 100644 |
148 |
--- a/src/cpp/session/SessionOptions.cpp |
149 |
+++ b/src/cpp/session/SessionOptions.cpp |
150 |
@@ -40,7 +40,7 @@ |
151 |
namespace session { |
152 |
|
153 |
namespace { |
154 |
-const char* const kDefaultPandocPath = "bin/pandoc"; |
155 |
+const char* const kDefaultPandocPath = "bin"; |
156 |
const char* const kDefaultPostbackPath = "bin/postback/rpostback"; |
157 |
} // anonymous namespace |
158 |
|
159 |
@@ -392,15 +392,15 @@ |
160 |
} |
161 |
|
162 |
// convert relative paths by completing from the app resource path |
163 |
- resolvePath(resourcePath, &rResourcesPath_); |
164 |
- resolvePath(resourcePath, &agreementFilePath_); |
165 |
- resolvePath(resourcePath, &wwwLocalPath_); |
166 |
- resolvePath(resourcePath, &wwwSymbolMapsPath_); |
167 |
- resolvePath(resourcePath, &coreRSourcePath_); |
168 |
- resolvePath(resourcePath, &modulesRSourcePath_); |
169 |
- resolvePath(resourcePath, &sessionLibraryPath_); |
170 |
- resolvePath(resourcePath, &sessionPackagesPath_); |
171 |
- resolvePath(resourcePath, &sessionPackageArchivesPath_); |
172 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_); |
173 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &agreementFilePath_); |
174 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); |
175 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_); |
176 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_); |
177 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_); |
178 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_); |
179 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); |
180 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); |
181 |
resolvePostbackPath(resourcePath, &rpostbackPath_); |
182 |
#ifdef _WIN32 |
183 |
resolvePath(resourcePath, &consoleIoPath_); |
184 |
@@ -409,7 +409,7 @@ |
185 |
resolvePath(resourcePath, &msysSshPath_); |
186 |
resolvePath(resourcePath, &sumatraPath_); |
187 |
#endif |
188 |
- resolvePath(resourcePath, &hunspellDictionariesPath_); |
189 |
+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); |
190 |
resolvePath(resourcePath, &mathjaxPath_); |
191 |
resolvePandocPath(resourcePath, &pandocPath_); |