- fix moc parsing with boost 1.57.0

- rel 2

diff --git a/boost-moc.patch b/boost-moc.patch
new file mode 100644 (file)
index 0000000..68321b6
--- /dev/null
+++ b/boost-moc.patch
@@ -0,0 +1,24 @@
+--- rstudio-0.99.39/src/cpp/core/include/core/FilePath.hpp~    2015-02-19 21:35:05.000000000 +0100
++++ rstudio-0.99.39/src/cpp/core/include/core/FilePath.hpp     2015-02-19 21:35:13.360551778 +0100
+@@ -23,7 +23,9 @@
+ #include <boost/scoped_ptr.hpp>
+ #include <boost/function.hpp>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/utility.hpp>
++#endif
+ 
+ #include <core/Error.hpp>
+ #include <core/Log.hpp>
+--- rstudio-0.99.39/src/cpp/desktop/DesktopSessionLauncher.hpp~        2015-02-19 21:37:22.000000000 +0100
++++ rstudio-0.99.39/src/cpp/desktop/DesktopSessionLauncher.hpp 2015-02-19 21:46:51.487213390 +0100
+@@ -18,7 +18,9 @@
+ 
+ #include <string>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/utility.hpp>
++#endif
+ 
+ #include <core/Error.hpp>
+ #include <core/FilePath.hpp>

diff --git a/rstudio.spec b/rstudio.spec
index 17db0fa26cf1bd0b879ca85ccd381ca98e964655..ba2124c4653f3120a32de1bd36ec4947ff2f2d39 100644 (file)
--- a/rstudio.spec
+++ b/rstudio.spec
@@ -2,7 +2,7 @@ Summary:        IDE for R
 Summary(pl.UTF-8):     IDE dla R
 Name:          rstudio
 Version:       0.99.39
-Release:       1
+Release:       2
 License:       AGPLv3
 Group:         Applications
 Source0:       https://github.com/rstudio/rstudio/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz
@@ -27,6 +27,7 @@ Source9:      rmarkdown_0.3.12_8a78f712202263200f2110ec8aa24a55c2726e37.tar.xz
 # Source9-md5: 358f9f4bf2f35dd58d4771f6b24d252e
 Source10:      shinyapps_0.3.61_d3ab9e1cdd02f0067d69fe6fc816a61c8a5f2218.tar.xz
 # Source10-md5:        3f5ce12f86b00a2e77067d7769fffe08
+Patch0:                boost-moc.patch
 URL:           http://rstudio.org/
 BuildRequires: QtWebKit-devel
 BuildRequires: QtXmlPatterns-devel
@@ -89,6 +90,8 @@ mkdir -p dependencies/common/libclang/3.5/linux/x86_64
 ln -s %{_libdir}/libclang.so dependencies/common/libclang/3.5/linux/x86_64/libclang.so
 %endif
 
+%patch0 -p1
+
 %build
 install -d build
 cd build