diff options
Diffstat (limited to 'sci-mathematics/rstudio/files')
8 files changed, 0 insertions, 436 deletions
diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.336-boost-1.53.patch b/sci-mathematics/rstudio/files/rstudio-0.97.336-boost-1.53.patch deleted file mode 100644 index 38bb63a8ab61..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.97.336-boost-1.53.patch +++ /dev/null @@ -1,64 +0,0 @@ -=== modified file 'src/cpp/core/include/core/http/AsyncServer.hpp' ---- src/cpp/core/include/core/http/AsyncServer.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/core/include/core/http/AsyncServer.hpp 2013-07-09 12:03:34 +0000 -@@ -264,7 +264,7 @@ - - // convert to cannonical HttpConnection - boost::shared_ptr<AsyncConnection> pAsyncConnection = -- boost::shared_static_cast<AsyncConnection>(pConnection); -+ boost::static_pointer_cast<AsyncConnection>(pConnection); - - // call the appropriate handler to generate a response - std::string uri = pRequest->uri(); - -=== modified file 'src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp' ---- src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp 2013-07-09 12:03:36 +0000 -@@ -87,7 +87,7 @@ - boost::shared_ptr<AsyncClient<boost::asio::local::stream_protocol::socket> > - ptrShared = shared_from_this(); - -- return boost::shared_static_cast<LocalStreamAsyncClient>(ptrShared); -+ return boost::static_pointer_cast<LocalStreamAsyncClient>(ptrShared); - } - - private: - -=== modified file 'src/cpp/core/include/core/http/TcpIpAsyncClient.hpp' ---- src/cpp/core/include/core/http/TcpIpAsyncClient.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/core/include/core/http/TcpIpAsyncClient.hpp 2013-07-09 12:03:32 +0000 -@@ -74,7 +74,7 @@ - boost::shared_ptr<AsyncClient<boost::asio::ip::tcp::socket> > ptrShared - = shared_from_this(); - -- return boost::shared_static_cast<TcpIpAsyncClient>(ptrShared); -+ return boost::static_pointer_cast<TcpIpAsyncClient>(ptrShared); - } - - private: - -=== modified file 'src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp' ---- src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp 2013-07-09 12:03:39 +0000 -@@ -109,7 +109,7 @@ - boost::shared_ptr<AsyncClient<boost::asio::ssl::stream<boost::asio::ip::tcp::socket> > > ptrShared - = shared_from_this(); - -- return boost::shared_static_cast<TcpIpAsyncClientSsl>(ptrShared); -+ return boost::static_pointer_cast<TcpIpAsyncClientSsl>(ptrShared); - } - - virtual bool isShutdownError(const boost::system::error_code& ec) - -=== modified file 'src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp' ---- src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp 2013-07-09 12:03:29 +0000 -@@ -256,7 +256,7 @@ - { - // convert to cannonical HttpConnection - boost::shared_ptr<HttpConnection> ptrHttpConnection = -- boost::shared_static_cast<HttpConnection>(ptrConnection); -+ boost::static_pointer_cast<HttpConnection>(ptrConnection); - - if (!authenticate(ptrHttpConnection)) - { diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.336-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.97.336-linker_flags.patch deleted file mode 100644 index a336fccbc981..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.97.336-linker_flags.patch +++ /dev/null @@ -1,18 +0,0 @@ -Some gcc hardening options were added, however since we add -"-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which -leads to linker errors about unknown options, if we make it so the -as-needed option is the last option on the line, everything is fine. - -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index 0589ca0..fe5bd5f 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -57,7 +57,7 @@ if(UNIX) - add_definitions(-D_FORTIFY_SOURCE=2) - add_definitions(-fstack-protector --param ssp-buffer-size=4) - add_definitions(-pie -fPIE) -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now") -+ set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}") - endif() - - # Win32 specific global directives diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.336-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.97.336-paths.patch deleted file mode 100644 index 7b44374a72d2..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.97.336-paths.patch +++ /dev/null @@ -1,112 +0,0 @@ -change the install path, as by default everything is dumped right under -the prefix. After fixing install paths, now fix the source so the -program can find the moved resources. - -diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt -index da74970..1537bff 100644 ---- a/CMakeGlobals.txt -+++ b/CMakeGlobals.txt -@@ -103,7 +103,7 @@ else() - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate -diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt -index af4db1c..96b767e 100644 ---- a/src/cpp/server/CMakeLists.txt -+++ b/src/cpp/server/CMakeLists.txt -@@ -142,7 +142,7 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -150,7 +150,7 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -158,13 +158,13 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${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 ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured apparmor profile - set(RSERVER_APPARMOR_DIR "extras/apparmor") -@@ -172,9 +172,9 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -182,6 +182,6 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - endif() -diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp -index 77a63f1..f0d25f0 100644 ---- a/src/cpp/server/ServerOptions.cpp -+++ b/src/cpp/server/ServerOptions.cpp -@@ -201,7 +201,7 @@ ProgramStatus Options::read(int argc, char * const argv[]) - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(installPath, &wwwLocalPath_); -+ resolvePath(installPath.childPath(DISTRO_SHARE), &wwwLocalPath_); - resolvePath(installPath, &authPamHelperPath_); - resolvePath(installPath, &rsessionPath_); - resolvePath(installPath, &rldpathPath_); -diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp -index 0df1081..777cc6a 100644 ---- a/src/cpp/session/SessionOptions.cpp -+++ b/src/cpp/session/SessionOptions.cpp -@@ -333,12 +333,12 @@ core::ProgramStatus Options::read(int argc, char * const argv[]) - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath, &rResourcesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_); - resolvePath(resourcePath, &agreementFilePath_); -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &coreRSourcePath_); -- resolvePath(resourcePath, &modulesRSourcePath_); -- resolvePath(resourcePath, &sessionLibraryPath_); -- resolvePath(resourcePath, &sessionPackagesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_); - resolvePostbackPath(resourcePath, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath, &consoleIoPath_); - diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.336-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.97.336-prefs.patch deleted file mode 100644 index 3175d47235ab..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.97.336-prefs.patch +++ /dev/null @@ -1,24 +0,0 @@ -And now we fix src/gwt/build.xml since java's user preference class is -braindead and insists on writing where it is not allowed. -much thanks to http://www.allaboutbalance.com/articles/disableprefs/ - -diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index e7d2418..ae3a331 100644 ---- a/src/gwt/build.xml -+++ b/src/gwt/build.xml -@@ -25,6 +25,7 @@ - <property name="gwt.extra.args" value=""/> - <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> - <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> -+ <property environment="env"/> - - <path id="project.class.path"> - <pathelement location="bin"/> -@@ -109,6 +110,7 @@ - </classpath> - <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> - <jvmarg value="-Xmx1024M"/> -+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> - <arg value="-war"/> - <arg value="www"/> - <arg value="-localWorkers"/> diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.551-boost-1.53.patch b/sci-mathematics/rstudio/files/rstudio-0.97.551-boost-1.53.patch deleted file mode 100644 index 38bb63a8ab61..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.97.551-boost-1.53.patch +++ /dev/null @@ -1,64 +0,0 @@ -=== modified file 'src/cpp/core/include/core/http/AsyncServer.hpp' ---- src/cpp/core/include/core/http/AsyncServer.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/core/include/core/http/AsyncServer.hpp 2013-07-09 12:03:34 +0000 -@@ -264,7 +264,7 @@ - - // convert to cannonical HttpConnection - boost::shared_ptr<AsyncConnection> pAsyncConnection = -- boost::shared_static_cast<AsyncConnection>(pConnection); -+ boost::static_pointer_cast<AsyncConnection>(pConnection); - - // call the appropriate handler to generate a response - std::string uri = pRequest->uri(); - -=== modified file 'src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp' ---- src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp 2013-07-09 12:03:36 +0000 -@@ -87,7 +87,7 @@ - boost::shared_ptr<AsyncClient<boost::asio::local::stream_protocol::socket> > - ptrShared = shared_from_this(); - -- return boost::shared_static_cast<LocalStreamAsyncClient>(ptrShared); -+ return boost::static_pointer_cast<LocalStreamAsyncClient>(ptrShared); - } - - private: - -=== modified file 'src/cpp/core/include/core/http/TcpIpAsyncClient.hpp' ---- src/cpp/core/include/core/http/TcpIpAsyncClient.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/core/include/core/http/TcpIpAsyncClient.hpp 2013-07-09 12:03:32 +0000 -@@ -74,7 +74,7 @@ - boost::shared_ptr<AsyncClient<boost::asio::ip::tcp::socket> > ptrShared - = shared_from_this(); - -- return boost::shared_static_cast<TcpIpAsyncClient>(ptrShared); -+ return boost::static_pointer_cast<TcpIpAsyncClient>(ptrShared); - } - - private: - -=== modified file 'src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp' ---- src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp 2013-07-09 12:03:39 +0000 -@@ -109,7 +109,7 @@ - boost::shared_ptr<AsyncClient<boost::asio::ssl::stream<boost::asio::ip::tcp::socket> > > ptrShared - = shared_from_this(); - -- return boost::shared_static_cast<TcpIpAsyncClientSsl>(ptrShared); -+ return boost::static_pointer_cast<TcpIpAsyncClientSsl>(ptrShared); - } - - virtual bool isShutdownError(const boost::system::error_code& ec) - -=== modified file 'src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp' ---- src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp 2013-07-09 12:02:58 +0000 -+++ src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp 2013-07-09 12:03:29 +0000 -@@ -256,7 +256,7 @@ - { - // convert to cannonical HttpConnection - boost::shared_ptr<HttpConnection> ptrHttpConnection = -- boost::shared_static_cast<HttpConnection>(ptrConnection); -+ boost::static_pointer_cast<HttpConnection>(ptrConnection); - - if (!authenticate(ptrHttpConnection)) - { diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.551-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.97.551-linker_flags.patch deleted file mode 100644 index a336fccbc981..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.97.551-linker_flags.patch +++ /dev/null @@ -1,18 +0,0 @@ -Some gcc hardening options were added, however since we add -"-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which -leads to linker errors about unknown options, if we make it so the -as-needed option is the last option on the line, everything is fine. - -diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt -index 0589ca0..fe5bd5f 100644 ---- a/src/cpp/CMakeLists.txt -+++ b/src/cpp/CMakeLists.txt -@@ -57,7 +57,7 @@ if(UNIX) - add_definitions(-D_FORTIFY_SOURCE=2) - add_definitions(-fstack-protector --param ssp-buffer-size=4) - add_definitions(-pie -fPIE) -- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now") -+ set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}") - endif() - - # Win32 specific global directives diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.551-paths.patch b/sci-mathematics/rstudio/files/rstudio-0.97.551-paths.patch deleted file mode 100644 index 7b44374a72d2..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.97.551-paths.patch +++ /dev/null @@ -1,112 +0,0 @@ -change the install path, as by default everything is dumped right under -the prefix. After fixing install paths, now fix the source so the -program can find the moved resources. - -diff --git a/CMakeGlobals.txt b/CMakeGlobals.txt -index da74970..1537bff 100644 ---- a/CMakeGlobals.txt -+++ b/CMakeGlobals.txt -@@ -103,7 +103,7 @@ else() - else() - set(RSTUDIO_INSTALL_BIN bin) - endif() -- set(RSTUDIO_INSTALL_SUPPORTING .) -+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) - endif() - - # if the install prefix is /usr/local then tweak as appropriate -diff --git a/src/cpp/server/CMakeLists.txt b/src/cpp/server/CMakeLists.txt -index af4db1c..96b767e 100644 ---- a/src/cpp/server/CMakeLists.txt -+++ b/src/cpp/server/CMakeLists.txt -@@ -142,7 +142,7 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) - - # install configured redhat init.d script - set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") -@@ -150,7 +150,7 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) - - # install configured suse init.d script - set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") -@@ -158,13 +158,13 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${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 ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) - - # install configured apparmor profile - set(RSERVER_APPARMOR_DIR "extras/apparmor") -@@ -172,9 +172,9 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load -- DESTINATION ${RSERVER_APPARMOR_DIR}) -+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) - - # install configured upstart profile - set(RSERVER_UPSTART_DIR "extras/upstart") -@@ -182,6 +182,6 @@ if (UNIX AND NOT APPLE) - 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 ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) - - endif() -diff --git a/src/cpp/server/ServerOptions.cpp b/src/cpp/server/ServerOptions.cpp -index 77a63f1..f0d25f0 100644 ---- a/src/cpp/server/ServerOptions.cpp -+++ b/src/cpp/server/ServerOptions.cpp -@@ -201,7 +201,7 @@ ProgramStatus Options::read(int argc, char * const argv[]) - - // convert relative paths by completing from the system installation - // path (this allows us to be relocatable) -- resolvePath(installPath, &wwwLocalPath_); -+ resolvePath(installPath.childPath(DISTRO_SHARE), &wwwLocalPath_); - resolvePath(installPath, &authPamHelperPath_); - resolvePath(installPath, &rsessionPath_); - resolvePath(installPath, &rldpathPath_); -diff --git a/src/cpp/session/SessionOptions.cpp b/src/cpp/session/SessionOptions.cpp -index 0df1081..777cc6a 100644 ---- a/src/cpp/session/SessionOptions.cpp -+++ b/src/cpp/session/SessionOptions.cpp -@@ -333,12 +333,12 @@ core::ProgramStatus Options::read(int argc, char * const argv[]) - - // convert relative paths by completing from the app resource path -- resolvePath(resourcePath, &rResourcesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &rResourcesPath_); - resolvePath(resourcePath, &agreementFilePath_); -- resolvePath(resourcePath, &wwwLocalPath_); -- resolvePath(resourcePath, &coreRSourcePath_); -- resolvePath(resourcePath, &modulesRSourcePath_); -- resolvePath(resourcePath, &sessionLibraryPath_); -- resolvePath(resourcePath, &sessionPackagesPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &coreRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &modulesRSourcePath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionLibraryPath_); -+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &sessionPackagesPath_); - resolvePostbackPath(resourcePath, &rpostbackPath_); - #ifdef _WIN32 - resolvePath(resourcePath, &consoleIoPath_); - diff --git a/sci-mathematics/rstudio/files/rstudio-0.97.551-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.97.551-prefs.patch deleted file mode 100644 index 3175d47235ab..000000000000 --- a/sci-mathematics/rstudio/files/rstudio-0.97.551-prefs.patch +++ /dev/null @@ -1,24 +0,0 @@ -And now we fix src/gwt/build.xml since java's user preference class is -braindead and insists on writing where it is not allowed. -much thanks to http://www.allaboutbalance.com/articles/disableprefs/ - -diff --git a/src/gwt/build.xml b/src/gwt/build.xml -index e7d2418..ae3a331 100644 ---- a/src/gwt/build.xml -+++ b/src/gwt/build.xml -@@ -25,6 +25,7 @@ - <property name="gwt.extra.args" value=""/> - <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> - <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> -+ <property environment="env"/> - - <path id="project.class.path"> - <pathelement location="bin"/> -@@ -109,6 +110,7 @@ - </classpath> - <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> - <jvmarg value="-Xmx1024M"/> -+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> - <arg value="-war"/> - <arg value="www"/> - <arg value="-localWorkers"/> |