Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 289847 Details for
Bug 365595
[science overlay] sci-mathematics/rstudio (New package)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
rstudio-0.94.110-paths.patch
rstudio-0.94.110-paths.patch (text/plain), 5.21 KB, created by
Eric Johnson
on 2011-10-15 04:47:34 UTC
(
hide
)
Description:
rstudio-0.94.110-paths.patch
Filename:
MIME Type:
Creator:
Eric Johnson
Created:
2011-10-15 04:47:34 UTC
Size:
5.21 KB
patch
obsolete
>diff -urN original/CMakeGlobals.txt paths/CMakeGlobals.txt >--- original/CMakeGlobals.txt 2011-09-30 09:02:51.000000000 -0700 >+++ paths/CMakeGlobals.txt 2011-10-08 17:32:13.420344312 -0700 >@@ -98,7 +98,7 @@ > else() > set(RSTUDIO_INSTALL_BIN bin) > endif() >- set(RSTUDIO_INSTALL_SUPPORTING .) >+ set(RSTUDIO_INSTALL_SUPPORTING ./share/rstudio-0.94.110/) > endif() > > # if the install prefix is /usr/local then tweak as appropriate >diff -urN original/src/cpp/server/CMakeLists.txt paths/src/cpp/server/CMakeLists.txt >--- original/src/cpp/server/CMakeLists.txt 2011-09-30 09:02:51.000000000 -0700 >+++ paths/src/cpp/server/CMakeLists.txt 2011-10-08 17:32:13.433344148 -0700 >@@ -141,7 +141,7 @@ > configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in > ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) > install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} >- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) >+ DESTINATION share/rstudio-0.94.110/${RSERVER_INITD_DEBIAN_DIR}) > > # install configured redhat init.d script > set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") >@@ -149,7 +149,7 @@ > configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in > ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) > install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} >- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) >+ DESTINATION share/rstudio-0.94.110/${RSERVER_INITD_REDHAT_DIR}) > > # install configured suse init.d script > set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") >@@ -157,13 +157,13 @@ > configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in > ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) > install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} >- DESTINATION ${RSERVER_INITD_SUSE_DIR}) >+ DESTINATION share/rstudio-0.94.110/${RSERVER_INITD_SUSE_DIR}) > > # install pam profile > set(RSERVER_PAM_DIR "extras/pam") > set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") > install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} >- DESTINATION ${RSERVER_PAM_DIR}) >+ DESTINATION share/rstudio-0.94.110/${RSERVER_PAM_DIR}) > > # install configured apparmor profile > set(RSERVER_APPARMOR_DIR "extras/apparmor") >@@ -171,9 +171,9 @@ > configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in > ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) > install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} >- DESTINATION ${RSERVER_APPARMOR_DIR}) >+ DESTINATION share/rstudio-0.94.110/${RSERVER_APPARMOR_DIR}) > install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load >- DESTINATION ${RSERVER_APPARMOR_DIR}) >+ DESTINATION share/rstudio-0.94.110/${RSERVER_APPARMOR_DIR}) > > # install configured upstart profile > set(RSERVER_UPSTART_DIR "extras/upstart") >@@ -181,6 +181,6 @@ > configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in > ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) > install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} >- DESTINATION ${RSERVER_UPSTART_DIR}) >+ DESTINATION share/rstudio-0.94.110/${RSERVER_UPSTART_DIR}) > > endif() >diff -urN original/src/cpp/server/ServerOptions.cpp paths/src/cpp/server/ServerOptions.cpp >--- original/src/cpp/server/ServerOptions.cpp 2011-09-30 09:02:51.000000000 -0700 >+++ paths/src/cpp/server/ServerOptions.cpp 2011-10-08 17:32:13.458343837 -0700 >@@ -201,7 +201,7 @@ > > // convert relative paths by completing from the system installation > // path (this allows us to be relocatable) >- resolvePath(installPath, &wwwLocalPath_); >+ resolvePath(installPath.childPath("share/rstudio-0.94.110"), &wwwLocalPath_); > resolvePath(installPath, &authPamHelperPath_); > resolvePath(installPath, &rsessionPath_); > resolvePath(installPath, &rldpathPath_); >diff -urN original/src/cpp/session/SessionOptions.cpp paths/src/cpp/session/SessionOptions.cpp >--- original/src/cpp/session/SessionOptions.cpp 2011-09-30 09:02:51.000000000 -0700 >+++ paths/src/cpp/session/SessionOptions.cpp 2011-10-08 17:32:13.447343974 -0700 >@@ -272,12 +272,12 @@ > } > > // convert relative paths by completing from the app resource path >- resolvePath(resourcePath, &rHelpCssFilePath_); >+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &rHelpCssFilePath_); > resolvePath(resourcePath, &agreementFilePath_); >- resolvePath(resourcePath, &wwwLocalPath_); >- resolvePath(resourcePath, &coreRSourcePath_); >- resolvePath(resourcePath, &modulesRSourcePath_); >- resolvePath(resourcePath, &sessionPackagesPath_); >+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &wwwLocalPath_); >+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &coreRSourcePath_); >+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &modulesRSourcePath_); >+ resolvePath(resourcePath.childPath("share/rstudio-0.94.110"), &sessionPackagesPath_); > resolvePath(resourcePath, &rpostbackPath_); > > // shared secret with parent
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Actions:
View
Attachments on
bug 365595
:
276129
|
284155
|
284157
|
284159
|
284161
|
287583
|
287585
|
287587
|
287589
|
289843
|
289845
| 289847 |
289849
|
291355
|
306435
|
306437
|
306439
|
306441
|
306443
|
306451
|
314989
|
314993
|
314995
|
314999