From: | "Mark Wright (gienah)" <gienah@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in sci-mathematics/rstudio/files: rstudio-0.98.1091-boost-1.57.patch |
Date: | Sat, 28 Feb 2015 04:39:47 |
Message-Id: | 20150228043943.9FFE112B72@oystercatcher.gentoo.org |
1 | gienah 15/02/28 04:39:43 |
2 | |
3 | Added: rstudio-0.98.1091-boost-1.57.patch |
4 | Log: |
5 | Patch rstudio-0.98.1091 to build with boost 1.57 |
6 | |
7 | (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 618E971F) |
8 | |
9 | Revision Changes Path |
10 | 1.1 sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch |
11 | |
12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch?rev=1.1&view=markup |
13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/rstudio/files/rstudio-0.98.1091-boost-1.57.patch?rev=1.1&content-type=text/plain |
14 | |
15 | Index: rstudio-0.98.1091-boost-1.57.patch |
16 | =================================================================== |
17 | --- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopApplicationLaunch.hpp 2014-11-06 23:15:47.000000000 +1100 |
18 | +++ rstudio-0.98.1091/src/cpp/desktop/DesktopApplicationLaunch.hpp 2015-02-28 14:01:51.970672316 +1100 |
19 | @@ -19,7 +19,10 @@ |
20 | #include <QObject> |
21 | #include <QWidget> |
22 | #include <QApplication> |
23 | +// see https://bugreports.qt-project.org/browse/QTBUG-22829 |
24 | +#ifndef Q_MOC_RUN |
25 | #include <boost/scoped_ptr.hpp> |
26 | +#endif |
27 | |
28 | namespace desktop { |
29 | |
30 | --- rstudio-0.98.1091-orig/src/cpp/desktop/DesktopSessionLauncher.hpp 2014-11-06 23:15:47.000000000 +1100 |
31 | +++ rstudio-0.98.1091/src/cpp/desktop/DesktopSessionLauncher.hpp 2015-02-28 14:01:51.972672316 +1100 |
32 | @@ -18,7 +18,10 @@ |
33 | |
34 | #include <string> |
35 | |
36 | +// see https://bugreports.qt-project.org/browse/QTBUG-22829 |
37 | +#ifndef Q_MOC_RUN |
38 | #include <boost/utility.hpp> |
39 | +#endif |
40 | |
41 | #include <core/Error.hpp> |
42 | #include <core/FilePath.hpp> |
43 | --- rstudio-0.98.1091-orig/src/cpp/core/include/core/FilePath.hpp 2014-11-06 23:15:47.000000000 +1100 |
44 | +++ rstudio-0.98.1091/src/cpp/core/include/core/FilePath.hpp 2015-02-28 14:01:51.984672314 +1100 |
45 | @@ -23,11 +23,14 @@ |
46 | #include <vector> |
47 | #include <iosfwd> |
48 | |
49 | +// see https://bugreports.qt-project.org/browse/QTBUG-22829 |
50 | +#ifndef Q_MOC_RUN |
51 | #include <boost/shared_ptr.hpp> |
52 | #include <boost/scoped_ptr.hpp> |
53 | #include <boost/function.hpp> |
54 | |
55 | #include <boost/utility.hpp> |
56 | +#endif |
57 | |
58 | #include <core/Error.hpp> |
59 | #include <core/Log.hpp> |
60 | --- rstudio-0.98.1091-orig/src/cpp/core/include/core/Error.hpp 2014-11-06 23:15:47.000000000 +1100 |
61 | +++ rstudio-0.98.1091/src/cpp/core/include/core/Error.hpp 2015-02-28 14:01:51.977672315 +1100 |
62 | @@ -20,11 +20,14 @@ |
63 | #include <string> |
64 | #include <vector> |
65 | |
66 | +// see https://bugreports.qt-project.org/browse/QTBUG-22829 |
67 | +#ifndef Q_MOC_RUN |
68 | #include <boost/shared_ptr.hpp> |
69 | |
70 | #include <boost/system/error_code.hpp> |
71 | |
72 | #include <boost/current_function.hpp> |
73 | +#endif |
74 | |
75 | namespace core { |