Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mark Wright <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rstudio/, sci-mathematics/rstudio/files/
Date: Wed, 21 Aug 2019 14:08:44
Message-Id: 1566396226.cdda9adf72b626d020a063419c1f376755d1b456.gienah@gentoo
1 commit: cdda9adf72b626d020a063419c1f376755d1b456
2 Author: Mark Wright <gienah <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 21 14:03:46 2019 +0000
4 Commit: Mark Wright <gienah <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 21 14:03:46 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdda9adf
7
8 sci-mathematics/rstudio: Bump to 1.2.1335, fix compile with >=boost 1.70.0
9
10 Bump, thanks to Neil, Ulenrich, François Valenduc, Thomas Bettler,
11 Simon Maurer, Bernd Feige and asturm for helping.
12
13 Split the rstudio-1.1.463-boost-1.69.0_p?.patch patches into 3 patch files.
14
15 Closes: https://bugs.gentoo.org/683050
16 Closes: https://bugs.gentoo.org/686186
17 Package-Manager: Portage-2.3.71, Repoman-2.3.17
18 Signed-off-by: Mark Wright <gienah <AT> gentoo.org>
19
20 sci-mathematics/rstudio/Manifest | 3 +
21 .../files/rstudio-1.1.463-boost-1.69.0_p1.patch | 222 +-----------
22 .../files/rstudio-1.1.463-boost-1.69.0_p2.patch | 377 ++++++++++++---------
23 ...patch => rstudio-1.1.463-boost-1.69.0_p3.patch} | 0
24 .../files/rstudio-1.1.463-boost-1.70.0.patch | 46 +++
25 .../files/rstudio-1.2.1335-boost-1.70.0_p1.patch | 46 +++
26 .../files/rstudio-1.2.1335-boost-1.70.0_p2.patch | 17 +
27 .../rstudio/files/rstudio-1.2.1335-core.patch | 160 +++++++++
28 .../rstudio-1.2.1335-fix-ptr-int-compare.patch | 13 +
29 .../files/rstudio-1.2.1335-linker_flags.patch | 11 +
30 .../rstudio/files/rstudio-1.2.1335-pandoc.patch | 32 ++
31 .../rstudio/files/rstudio-1.2.1335-paths.patch | 118 +++++++
32 .../rstudio/files/rstudio-1.2.1335-prefs.patch | 53 +++
33 .../rstudio-1.2.1335-qtsingleapplication.patch | 60 ++++
34 ...io-1.1.463.ebuild => rstudio-1.1.463-r1.ebuild} | 16 +-
35 sci-mathematics/rstudio/rstudio-1.1.463.ebuild | 1 +
36 ...udio-1.1.463.ebuild => rstudio-1.2.1335.ebuild} | 38 +--
37 17 files changed, 804 insertions(+), 409 deletions(-)
38
39 diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest
40 index 79c6b60ad01..0b00d0f295a 100644
41 --- a/sci-mathematics/rstudio/Manifest
42 +++ b/sci-mathematics/rstudio/Manifest
43 @@ -1,13 +1,16 @@
44 DIST chromedriver-linux 19303552 BLAKE2B 610396fd74f2adc4c249ca971a53a6dd4ab06145d0b37d59adf66180dfada52192b20203bf3d992c270bd4f787df5c85511ca325aed06cbd9318add3eccfde30 SHA512 18774ede961dec222058dd0e3f128d63732cd444ee310136b44d5bf508a4f2f2c164a2c8d195d80bce8b5fb6303559e167f82f384e4a58e30f48b151a4206ee8
45 DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9
46 DIST gin-1.5.zip 1055663 BLAKE2B 11b86245d54967f0c76f22f7460fb752c410db3c59a019bb538a48fd0de7e87552f2f5bb9ce604e6ed508136a6a2b0814f061161579429daae8ca55b1a448114 SHA512 3f6649565f9600daaca6ddf3fb431925b5a1ce1ada38e6389de64cef617abba9d3f49c555d0a20053fb06f17ccbe4e1141b39966fbe4b2975d7b120377504897
47 +DIST gin-2.1.2.zip 1341053 BLAKE2B 515338ba50ba2183c101b42183e42ebf15613aae8751a0dcedb4b047de4ca8fab85eb240f5f0c92955441dbb87e80b3edbdae8d83f1e74f74c7de067d18cf108 SHA512 03407b6318ffb0dd504ce520649ed90e845f13fbdbd0bfb4d7e3b127842f1735093e39674077c3a04a11d434aefdc3a734652c3f85e8ab00ff37ae760ccb8dbb
48 DIST gwt-2.7.0.zip 108818328 BLAKE2B 9af969f3f2577be041fcfb58f228fab4b5479fa0da5ff054ab0a59cad751590a1b4ae8d7fabc8a50e3b0e5d7eb9b2896c485d929421f75e6a2f6513480438a31 SHA512 a1eed5cc25c888cf81d4f22b1f9494d5d8567b911f7aeb1d164a6359120543668280afe1a3ffc9ed87b139c7db67fbcaaabde2066e3279909d7cd6fc22eaf499
49 +DIST gwt-2.8.1.zip 95650299 BLAKE2B 3853d50d1346e313903b6f0c4b8405ce9e896e51652483e5c7e9d711daa213e1341c71765b4a3fb061b58f90d49420245963a0480db8b71fe7aed6cd43782c14 SHA512 feeb00cb0413c2703dfd6931f57ba669813bd65f814715f2c04dd6dc69e885a8048337272333d7504c48e9fa52cdab699f854ee13211228ab142a1f458ee33ae
50 DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3ad8f35fad73c585a3d4901c3287e6902277a9c7ca087854f3944bd85ff1b1d1f02869ece686b10f946e2f1cb1296c SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6
51 DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852
52 DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade
53 DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2
54 DIST rstudio-1.1.453.tar.gz 20200360 BLAKE2B 560b89e53b04356ecf9a02dd8a7e72ad8d6c30bf406fbe7e22a82cc6d33d40e84bececf5ecda9cf086360b2bd2fa64d6b33c2dd675ef5f605f9e825d7ca2dc84 SHA512 f2be0866f645007a6f80959109928820c89480057c3660d23e790591797d4f4c371733f49290dae9c81bfc2715821528e2a105e7a66d4d9ffbfc7ee2a596976c
55 DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17 SHA512 987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b
56 +DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c SHA512 90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde
57 DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779
58 DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018
59 DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c
60
61 diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
62 index aa3db25f3c0..a7a48572de3 100644
63 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
64 +++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch
65 @@ -1,4 +1,4 @@
66 ---- /dev/null 2018-11-10 15:32:26.332997437 +1100
67 +--- /dev/null 2019-03-19 11:03:33.121000004 +1100
68 +++ rstudio-1.1.463/src/cpp/core/include/core/BoostSignals.hpp 2018-11-17 21:24:35.285976284 +1100
69 @@ -0,0 +1,40 @@
70 +/*
71 @@ -458,223 +458,3 @@
72 };
73
74 ProjectContext& projectContext();
75 ---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp 2018-10-25 09:42:55.000000000 +1100
76 -+++ rstudio-1.1.463/src/cpp/session/modules/SessionPlots.hpp 2018-11-17 21:24:35.292976352 +1100
77 -@@ -16,7 +16,7 @@
78 - #ifndef SESSION_PLOTS_HPP
79 - #define SESSION_PLOTS_HPP
80 -
81 --#include <boost/signals.hpp>
82 -+#include <core/BoostSignals.hpp>
83 -
84 - namespace rstudio {
85 - namespace core {
86 -@@ -35,9 +35,9 @@
87 -
88 - struct Events : boost::noncopyable
89 - {
90 -- boost::signal<void()> onBeforeNewPlot;
91 -- boost::signal<void()> onBeforeNewGridPage;
92 -- boost::signal<void()> onNewPlot;
93 -+ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewPlot;
94 -+ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewGridPage;
95 -+ RSTUDIO_BOOST_SIGNAL<void()> onNewPlot;
96 - };
97 -
98 - Events& events();
99 ---- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-10-25 09:42:55.000000000 +1100
100 -+++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-11-17 21:24:35.293976361 +1100
101 -@@ -15,11 +15,11 @@
102 -
103 - #include "SessionSourceCpp.hpp"
104 -
105 --#include <boost/signal.hpp>
106 - #include <boost/algorithm/string/trim.hpp>
107 - #include <boost/algorithm/string/predicate.hpp>
108 - #include <boost/algorithm/string/join.hpp>
109 -
110 -+#include <core/BoostSignals.hpp>
111 - #include <core/Error.hpp>
112 - #include <core/FilePath.hpp>
113 - #include <core/StringUtils.hpp>
114 ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-10-25 09:42:55.000000000 +1100
115 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-11-17 21:24:35.294976371 +1100
116 -@@ -142,7 +142,7 @@
117 - LOG_ERROR(error);
118 -
119 - // capture console output, error
120 -- boost::signals::scoped_connection consoleHandler =
121 -+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
122 - module_context::events().onConsoleOutput.connect(
123 - boost::bind(chunkConsoleOutputHandler,
124 - _1,
125 -@@ -219,7 +219,7 @@
126 - LOG_ERROR(error);
127 -
128 - // capture console output, error
129 -- boost::signals::scoped_connection consoleHandler =
130 -+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
131 - module_context::events().onConsoleOutput.connect(
132 - boost::bind(chunkConsoleOutputHandler,
133 - _1,
134 -@@ -363,7 +363,7 @@
135 - LOG_ERROR(error);
136 -
137 - // capture console output, error
138 -- boost::signals::scoped_connection consoleHandler =
139 -+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
140 - module_context::events().onConsoleOutput.connect(
141 - boost::bind(chunkConsoleOutputHandler,
142 - _1,
143 ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-10-25 09:42:55.000000000 +1100
144 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-11-17 21:24:35.294976371 +1100
145 -@@ -16,6 +16,8 @@
146 - #include "SessionRmdNotebook.hpp"
147 - #include "NotebookCapture.hpp"
148 -
149 -+#include <boost/make_shared.hpp>
150 -+
151 - namespace rstudio {
152 - namespace session {
153 - namespace modules {
154 ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-10-25 09:42:55.000000000 +1100
155 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-11-17 21:24:35.295976381 +1100
156 -@@ -441,7 +441,7 @@
157 - }
158 -
159 - // unhook all our event handlers
160 -- BOOST_FOREACH(const boost::signals::connection connection, connections_)
161 -+ BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_)
162 - {
163 - connection.disconnect();
164 - }
165 ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-10-25 09:42:55.000000000 +1100
166 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-11-17 21:24:35.295976381 +1100
167 -@@ -18,8 +18,7 @@
168 -
169 - #include <session/SessionModuleContext.hpp>
170 -
171 --#include <boost/signal.hpp>
172 --
173 -+#include <core/BoostSignals.hpp>
174 - #include <core/json/Json.hpp>
175 -
176 - #include <r/RSexp.hpp>
177 -@@ -99,7 +98,7 @@
178 - bool hasErrors_;
179 -
180 - std::vector<boost::shared_ptr<NotebookCapture> > captures_;
181 -- std::vector<boost::signals::connection> connections_;
182 -+ std::vector<RSTUDIO_BOOST_CONNECTION> connections_;
183 - };
184 -
185 - } // namespace notebook
186 ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-10-25 09:42:55.000000000 +1100
187 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-11-17 21:24:35.295976381 +1100
188 -@@ -20,11 +20,12 @@
189 -
190 - #include <boost/format.hpp>
191 - #include <boost/foreach.hpp>
192 --#include <boost/signals/connection.hpp>
193 -
194 --#include <core/system/FileMonitor.hpp>
195 --#include <core/StringUtils.hpp>
196 -+#include <core/BoostSignals.hpp>
197 - #include <core/Exec.hpp>
198 -+#include <core/StringUtils.hpp>
199 -+
200 -+#include <core/system/FileMonitor.hpp>
201 -
202 - #include <session/SessionModuleContext.hpp>
203 -
204 ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-10-25 09:42:55.000000000 +1100
205 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-11-17 21:24:35.296976391 +1100
206 -@@ -18,8 +18,10 @@
207 - #define SESSION_NOTEBOOK_PLOTS_HPP
208 -
209 - #include <boost/function.hpp>
210 --#include <boost/signals/connection.hpp>
211 -+
212 -+#include <core/BoostSignals.hpp>
213 - #include <core/FilePath.hpp>
214 -+
215 - #include <r/RSexp.hpp>
216 -
217 - #include "NotebookCapture.hpp"
218 -@@ -80,9 +82,9 @@
219 -
220 - unsigned lastOrdinal_;
221 -
222 -- boost::signals::connection onBeforeNewPlot_;
223 -- boost::signals::connection onBeforeNewGridPage_;
224 -- boost::signals::connection onNewPlot_;
225 -+ RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_;
226 -+ RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_;
227 -+ RSTUDIO_BOOST_CONNECTION onNewPlot_;
228 -
229 - double width_;
230 - double height_;
231 ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-10-25 09:42:55.000000000 +1100
232 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-11-17 21:24:35.296976391 +1100
233 -@@ -87,7 +87,7 @@
234 - pInput_->enque(kThreadQuitCommand);
235 -
236 - // unregister handlers
237 -- BOOST_FOREACH(boost::signals::connection connection, handlers_)
238 -+ BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_)
239 - {
240 - connection.disconnect();
241 - }
242 -@@ -651,7 +651,7 @@
243 - boost::shared_ptr<ChunkExecContext> execContext_;
244 -
245 - // registered signal handlers
246 -- std::vector<boost::signals::connection> handlers_;
247 -+ std::vector<RSTUDIO_BOOST_CONNECTION> handlers_;
248 -
249 - // the thread which submits console input, and the queue which feeds it
250 - boost::thread console_;
251 ---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-10-25 09:42:55.000000000 +1100
252 -+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-11-17 21:24:35.296976391 +1100
253 -@@ -18,7 +18,8 @@
254 - #define SESSION_RMARKDOWN_NOTEBOOK_HPP
255 -
256 - #include <ctime>
257 --#include <boost/signals.hpp>
258 -+
259 -+#include <core/BoostSignals.hpp>
260 - #include <core/json/Json.hpp>
261 -
262 - #define kChunkLibDir "lib"
263 -@@ -76,24 +77,24 @@
264 - struct Events : boost::noncopyable
265 - {
266 - // Document {0}, chunk {1} from context id {3} execution completed
267 -- boost::signal<void(const std::string&, const std::string&,
268 -+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&,
269 - const std::string&)>
270 - onChunkExecCompleted;
271 -
272 - // Document {0}, chunk {1} had console output of type {2} and text {3}
273 -- boost::signal<void(const std::string&, const std::string&, int,
274 -+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, int,
275 - const std::string&)>
276 - onChunkConsoleOutput;
277 -
278 -- boost::signal<void(const core::FilePath&, const core::FilePath&,
279 -+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
280 - const core::json::Value& metadata, unsigned ordinal)>
281 - onPlotOutput;
282 -- boost::signal<void(const core::FilePath&, const core::FilePath&,
283 -+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
284 - const core::json::Value& metadata)> onHtmlOutput;
285 -- boost::signal<void(const core::json::Object&)> onErrorOutput;
286 -- boost::signal<void(const core::FilePath&, const core::FilePath&,
287 -+ RSTUDIO_BOOST_SIGNAL<void(const core::json::Object&)> onErrorOutput;
288 -+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
289 - const core::json::Value& metadata)> onDataOutput;
290 -- boost::signal<void(Condition condition, const std::string& message)>
291 -+ RSTUDIO_BOOST_SIGNAL<void(Condition condition, const std::string& message)>
292 - onCondition;
293 - };
294 -
295
296 diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
297 index 961723fd224..d90ce005a1a 100644
298 --- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
299 +++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
300 @@ -1,167 +1,220 @@
301 ---- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100
302 -+++ rstudio-1.1.463/src/cpp/CMakeLists.txt 2018-11-17 21:41:02.712507842 +1100
303 -@@ -175,6 +175,9 @@
304 - set(Boost_USE_STATIC_LIBS ON)
305 - set(BOOST_INCLUDEDIR ${RSTUDIO_TOOLS_BOOST}/include)
306 - find_package(Boost ${BOOST_VERSION} REQUIRED)
307 -+ if(NOT Boost_VERSION VERSION_LESS 1.69.0)
308 -+ list(REMOVE_ITEM BOOST_LIBS signals)
309 -+ endif()
310 -
311 - # define library list manually (find_package doesn't always pick them up)
312 - set(BOOST_LIB_DIR ${RSTUDIO_TOOLS_BOOST}/lib)
313 -@@ -184,11 +187,15 @@
314 - message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}")
315 - else()
316 - add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost)
317 -+ find_package(Boost ${BOOST_VERSION} REQUIRED)
318 -+ if(NOT Boost_VERSION VERSION_LESS 1.69.0)
319 -+ list(REMOVE_ITEM BOOST_LIBS signals)
320 -+ endif()
321 - find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS})
322 - message(STATUS "Using system Boost ${BOOST_VERSION}")
323 - endif()
324 -
325 -- # WIN32 BOOST
326 -+# WIN32 BOOST
327 - else()
328 - # hard-code to our own prebuilt boost libs
329 - add_definitions(-DRSTUDIO_BOOST_NAMESPACE=rstudio_boost)
330 -@@ -211,14 +218,14 @@
331 - # allow opt-in to using Boost.Signals2
332 - # TODO: remove this in RStudio v1.3 and port to signals2
333 - if(NOT RSTUDIO_BOOST_SIGNALS_VERSION)
334 -- if (BOOST_VERSION VERSION_LESS 1.69.0)
335 -+ if (Boost_VERSION VERSION_LESS 1.69.0)
336 - set(RSTUDIO_BOOST_SIGNALS_VERSION 1)
337 - else()
338 - set(RSTUDIO_BOOST_SIGNALS_VERSION 2)
339 - endif()
340 - endif()
341 -
342 --message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
343 -+message(STATUS "Using Boost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}")
344 - add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION})
345 -
346 - # add boost as system include directory
347 ---- rstudio-1.1.463-orig/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-10-25 09:42:55.000000000 +1100
348 -+++ rstudio-1.1.463/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-11-17 21:41:02.713507852 +1100
349 -@@ -75,9 +75,9 @@
350 - const std::string& name() const { return name_; }
351 - const boost::optional<std::string>& defaultValue() const { return defaultValue_; }
352 - boost::tribool hasDefault() const { return hasDefault_; }
353 -- bool isUsed() const { return isUsed_; }
354 -+ bool isUsed() const { return bool(isUsed_); }
355 - void setIsUsed(bool value) { isUsed_ = value; }
356 -- bool isMissingnessHandled() const { return isMissingnessHandled_; }
357 -+ bool isMissingnessHandled() const { return bool(isMissingnessHandled_); }
358 - void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; }
359 +--- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp 2018-10-25 09:42:55.000000000 +1100
360 ++++ rstudio-1.1.463/src/cpp/session/modules/SessionPlots.hpp 2018-11-17 21:24:35.292976352 +1100
361 +@@ -16,7 +16,7 @@
362 + #ifndef SESSION_PLOTS_HPP
363 + #define SESSION_PLOTS_HPP
364 +
365 +-#include <boost/signals.hpp>
366 ++#include <core/BoostSignals.hpp>
367 +
368 + namespace rstudio {
369 + namespace core {
370 +@@ -35,9 +35,9 @@
371 +
372 + struct Events : boost::noncopyable
373 + {
374 +- boost::signal<void()> onBeforeNewPlot;
375 +- boost::signal<void()> onBeforeNewGridPage;
376 +- boost::signal<void()> onNewPlot;
377 ++ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewPlot;
378 ++ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewGridPage;
379 ++ RSTUDIO_BOOST_SIGNAL<void()> onNewPlot;
380 + };
381 +
382 + Events& events();
383 +--- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-10-25 09:42:55.000000000 +1100
384 ++++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-11-17 21:24:35.293976361 +1100
385 +@@ -15,11 +15,11 @@
386 +
387 + #include "SessionSourceCpp.hpp"
388 +
389 +-#include <boost/signal.hpp>
390 + #include <boost/algorithm/string/trim.hpp>
391 + #include <boost/algorithm/string/predicate.hpp>
392 + #include <boost/algorithm/string/join.hpp>
393 +
394 ++#include <core/BoostSignals.hpp>
395 + #include <core/Error.hpp>
396 + #include <core/FilePath.hpp>
397 + #include <core/StringUtils.hpp>
398 +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-10-25 09:42:55.000000000 +1100
399 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-11-17 21:24:35.294976371 +1100
400 +@@ -142,7 +142,7 @@
401 + LOG_ERROR(error);
402
403 - private:
404 -@@ -130,7 +130,7 @@
405 + // capture console output, error
406 +- boost::signals::scoped_connection consoleHandler =
407 ++ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
408 + module_context::events().onConsoleOutput.connect(
409 + boost::bind(chunkConsoleOutputHandler,
410 + _1,
411 +@@ -219,7 +219,7 @@
412 + LOG_ERROR(error);
413
414 - bool isPrimitive()
415 - {
416 -- return isPrimitive_ == true;
417 -+ return bool(isPrimitive_);
418 - }
419 + // capture console output, error
420 +- boost::signals::scoped_connection consoleHandler =
421 ++ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
422 + module_context::events().onConsoleOutput.connect(
423 + boost::bind(chunkConsoleOutputHandler,
424 + _1,
425 +@@ -363,7 +363,7 @@
426 + LOG_ERROR(error);
427
428 - void setIsPrimitive(bool isPrimitive)
429 ---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp 2018-10-25 09:42:55.000000000 +1100
430 -+++ rstudio-1.1.463/src/cpp/session/modules/SessionRParser.cpp 2018-11-17 21:41:02.714507862 +1100
431 -@@ -390,7 +390,7 @@
432 - if (!failed)
433 + // capture console output, error
434 +- boost::signals::scoped_connection consoleHandler =
435 ++ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler =
436 + module_context::events().onConsoleOutput.connect(
437 + boost::bind(chunkConsoleOutputHandler,
438 + _1,
439 +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-10-25 09:42:55.000000000 +1100
440 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-11-17 21:24:35.294976371 +1100
441 +@@ -16,6 +16,8 @@
442 + #include "SessionRmdNotebook.hpp"
443 + #include "NotebookCapture.hpp"
444 +
445 ++#include <boost/make_shared.hpp>
446 ++
447 + namespace rstudio {
448 + namespace session {
449 + namespace modules {
450 +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-10-25 09:42:55.000000000 +1100
451 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-11-17 21:24:35.295976381 +1100
452 +@@ -441,7 +441,7 @@
453 + }
454 +
455 + // unhook all our event handlers
456 +- BOOST_FOREACH(const boost::signals::connection connection, connections_)
457 ++ BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_)
458 {
459 - DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding());
460 -- return fnInfo.performsNse();
461 -+ return bool(fnInfo.performsNse());
462 + connection.disconnect();
463 }
464 -
465 - // Handle some special cases first.
466 ---- rstudio-1.1.463-orig/src/tools/clang-ubsan-build 2018-10-25 09:42:55.000000000 +1100
467 -+++ rstudio-1.1.463/src/tools/clang-ubsan-build 2018-11-17 21:41:02.714507862 +1100
468 -@@ -10,19 +10,19 @@
469 -
470 - : ${RSTUDIO_USE_LIBCXX="Yes"}
471 - : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
472 --: ${RSTUDIO_BOOST_VERSION="1.56.0"}
473 -+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.56.0"}
474 -
475 - mkdir -p "${BUILD_DIR}"
476 - cd "${BUILD_DIR}"
477 --cmake ../cpp \
478 -- -DLIBR_HOME="${R_HOME}" \
479 -- -DCMAKE_C_COMPILER="${CC}" \
480 -- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
481 -- -DCMAKE_CXX_COMPILER="${CXX}" \
482 -- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
483 -- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
484 -- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
485 -- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \
486 -+cmake ../cpp \
487 -+ -DLIBR_HOME="${R_HOME}" \
488 -+ -DCMAKE_C_COMPILER="${CC}" \
489 -+ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
490 -+ -DCMAKE_CXX_COMPILER="${CXX}" \
491 -+ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
492 -+ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
493 -+ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
494 -+ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
495 - "$@"
496 - cd ..
497 -
498 ---- rstudio-1.1.463-orig/src/tools/gcc-ubsan-build 2018-10-25 09:42:55.000000000 +1100
499 -+++ rstudio-1.1.463/src/tools/gcc-ubsan-build 2018-11-17 21:41:02.715507871 +1100
500 -@@ -19,19 +19,19 @@
501 - # NOTE: Boost 1.50.0 not compatible with gcc-6
502 - : ${RSTUDIO_USE_LIBCXX="No"}
503 - : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"}
504 --: ${RSTUDIO_BOOST_VERSION="1.54.0"}
505 -+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.54.0"}
506 -
507 - mkdir -p "${BUILD_DIR}"
508 - cd "${BUILD_DIR}"
509 --cmake ../cpp \
510 -- -DLIBR_HOME="${R_HOME}" \
511 -- -DCMAKE_C_COMPILER="${CC}" \
512 -- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
513 -- -DCMAKE_CXX_COMPILER="${CXX}" \
514 -- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
515 -- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
516 -- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
517 -- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \
518 -+cmake ../cpp \
519 -+ -DLIBR_HOME="${R_HOME}" \
520 -+ -DCMAKE_C_COMPILER="${CC}" \
521 -+ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
522 -+ -DCMAKE_CXX_COMPILER="${CXX}" \
523 -+ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \
524 -+ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \
525 -+ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \
526 -+ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \
527 - "$@"
528 - cd ..
529 -
530 ---- rstudio-1.1.463-orig/src/tools/xcode-ubsan-build 2018-10-25 09:42:55.000000000 +1100
531 -+++ rstudio-1.1.463/src/tools/xcode-ubsan-build 2018-11-17 21:41:02.715507871 +1100
532 -@@ -15,13 +15,13 @@
533 - # sanitizers released with newer versions of clang)
534 - mkdir -p "${BUILD_DIR}"
535 - cd "${BUILD_DIR}"
536 --cmake ../cpp -GXcode \
537 -- -DLIBR_HOME="${R_HOME}" \
538 -- -DLIBR_INCLUDE_DIRS="${R_INCL}" \
539 -- -DLIBR_DOC_DIR="${R_DOCS}" \
540 -- -DRSTUDIO_USE_LIBCXX="Yes" \
541 -- -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
542 -- -DRSTUDIO_BOOST_VERSION="1.56.0" \
543 -+cmake ../cpp -GXcode \
544 -+ -DLIBR_HOME="${R_HOME}" \
545 -+ -DLIBR_INCLUDE_DIRS="${R_INCL}" \
546 -+ -DLIBR_DOC_DIR="${R_DOCS}" \
547 -+ -DRSTUDIO_USE_LIBCXX="Yes" \
548 -+ -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \
549 -+ -DRSTUDIO_BOOST_REQUESTED_VERSION="1.56.0" \
550 - "$@"
551 - cmake ../cpp -DLIBR_LIBRARIES="${R_LIBS}/libR.dylib"
552 - cd ..
553 +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-10-25 09:42:55.000000000 +1100
554 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-11-17 21:24:35.295976381 +1100
555 +@@ -18,8 +18,7 @@
556 +
557 + #include <session/SessionModuleContext.hpp>
558 +
559 +-#include <boost/signal.hpp>
560 +-
561 ++#include <core/BoostSignals.hpp>
562 + #include <core/json/Json.hpp>
563 +
564 + #include <r/RSexp.hpp>
565 +@@ -99,7 +98,7 @@
566 + bool hasErrors_;
567 +
568 + std::vector<boost::shared_ptr<NotebookCapture> > captures_;
569 +- std::vector<boost::signals::connection> connections_;
570 ++ std::vector<RSTUDIO_BOOST_CONNECTION> connections_;
571 + };
572 +
573 + } // namespace notebook
574 +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-10-25 09:42:55.000000000 +1100
575 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-11-17 21:24:35.295976381 +1100
576 +@@ -20,11 +20,12 @@
577 +
578 + #include <boost/format.hpp>
579 + #include <boost/foreach.hpp>
580 +-#include <boost/signals/connection.hpp>
581 +
582 +-#include <core/system/FileMonitor.hpp>
583 +-#include <core/StringUtils.hpp>
584 ++#include <core/BoostSignals.hpp>
585 + #include <core/Exec.hpp>
586 ++#include <core/StringUtils.hpp>
587 ++
588 ++#include <core/system/FileMonitor.hpp>
589 +
590 + #include <session/SessionModuleContext.hpp>
591 +
592 +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-10-25 09:42:55.000000000 +1100
593 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-11-17 21:24:35.296976391 +1100
594 +@@ -18,8 +18,10 @@
595 + #define SESSION_NOTEBOOK_PLOTS_HPP
596 +
597 + #include <boost/function.hpp>
598 +-#include <boost/signals/connection.hpp>
599 ++
600 ++#include <core/BoostSignals.hpp>
601 + #include <core/FilePath.hpp>
602 ++
603 + #include <r/RSexp.hpp>
604 +
605 + #include "NotebookCapture.hpp"
606 +@@ -80,9 +82,9 @@
607 +
608 + unsigned lastOrdinal_;
609 +
610 +- boost::signals::connection onBeforeNewPlot_;
611 +- boost::signals::connection onBeforeNewGridPage_;
612 +- boost::signals::connection onNewPlot_;
613 ++ RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_;
614 ++ RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_;
615 ++ RSTUDIO_BOOST_CONNECTION onNewPlot_;
616 +
617 + double width_;
618 + double height_;
619 +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-10-25 09:42:55.000000000 +1100
620 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-11-17 21:24:35.296976391 +1100
621 +@@ -87,7 +87,7 @@
622 + pInput_->enque(kThreadQuitCommand);
623 +
624 + // unregister handlers
625 +- BOOST_FOREACH(boost::signals::connection connection, handlers_)
626 ++ BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_)
627 + {
628 + connection.disconnect();
629 + }
630 +@@ -651,7 +651,7 @@
631 + boost::shared_ptr<ChunkExecContext> execContext_;
632 +
633 + // registered signal handlers
634 +- std::vector<boost::signals::connection> handlers_;
635 ++ std::vector<RSTUDIO_BOOST_CONNECTION> handlers_;
636 +
637 + // the thread which submits console input, and the queue which feeds it
638 + boost::thread console_;
639 +--- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-10-25 09:42:55.000000000 +1100
640 ++++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-11-17 21:24:35.296976391 +1100
641 +@@ -18,7 +18,8 @@
642 + #define SESSION_RMARKDOWN_NOTEBOOK_HPP
643 +
644 + #include <ctime>
645 +-#include <boost/signals.hpp>
646 ++
647 ++#include <core/BoostSignals.hpp>
648 + #include <core/json/Json.hpp>
649 +
650 + #define kChunkLibDir "lib"
651 +@@ -76,24 +77,24 @@
652 + struct Events : boost::noncopyable
653 + {
654 + // Document {0}, chunk {1} from context id {3} execution completed
655 +- boost::signal<void(const std::string&, const std::string&,
656 ++ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&,
657 + const std::string&)>
658 + onChunkExecCompleted;
659 +
660 + // Document {0}, chunk {1} had console output of type {2} and text {3}
661 +- boost::signal<void(const std::string&, const std::string&, int,
662 ++ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, int,
663 + const std::string&)>
664 + onChunkConsoleOutput;
665 +
666 +- boost::signal<void(const core::FilePath&, const core::FilePath&,
667 ++ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
668 + const core::json::Value& metadata, unsigned ordinal)>
669 + onPlotOutput;
670 +- boost::signal<void(const core::FilePath&, const core::FilePath&,
671 ++ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
672 + const core::json::Value& metadata)> onHtmlOutput;
673 +- boost::signal<void(const core::json::Object&)> onErrorOutput;
674 +- boost::signal<void(const core::FilePath&, const core::FilePath&,
675 ++ RSTUDIO_BOOST_SIGNAL<void(const core::json::Object&)> onErrorOutput;
676 ++ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&,
677 + const core::json::Value& metadata)> onDataOutput;
678 +- boost::signal<void(Condition condition, const std::string& message)>
679 ++ RSTUDIO_BOOST_SIGNAL<void(Condition condition, const std::string& message)>
680 + onCondition;
681 + };
682 +
683
684 diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch
685 similarity index 100%
686 copy from sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch
687 copy to sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch
688
689 diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch
690 new file mode 100644
691 index 00000000000..320b823355a
692 --- /dev/null
693 +++ b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch
694 @@ -0,0 +1,46 @@
695 +--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2018-10-25 09:42:55.000000000 +1100
696 ++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-30 20:14:40.634057634 +1100
697 +@@ -296,7 +296,11 @@
698 + */
699 + timer_ptr set_timer(long duration, timer_handler callback) {
700 + timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
701 ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
702 ++ *m_io_service,
703 ++#else
704 + lib::ref(*m_io_service),
705 ++#endif
706 + boost::posix_time::milliseconds(duration)
707 + );
708 +
709 +--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2018-10-25 09:42:55.000000000 +1100
710 ++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-30 20:14:36.319021594 +1100
711 +@@ -184,7 +184,12 @@
712 + m_io_service = ptr;
713 + m_external_io_service = true;
714 + m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
715 +- lib::ref(*m_io_service));
716 ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
717 ++ *m_io_service
718 ++#else
719 ++ lib::ref(*m_io_service)
720 ++#endif
721 ++ );
722 +
723 + m_state = READY;
724 + ec = lib::error_code();
725 +--- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2018-10-25 09:42:55.000000000 +1100
726 ++++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-30 20:15:22.353406097 +1100
727 +@@ -167,7 +167,12 @@
728 + }
729 +
730 + m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
731 +- lib::ref(*service));
732 ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
733 ++ *service
734 ++#else
735 ++ lib::ref(*service)
736 ++#endif
737 ++ );
738 +
739 + m_state = READY;
740 +
741
742 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
743 new file mode 100644
744 index 00000000000..1ec458bb869
745 --- /dev/null
746 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p1.patch
747 @@ -0,0 +1,46 @@
748 +--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-28 16:08:20.000000000 +1100
749 ++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-08-20 22:38:53.808923305 +1000
750 +@@ -296,7 +296,11 @@
751 + */
752 + timer_ptr set_timer(long duration, timer_handler callback) {
753 + timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>(
754 ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
755 ++ *m_io_service,
756 ++#else
757 + lib::ref(*m_io_service),
758 ++#endif
759 + boost::posix_time::milliseconds(duration)
760 + );
761 +
762 +--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-28 16:08:20.000000000 +1100
763 ++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-08-20 22:38:53.822923358 +1000
764 +@@ -184,7 +184,12 @@
765 + m_io_service = ptr;
766 + m_external_io_service = true;
767 + m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>(
768 +- lib::ref(*m_io_service));
769 ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
770 ++ *m_io_service
771 ++#else
772 ++ lib::ref(*m_io_service)
773 ++#endif
774 ++ );
775 +
776 + m_state = READY;
777 + ec = lib::error_code();
778 +--- rstudio-1.2.1335-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-28 16:08:20.000000000 +1100
779 ++++ rstudio-1.2.1335/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-08-20 22:38:53.823923362 +1000
780 +@@ -167,7 +167,12 @@
781 + }
782 +
783 + m_socket = lib::make_shared<boost::asio::ip::tcp::socket>(
784 +- lib::ref(*service));
785 ++#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000
786 ++ *service
787 ++#else
788 ++ lib::ref(*service)
789 ++#endif
790 ++ );
791 +
792 + m_state = READY;
793 +
794
795 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
796 new file mode 100644
797 index 00000000000..eed2c5c955c
798 --- /dev/null
799 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.70.0_p2.patch
800 @@ -0,0 +1,17 @@
801 +--- rstudio-1.2.1335-orig/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-03-28 16:08:20.000000000 +1100
802 ++++ rstudio-1.2.1335/src/cpp/core/include/core/http/TcpIpAsyncConnector.hpp 2019-04-09 22:08:45.331273559 +1000
803 +@@ -77,7 +77,13 @@
804 + {
805 + // start a timer that will cancel any outstanding asynchronous operations
806 + // when it elapses if the connection operation has not succeeded
807 +- pConnectionTimer_.reset(new boost::asio::deadline_timer(resolver_.get_io_service(), timeout));
808 ++ pConnectionTimer_.reset(new boost::asio::deadline_timer(
809 ++#if BOOST_VERSION >= 107000
810 ++ resolver_.get_executor(),
811 ++#else
812 ++ resolver_.get_io_service(),
813 ++#endif
814 ++ timeout));
815 + pConnectionTimer_->async_wait(boost::bind(&TcpIpAsyncConnector::onConnectionTimeout,
816 + TcpIpAsyncConnector::shared_from_this(),
817 + boost::asio::placeholders::error));
818
819 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
820 new file mode 100644
821 index 00000000000..2c4374bb804
822 --- /dev/null
823 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-core.patch
824 @@ -0,0 +1,160 @@
825 +--- rstudio-1.2.1335-orig/src/cpp/session/SessionClientInit.cpp 2019-03-28 16:08:20.000000000 +1100
826 ++++ rstudio-1.2.1335/src/cpp/session/SessionClientInit.cpp 2019-04-09 18:15:37.746363789 +1000
827 +@@ -87,13 +87,13 @@
828 + boost::shared_ptr<http::Cookie>* pCookie)
829 + {
830 + // extract the base URL
831 +- json::JsonRpcRequest request;
832 ++ core::json::JsonRpcRequest request;
833 + Error error = parseJsonRpcRequest(ptrConnection->request().body(), &request);
834 + if (error)
835 + return error;
836 + std::string baseURL;
837 +
838 +- error = json::readParams(request.params, &baseURL);
839 ++ error = core::json::readParams(request.params, &baseURL);
840 + if (error)
841 + return error;
842 +
843 +@@ -161,7 +161,7 @@
844 + }
845 +
846 + // prepare session info
847 +- json::Object sessionInfo ;
848 ++ core::json::Object sessionInfo ;
849 + sessionInfo["clientId"] = clientId;
850 + sessionInfo["mode"] = options.programMode();
851 +
852 +@@ -175,8 +175,8 @@
853 + }
854 +
855 + // temp dir
856 +- FilePath tempDir = rstudio::r::session::utils::tempDir();
857 +- Error error = tempDir.ensureDirectory();
858 ++ core::FilePath tempDir = rstudio::r::session::utils::tempDir();
859 ++ core::Error error = tempDir.ensureDirectory();
860 + if (error)
861 + LOG_ERROR(error);
862 + sessionInfo["temp_dir"] = tempDir.absolutePath();
863 +@@ -194,12 +194,12 @@
864 + sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt");
865 +
866 + // client state
867 +- json::Object clientStateObject;
868 ++ core::json::Object clientStateObject;
869 + rstudio::r::session::clientState().currentState(&clientStateObject);
870 + sessionInfo["client_state"] = clientStateObject;
871 +
872 + // source documents
873 +- json::Array jsonDocs;
874 ++ core::json::Array jsonDocs;
875 + error = modules::source::clientInitDocuments(&jsonDocs);
876 + if (error)
877 + LOG_ERROR(error);
878 +@@ -224,7 +224,7 @@
879 + if (resumed)
880 + {
881 + // console actions
882 +- json::Object actionsObject;
883 ++ core::json::Object actionsObject;
884 + consoleActions.asJson(&actionsObject);
885 + sessionInfo["console_actions"] = actionsObject;
886 + }
887 +@@ -290,12 +290,12 @@
888 + }
889 + else
890 + {
891 +- sessionInfo["active_project_file"] = json::Value();
892 +- sessionInfo["project_ui_prefs"] = json::Value();
893 +- sessionInfo["project_open_docs"] = json::Value();
894 ++ sessionInfo["active_project_file"] = core::json::Value();
895 ++ sessionInfo["project_ui_prefs"] = core::json::Value();
896 ++ sessionInfo["project_open_docs"] = core::json::Value();
897 + sessionInfo["project_supports_sharing"] = false;
898 + sessionInfo["project_owned_by_user"] = false;
899 +- sessionInfo["project_user_data_directory"] = json::Value();
900 ++ sessionInfo["project_user_data_directory"] = core::json::Value();
901 + }
902 +
903 + sessionInfo["system_encoding"] = std::string(::locale2charset(NULL));
904 +@@ -332,20 +332,20 @@
905 + sessionInfo["build_tools_bookdown_website"] =
906 + module_context::isBookdownWebsite();
907 +
908 +- FilePath buildTargetDir = projects::projectContext().buildTargetPath();
909 ++ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath();
910 + if (!buildTargetDir.empty())
911 + {
912 + sessionInfo["build_target_dir"] = module_context::createAliasedPath(
913 + buildTargetDir);
914 +- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) &&
915 ++ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) &&
916 + buildTargetDir.childPath("src").exists();
917 + sessionInfo["has_pkg_vig"] =
918 +- (type == r_util::kBuildTypePackage) &&
919 ++ (type == core::r_util::kBuildTypePackage) &&
920 + buildTargetDir.childPath("vignettes").exists();
921 + }
922 + else
923 + {
924 +- sessionInfo["build_target_dir"] = json::Value();
925 ++ sessionInfo["build_target_dir"] = core::json::Value();
926 + sessionInfo["has_pkg_src"] = false;
927 + sessionInfo["has_pkg_vig"] = false;
928 + }
929 +@@ -353,9 +353,9 @@
930 + }
931 + else
932 + {
933 +- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone;
934 ++ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone;
935 + sessionInfo["build_tools_bookdown_website"] = false;
936 +- sessionInfo["build_target_dir"] = json::Value();
937 ++ sessionInfo["build_target_dir"] = core::json::Value();
938 + sessionInfo["has_pkg_src"] = false;
939 + sessionInfo["has_pkg_vig"] = false;
940 + }
941 +@@ -364,7 +364,7 @@
942 + sessionInfo["presentation_commands"] = options.allowPresentationCommands();
943 +
944 + sessionInfo["tutorial_api_available"] = false;
945 +- sessionInfo["tutorial_api_client_origin"] = json::Value();
946 ++ sessionInfo["tutorial_api_client_origin"] = core::json::Value();
947 +
948 + sessionInfo["build_state"] = modules::build::buildStateAsJson();
949 + sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled();
950 +@@ -375,7 +375,7 @@
951 +
952 + // console history -- we do this at the end because
953 + // restoreBuildRestartContext may have reset it
954 +- json::Array historyArray;
955 ++ core::json::Array historyArray;
956 + rstudio::r::session::consoleHistory().asJson(&historyArray);
957 + sessionInfo["console_history"] = historyArray;
958 + sessionInfo["console_history_capacity"] =
959 +@@ -447,14 +447,14 @@
960 +
961 + sessionInfo["multi_session"] = options.multiSession();
962 +
963 +- json::Object rVersionsJson;
964 ++ core::json::Object rVersionsJson;
965 + rVersionsJson["r_version"] = module_context::rVersion();
966 + rVersionsJson["r_version_label"] = module_context::rVersionLabel();
967 + rVersionsJson["r_home_dir"] = module_context::rHomeDir();
968 + sessionInfo["r_versions_info"] = rVersionsJson;
969 +
970 + sessionInfo["show_user_home_page"] = options.showUserHomePage();
971 +- sessionInfo["user_home_page_url"] = json::Value();
972 ++ sessionInfo["user_home_page_url"] = core::json::Value();
973 +
974 + sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson();
975 + sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload();
976 +@@ -491,7 +491,7 @@
977 +
978 + // create response (we always set kEventsPending to false so that the client
979 + // won't poll for events until it is ready)
980 +- json::JsonRpcResponse jsonRpcResponse;
981 ++ core::json::JsonRpcResponse jsonRpcResponse;
982 + jsonRpcResponse.setField(kEventsPending, "false");
983 + jsonRpcResponse.setResult(sessionInfo);
984 +
985
986 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch
987 new file mode 100644
988 index 00000000000..e38f5e0c444
989 --- /dev/null
990 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch
991 @@ -0,0 +1,13 @@
992 +--- rstudio-1.2.1335-orig/src/cpp/server_core/SecureKeyFile.cpp 2019-03-28 16:08:20.000000000 +1100
993 ++++ rstudio-1.2.1335/src/cpp/server_core/SecureKeyFile.cpp 2019-04-09 20:47:57.943317208 +1000
994 +@@ -68,8 +68,8 @@
995 + return error;
996 +
997 + // change mode it so it is only readable and writeable by this user
998 +- if (changeFileMode(secureKeyPath,
999 +- core::system::UserReadWriteMode) < 0)
1000 ++ if (!!changeFileMode(secureKeyPath,
1001 ++ core::system::UserReadWriteMode))
1002 + {
1003 + return systemError(errno, ERROR_LOCATION);
1004 + }
1005
1006 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch
1007 new file mode 100644
1008 index 00000000000..e07ead68969
1009 --- /dev/null
1010 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-linker_flags.patch
1011 @@ -0,0 +1,11 @@
1012 +--- rstudio-1.2.1335-orig/src/cpp/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
1013 ++++ rstudio-1.2.1335/src/cpp/CMakeLists.txt 2019-04-09 17:58:59.926559001 +1000
1014 +@@ -117,7 +117,7 @@
1015 + add_definitions(-O0)
1016 + add_definitions(-D_GLIBCXX_ASSERTIONS)
1017 + endif()
1018 +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie -Wl,-z,relro,-z,now")
1019 ++ set(CMAKE_EXE_LINKER_FLAGS "-pie -Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}")
1020 + endif()
1021 +
1022 + # other useful gcc diagnostics
1023
1024 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch
1025 new file mode 100644
1026 index 00000000000..e2fe83867bc
1027 --- /dev/null
1028 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch
1029 @@ -0,0 +1,32 @@
1030 +--- rstudio-1.2.1335-orig/src/cpp/session/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
1031 ++++ rstudio-1.2.1335/src/cpp/session/CMakeLists.txt 2019-04-09 17:22:59.210201624 +1000
1032 +@@ -25,9 +25,6 @@
1033 + if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26")
1034 + message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)")
1035 + endif()
1036 +-if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc")
1037 +- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)")
1038 +-endif()
1039 +
1040 + # we often install embedded versions of these packages but don't do so currently
1041 +
1042 +@@ -479,19 +476,6 @@
1043 + install(DIRECTORY "resources/connections"
1044 + DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources)
1045 +
1046 +-# install pandoc
1047 +-if(WIN32)
1048 +- set(PANDOC_VERSION "2.6" CACHE INTERNAL "Pandoc version")
1049 +-else()
1050 +- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version")
1051 +-endif()
1052 +-
1053 +-set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}")
1054 +-file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*")
1055 +-install(FILES ${PANDOC_FILES}
1056 +- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
1057 +- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc)
1058 +-
1059 + # install rmarkdown package
1060 + # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz")
1061 + # install(FILES ${RMARKDOWN_PACKAGE}
1062
1063 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch
1064 new file mode 100644
1065 index 00000000000..ba66ef9f0ea
1066 --- /dev/null
1067 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch
1068 @@ -0,0 +1,118 @@
1069 +--- rstudio-1.2.1335-orig/CMakeGlobals.txt 2019-03-28 16:08:20.000000000 +1100
1070 ++++ rstudio-1.2.1335/CMakeGlobals.txt 2019-04-09 17:10:07.680657631 +1000
1071 +@@ -161,7 +161,7 @@
1072 + set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources)
1073 + else()
1074 + set(RSTUDIO_INSTALL_BIN bin)
1075 +- set(RSTUDIO_INSTALL_SUPPORTING .)
1076 ++ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE})
1077 + endif()
1078 +
1079 + # if the install prefix is /usr/local then tweak as appropriate
1080 +--- rstudio-1.2.1335-orig/src/cpp/server/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
1081 ++++ rstudio-1.2.1335/src/cpp/server/CMakeLists.txt 2019-04-09 16:54:34.740739744 +1000
1082 +@@ -194,7 +194,7 @@
1083 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in
1084 + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT})
1085 + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}
1086 +- DESTINATION ${RSERVER_INITD_DEBIAN_DIR})
1087 ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR})
1088 +
1089 + # install configured redhat init.d script
1090 + set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat")
1091 +@@ -202,7 +202,7 @@
1092 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in
1093 + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT})
1094 + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}
1095 +- DESTINATION ${RSERVER_INITD_REDHAT_DIR})
1096 ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR})
1097 +
1098 + # install configured suse init.d script
1099 + set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse")
1100 +@@ -210,13 +210,13 @@
1101 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in
1102 + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT})
1103 + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}
1104 +- DESTINATION ${RSERVER_INITD_SUSE_DIR})
1105 ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR})
1106 +
1107 + # install pam profile
1108 + set(RSERVER_PAM_DIR "extras/pam")
1109 + set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio")
1110 + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE}
1111 +- DESTINATION ${RSERVER_PAM_DIR})
1112 ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR})
1113 +
1114 + # install configured upstart profile
1115 + set(RSERVER_UPSTART_DIR "extras/upstart")
1116 +@@ -224,12 +224,12 @@
1117 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in
1118 + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE})
1119 + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}
1120 +- DESTINATION ${RSERVER_UPSTART_DIR})
1121 ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
1122 + set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf")
1123 + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in
1124 + ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT})
1125 + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}
1126 +- DESTINATION ${RSERVER_UPSTART_DIR})
1127 ++ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR})
1128 +
1129 + # install configured systemd profile
1130 + set(RSERVER_SYSTEMD_DIR "extras/systemd")
1131 +--- rstudio-1.2.1335-orig/src/cpp/server/ServerOptions.cpp 2019-03-28 16:08:20.000000000 +1100
1132 ++++ rstudio-1.2.1335/src/cpp/server/ServerOptions.cpp 2019-04-09 16:54:34.740739744 +1000
1133 +@@ -389,8 +389,8 @@
1134 +
1135 + // convert relative paths by completing from the system installation
1136 + // path (this allows us to be relocatable)
1137 +- resolvePath(resourcePath, &wwwLocalPath_);
1138 +- resolvePath(resourcePath, &wwwSymbolMapsPath_);
1139 ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_);
1140 ++ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
1141 + resolvePath(binaryPath, &authPamHelperPath_);
1142 + resolvePath(binaryPath, &rsessionPath_);
1143 + resolvePath(binaryPath, &rldpathPath_);
1144 +--- rstudio-1.2.1335-orig/src/cpp/session/SessionOptions.cpp 2019-03-28 16:08:20.000000000 +1100
1145 ++++ rstudio-1.2.1335/src/cpp/session/SessionOptions.cpp 2019-04-09 17:17:06.035206050 +1000
1146 +@@ -53,7 +53,7 @@
1147 + namespace session {
1148 +
1149 + namespace {
1150 +-const char* const kDefaultPandocPath = "bin/pandoc";
1151 ++const char* const kDefaultPandocPath = "bin";
1152 + const char* const kDefaultPostbackPath = "bin/postback/rpostback";
1153 + const char* const kDefaultRsclangPath = "bin/rsclang";
1154 +
1155 +@@ -569,14 +569,14 @@
1156 + }
1157 +
1158 + // convert relative paths by completing from the app resource path
1159 +- resolvePath(resourcePath_, &rResourcesPath_);
1160 +- resolvePath(resourcePath_, &agreementFilePath_);
1161 +- resolvePath(resourcePath_, &wwwLocalPath_);
1162 +- resolvePath(resourcePath_, &wwwSymbolMapsPath_);
1163 +- resolvePath(resourcePath_, &coreRSourcePath_);
1164 +- resolvePath(resourcePath_, &modulesRSourcePath_);
1165 +- resolvePath(resourcePath_, &sessionLibraryPath_);
1166 +- resolvePath(resourcePath_, &sessionPackageArchivesPath_);
1167 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_);
1168 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_);
1169 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_);
1170 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_);
1171 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_);
1172 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_);
1173 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_);
1174 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_);
1175 + resolvePostbackPath(resourcePath_, &rpostbackPath_);
1176 + #ifdef _WIN32
1177 + resolvePath(resourcePath_, &consoleIoPath_);
1178 +@@ -601,7 +601,7 @@
1179 + }
1180 + winptyPath_ = pty.complete(completion).absolutePath();
1181 + #endif // _WIN32
1182 +- resolvePath(resourcePath_, &hunspellDictionariesPath_);
1183 ++ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_);
1184 + resolvePath(resourcePath_, &mathjaxPath_);
1185 + resolvePath(resourcePath_, &libclangHeadersPath_);
1186 + resolvePandocPath(resourcePath_, &pandocPath_);
1187
1188 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch
1189 new file mode 100644
1190 index 00000000000..e72df553eeb
1191 --- /dev/null
1192 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch
1193 @@ -0,0 +1,53 @@
1194 +--- rstudio-1.2.1335-orig/src/gwt/build.xml 2019-03-28 16:08:20.000000000 +1100
1195 ++++ rstudio-1.2.1335/src/gwt/build.xml 2019-04-09 16:44:15.089471934 +1000
1196 +@@ -34,6 +34,7 @@
1197 + <property name="gwt.extra.args" value=""/>
1198 + <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/>
1199 + <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/>
1200 ++ <property environment="env"/>
1201 +
1202 + <path id="project.class.path">
1203 + <pathelement location="${build.dir}"/>
1204 +@@ -112,8 +113,10 @@
1205 + <pathelement location="${src.dir}"/>
1206 + <path refid="project.class.path"/>
1207 + </classpath>
1208 ++ <jvmarg value="-Duser.home=${env.T}"/>
1209 + <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError -->
1210 + <jvmarg value="-Xmx1536M"/>
1211 ++ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/>
1212 + <arg value="-war"/>
1213 + <arg value="${www.dir}"/>
1214 + <arg value="-localWorkers"/>
1215 +@@ -154,6 +157,7 @@
1216 + <pathelement location="${src.dir}"/>
1217 + <path refid="project.class.path"/>
1218 + </classpath>
1219 ++ <jvmarg value="-Duser.home=${env.T}"/>
1220 + <jvmarg value="-Xmx2048M"/>
1221 + <arg value="-style"/>
1222 + <arg value="PRETTY"/>
1223 +@@ -176,6 +180,7 @@
1224 + <pathelement location="src"/>
1225 + <path refid="project.class.path"/>
1226 + </classpath>
1227 ++ <jvmarg value="-Duser.home=${env.T}"/>
1228 + <jvmarg value="-Xmx2048M"/>
1229 + <arg value="-style"/>
1230 + <arg value="PRETTY"/>
1231 +@@ -202,6 +207,7 @@
1232 + <pathelement location="src"/>
1233 + <path refid="project.class.path"/>
1234 + </classpath>
1235 ++ <jvmarg value="-Duser.home=${env.T}"/>
1236 + <jvmarg value="-Xmx2048M"/>
1237 + <arg value="-src"/>
1238 + <arg value = "src"/>
1239 +@@ -237,6 +243,7 @@
1240 + <pathelement location="${test.dir}"/>
1241 + <pathelement location="${src.dir}"/>
1242 + </classpath>
1243 ++ <jvmarg value="-Duser.home=${env.T}"/>
1244 + <classpath refid="project.class.path"/>
1245 + <classpath refid="unittest.class.path"/>
1246 + <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/>
1247
1248 diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
1249 new file mode 100644
1250 index 00000000000..a59fa02f1d2
1251 --- /dev/null
1252 +++ b/sci-mathematics/rstudio/files/rstudio-1.2.1335-qtsingleapplication.patch
1253 @@ -0,0 +1,60 @@
1254 +--- rstudio-1.2.1335-orig/src/cpp/desktop/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100
1255 ++++ rstudio-1.2.1335/src/cpp/desktop/CMakeLists.txt 2019-04-09 18:04:57.783616412 +1000
1256 +@@ -140,6 +140,13 @@
1257 + get_filename_component(QT_LIBRARY_PATH "${QT_BIN_DIR}/../lib" ABSOLUTE CACHE)
1258 + get_filename_component(QT_INSTALL_PATH "${QT_BIN_DIR}/.." ABSOLUTE CACHE)
1259 +
1260 ++find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication
1261 ++ PATH_SUFFIXES QtSolutions
1262 ++ PATHS
1263 ++ /usr/include/qt5)
1264 ++find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6
1265 ++ libQt5Solutions_SingleApplication-2.6)
1266 ++
1267 + # disable clang warnings for qt sources
1268 + if(APPLE)
1269 + add_definitions(-Wno-unused-private-field
1270 +@@ -158,7 +165,6 @@
1271 +
1272 + set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
1273 + list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
1274 +- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
1275 + ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
1276 + ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
1277 + ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
1278 +@@ -224,8 +230,6 @@
1279 + DesktopSlotBinders.cpp
1280 + DesktopSubMenu.cpp
1281 + DesktopSynctex.cpp
1282 +- 3rdparty/qtsingleapplication/qtsingleapplication.cpp
1283 +- 3rdparty/qtsingleapplication/qtlocalpeer.cpp
1284 + )
1285 +
1286 + if(WIN32)
1287 +@@ -280,6 +284,7 @@
1288 + ${CORE_SOURCE_DIR}/include
1289 + ${CMAKE_CURRENT_SOURCE_DIR}
1290 + ${CMAKE_CURRENT_BINARY_DIR}
1291 ++ ${QTSINGLEAPPLIB_INCLUDE_DIR}
1292 + ${TESTS_INCLUDE_DIR}
1293 + )
1294 +
1295 +@@ -384,6 +389,7 @@
1296 + # set link dependencies
1297 + target_link_libraries(rstudio
1298 + ${RSTUDIO_QTMODULES}
1299 ++ ${QTSINGLEAPPLIB}
1300 + ${QT_LIBRARIES}
1301 + ${Boost_LIBRARIES}
1302 + rstudio-core
1303 +--- rstudio-1.2.1335-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2019-03-28 16:08:20.000000000 +1100
1304 ++++ rstudio-1.2.1335/src/cpp/desktop/DesktopPosixApplication.hpp 2019-04-09 18:01:39.333920927 +1000
1305 +@@ -16,7 +16,7 @@
1306 + #ifndef DESKTOP_POSIX_APPLICATION_HPP
1307 + #define DESKTOP_POSIX_APPLICATION_HPP
1308 +
1309 +-#include "3rdparty/qtsingleapplication/QtSingleApplication"
1310 ++#include <QtSingleApplication>
1311 +
1312 + #include "DesktopApplicationLaunch.hpp"
1313 +
1314
1315 diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
1316 similarity index 95%
1317 copy from sci-mathematics/rstudio/rstudio-1.1.463.ebuild
1318 copy to sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
1319 index 271588e60b8..86b6db8da4b 100644
1320 --- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
1321 +++ b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild
1322 @@ -1,9 +1,9 @@
1323 # Copyright 1999-2019 Gentoo Authors
1324 # Distributed under the terms of the GNU General Public License v2
1325
1326 -EAPI=6
1327 +EAPI=7
1328
1329 -inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
1330 +inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils
1331
1332 # TODO
1333 # * package gin and gwt
1334 @@ -53,7 +53,7 @@ RDEPEND="
1335 >=app-text/pandoc-${PANDOC_VER}
1336 dev-haskell/pandoc-citeproc
1337 >=dev-lang/R-2.11.1
1338 - <dev-libs/boost-1.70:=
1339 + >=dev-libs/boost-1.63:=
1340 >=dev-libs/mathjax-2.7.4
1341 sys-apps/util-linux
1342 >=sys-devel/clang-3.5.0:*
1343 @@ -101,7 +101,9 @@ PATCHES=(
1344 "${FILESDIR}/${PN}-1.1.453-core.patch"
1345 "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
1346 "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
1347 + "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch"
1348 "${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
1349 + "${FILESDIR}/${PN}-1.1.463-boost-1.70.0.patch"
1350 )
1351
1352 src_unpack() {
1353 @@ -193,9 +195,9 @@ src_prepare() {
1354 }
1355
1356 src_configure() {
1357 - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
1358 - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
1359 - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
1360 + export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
1361 + export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
1362 + export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
1363
1364 local mycmakeargs=(
1365 -DDISTRO_SHARE=share/${PN}
1366 @@ -218,7 +220,7 @@ src_compile() {
1367 src_install() {
1368 export ANT_OPTS="-Duser.home=${T}"
1369 cmake-utils_src_install
1370 - pax-mark m "${ED}usr/bin/rstudio"
1371 + pax-mark m "${ED}/usr/bin/rstudio"
1372 doconfd "${FILESDIR}"/rstudio-server.conf
1373 dodir /etc/rstudio
1374 insinto /etc/rstudio
1375
1376 diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
1377 index 271588e60b8..5c0511bb9a5 100644
1378 --- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
1379 +++ b/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
1380 @@ -101,6 +101,7 @@ PATCHES=(
1381 "${FILESDIR}/${PN}-1.1.453-core.patch"
1382 "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
1383 "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
1384 + "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch"
1385 "${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
1386 )
1387
1388
1389 diff --git a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
1390 similarity index 89%
1391 copy from sci-mathematics/rstudio/rstudio-1.1.463.ebuild
1392 copy to sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
1393 index 271588e60b8..4ff5da66509 100644
1394 --- a/sci-mathematics/rstudio/rstudio-1.1.463.ebuild
1395 +++ b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild
1396 @@ -1,9 +1,9 @@
1397 # Copyright 1999-2019 Gentoo Authors
1398 # Distributed under the terms of the GNU General Public License v2
1399
1400 -EAPI=6
1401 +EAPI=7
1402
1403 -inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils
1404 +inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils
1405
1406 # TODO
1407 # * package gin and gwt
1408 @@ -12,11 +12,12 @@ inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-
1409
1410 # update from scripts in dependencies/common
1411 # egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt
1412 -GWT_VER=2.7.0
1413 -GIN_VER=1.5
1414 +GWT_VER=2.8.1
1415 +GIN_VER=2.1.2
1416 SELENIUM_VER=2.37.0
1417 CHROMEDRIVER_VER=2.7
1418 # grep 'PANDOC_VERSION=' dependencies/common/install-pandoc
1419 +# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage
1420 PANDOC_VER=1.19.2.1
1421 # ls dependencies/common/*.tar.gz
1422 PACKRAT_VER=0.98.1000
1423 @@ -53,7 +54,7 @@ RDEPEND="
1424 >=app-text/pandoc-${PANDOC_VER}
1425 dev-haskell/pandoc-citeproc
1426 >=dev-lang/R-2.11.1
1427 - <dev-libs/boost-1.70:=
1428 + >=dev-libs/boost-1.63:=
1429 >=dev-libs/mathjax-2.7.4
1430 sys-apps/util-linux
1431 >=sys-devel/clang-3.5.0:*
1432 @@ -91,17 +92,16 @@ DEPEND="${RDEPEND}
1433 # test? ( dev-java/junit:4 )
1434
1435 PATCHES=(
1436 - "${FILESDIR}/${PN}-0.99.879-prefs.patch"
1437 - "${FILESDIR}/${PN}-1.0.44-paths.patch"
1438 - "${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch"
1439 - "${FILESDIR}/${PN}-0.98.490-linker_flags.patch"
1440 - "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch"
1441 + "${FILESDIR}/${PN}-1.2.1335-prefs.patch"
1442 + "${FILESDIR}/${PN}-1.2.1335-paths.patch"
1443 + "${FILESDIR}/${PN}-1.2.1335-pandoc.patch"
1444 + "${FILESDIR}/${PN}-1.2.1335-linker_flags.patch"
1445 + "${FILESDIR}/${PN}-1.2.1335-qtsingleapplication.patch"
1446 "${FILESDIR}/${PN}-1.0.44-systemd.patch"
1447 - "${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch"
1448 - "${FILESDIR}/${PN}-1.1.453-core.patch"
1449 - "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch"
1450 - "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch"
1451 - "${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch"
1452 + "${FILESDIR}/${PN}-1.2.1335-core.patch"
1453 + "${FILESDIR}/${PN}-1.2.1335-fix-ptr-int-compare.patch"
1454 + "${FILESDIR}/${PN}-1.2.1335-boost-1.70.0_p1.patch"
1455 + "${FILESDIR}/${PN}-1.2.1335-boost-1.70.0_p2.patch"
1456 )
1457
1458 src_unpack() {
1459 @@ -193,9 +193,9 @@ src_prepare() {
1460 }
1461
1462 src_configure() {
1463 - export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1)
1464 - export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2)
1465 - export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3)
1466 + export RSTUDIO_VERSION_MAJOR=$(ver_cut 1)
1467 + export RSTUDIO_VERSION_MINOR=$(ver_cut 2)
1468 + export RSTUDIO_VERSION_PATCH=$(ver_cut 3)
1469
1470 local mycmakeargs=(
1471 -DDISTRO_SHARE=share/${PN}
1472 @@ -218,7 +218,7 @@ src_compile() {
1473 src_install() {
1474 export ANT_OPTS="-Duser.home=${T}"
1475 cmake-utils_src_install
1476 - pax-mark m "${ED}usr/bin/rstudio"
1477 + pax-mark m "${ED}/usr/bin/rstudio"
1478 doconfd "${FILESDIR}"/rstudio-server.conf
1479 dodir /etc/rstudio
1480 insinto /etc/rstudio
Report Message
Find on MARC Find on Google Groups