commit 1a5a515a90ab45bd6bd4184bdd9938a6d0c292fe
Author: Jan Rękorajski <[email protected]>
Date: Sat Jul 13 22:26:34 2013 +0200
- fix building with boost 1.53+
- updated files
boost-1.53.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
rstudio.spec | 3 +++
2 files changed, 63 insertions(+)
---
diff --git a/rstudio.spec b/rstudio.spec
index 000c6e6..4df58a9 100644
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -15,6 +15,7 @@ Source3:
https://s3.amazonaws.com/rstudio-buildtools/mathjax-20.zip
# Source3-md5: 480ede551eeffec08162a7a913eee906
Source4:
https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip
# Source4-md5: 0e03798b8e53096c4a906bde05e32378
+Patch0: boost-1.53.patch
URL: http://rstudio.org/
BuildRequires: QtWebKit-devel
BuildRequires: QtXmlPatterns-devel
@@ -34,6 +35,7 @@ or Linux) or even over the web using RStudio Server.
%prep
%setup -q -n %{name}-%{name}-ca19c52
+%patch0 -p1
mkdir -p src/gwt/lib/gwt
mkdir -p src/gwt/lib/gin/1.5
unzip -qq %{SOURCE1} -d src/gwt/lib/gwt
@@ -73,6 +75,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/R
%dir %{_libdir}/%{name}/bin
+%attr(755,root,root) %{_libdir}/%{name}/bin/diagnostics
%attr(755,root,root) %{_libdir}/%{name}/bin/r*
%dir %{_libdir}/%{name}/bin/postback
%attr(755,root,root) %{_libdir}/%{name}/bin/postback/*
diff --git a/boost-1.53.patch b/boost-1.53.patch
new file mode 100644
index 0000000..3d7ad40
--- /dev/null
+++ b/boost-1.53.patch
@@ -0,0 +1,60 @@
+diff -ur
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/AsyncServer.hpp
rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/AsyncServer.hpp
+---
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/AsyncServer.hpp
2013-05-11 11:43:04.000000000 +0200
++++ rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/AsyncServer.hpp
2013-07-13 22:18:04.870033356 +0200
+@@ -264,7 +264,7 @@
+
+ // convert to cannonical HttpConnection
+ boost::shared_ptr<AsyncConnection> pAsyncConnection =
+- boost::shared_static_cast<AsyncConnection>(pConnection);
++ boost::dynamic_pointer_cast<AsyncConnection>(pConnection);
+
+ // call the appropriate handler to generate a response
+ std::string uri = pRequest->uri();
+diff -ur
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp
rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp
+---
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp
2013-05-11 11:43:04.000000000 +0200
++++
rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/LocalStreamAsyncClient.hpp
2013-07-13 22:18:08.176727065 +0200
+@@ -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::dynamic_pointer_cast<LocalStreamAsyncClient>(ptrShared);
+ }
+
+ private:
+diff -ur
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/TcpIpAsyncClient.hpp
rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/TcpIpAsyncClient.hpp
+---
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/TcpIpAsyncClient.hpp
2013-05-11 11:43:04.000000000 +0200
++++
rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/TcpIpAsyncClient.hpp
2013-07-13 22:18:08.960066805 +0200
+@@ -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::dynamic_pointer_cast<TcpIpAsyncClient>(ptrShared);
+ }
+
+ private:
+diff -ur
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp
rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp
+---
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp
2013-05-11 11:43:04.000000000 +0200
++++
rstudio-rstudio-ca19c52/src/cpp/core/include/core/http/TcpIpAsyncClientSsl.hpp
2013-07-13 22:18:09.616738848 +0200
+@@ -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::dynamic_pointer_cast<TcpIpAsyncClientSsl>(ptrShared);
+ }
+
+ virtual bool isShutdownError(const boost::system::error_code& ec)
+diff -ur
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp
rstudio-rstudio-ca19c52/src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp
+---
rstudio-rstudio-ca19c52.orig/src/rstudio-rstudio-ca19c52/src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp
2013-05-11 11:43:04.000000000 +0200
++++
rstudio-rstudio-ca19c52/src/cpp/session/http/SessionHttpConnectionListenerImpl.hpp
2013-07-13 22:18:10.206743669 +0200
+@@ -256,7 +256,7 @@
+ {
+ // convert to cannonical HttpConnection
+ boost::shared_ptr<HttpConnection> ptrHttpConnection =
+- boost::shared_static_cast<HttpConnection>(ptrConnection);
++ boost::dynamic_pointer_cast<HttpConnection>(ptrConnection);
+
+ if (!authenticate(ptrHttpConnection))
+ {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rstudio.git/commitdiff/1a5a515a90ab45bd6bd4184bdd9938a6d0c292fe
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
