1 |
commit: 07ba37d27c35a88152a5f413289892c47b8325c6 |
2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 3 02:09:07 2018 +0000 |
4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 3 02:38:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07ba37d2 |
7 |
|
8 |
sci-mathematics/rstudio: Bump to 1.1.453 |
9 |
|
10 |
Thanks to John Dough for reporting 652116. |
11 |
Thanks to Harris Landgarten for reporting 626056. |
12 |
Closes https://bugs.gentoo.org/652116 |
13 |
Closes https://bugs.gentoo.org/626056 |
14 |
|
15 |
sci-mathematics/rstudio/Manifest | 1 + |
16 |
.../files/rstudio-1.1.453-boost-1.67.0.patch | 38 ++++ |
17 |
.../rstudio/files/rstudio-1.1.453-core.patch | 143 ++++++++++++ |
18 |
sci-mathematics/rstudio/rstudio-1.1.453.ebuild | 249 +++++++++++++++++++++ |
19 |
4 files changed, 431 insertions(+) |
20 |
|
21 |
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest |
22 |
index 68418950fa6..77cc3217237 100644 |
23 |
--- a/sci-mathematics/rstudio/Manifest |
24 |
+++ b/sci-mathematics/rstudio/Manifest |
25 |
@@ -6,6 +6,7 @@ DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3a |
26 |
DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 |
27 |
DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade |
28 |
DIST rstudio-1.1.383.tar.gz 20196702 BLAKE2B 5164230a92618e4252269ad0016b200294d1e7fa502cc49aa694486cda098ee7ffc65e6c74a87d891d0532f5cc15d1552aa86d04047d07b4f275cbc4d2758647 SHA512 3f637f9bce2c1ad1a4ed3e74287da722190a4e12b0cace6ffcca271977d49dcecca9365f2064366aad94e87851593cab83fa9361e9a9222a9f67fe9451f31ed2 |
29 |
+DIST rstudio-1.1.453.tar.gz 20200360 BLAKE2B 560b89e53b04356ecf9a02dd8a7e72ad8d6c30bf406fbe7e22a82cc6d33d40e84bececf5ecda9cf086360b2bd2fa64d6b33c2dd675ef5f605f9e825d7ca2dc84 SHA512 f2be0866f645007a6f80959109928820c89480057c3660d23e790591797d4f4c371733f49290dae9c81bfc2715821528e2a105e7a66d4d9ffbfc7ee2a596976c |
30 |
DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 |
31 |
DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 |
32 |
DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c |
33 |
|
34 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch |
35 |
new file mode 100644 |
36 |
index 00000000000..760c9b56105 |
37 |
--- /dev/null |
38 |
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch |
39 |
@@ -0,0 +1,38 @@ |
40 |
+--- rstudio-1.1.453-orig/src/cpp/core/DateTime.cpp 2018-05-15 04:19:30.000000000 +1000 |
41 |
++++ rstudio-1.1.453/src/cpp/core/DateTime.cpp 2018-07-02 16:19:21.335703471 +1000 |
42 |
+@@ -65,7 +65,7 @@ |
43 |
+ using namespace boost::posix_time; |
44 |
+ |
45 |
+ ptime time_t_epoch(date(1970,1,1)); |
46 |
+- return time_t_epoch + seconds(sec); |
47 |
++ return time_t_epoch + seconds(static_cast<long>(sec)); |
48 |
+ } |
49 |
+ |
50 |
+ boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms) |
51 |
+--- rstudio-1.1.453-orig/src/cpp/core/file_lock/FileLock.cpp 2018-05-15 04:19:30.000000000 +1000 |
52 |
++++ rstudio-1.1.453/src/cpp/core/file_lock/FileLock.cpp 2018-07-02 17:00:35.915695201 +1000 |
53 |
+@@ -133,11 +133,11 @@ |
54 |
+ |
55 |
+ // timeout interval |
56 |
+ double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval); |
57 |
+- FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval); |
58 |
++ FileLock::s_timeoutInterval = boost::posix_time::seconds(static_cast<long>(timeoutInterval)); |
59 |
+ |
60 |
+ // refresh rate |
61 |
+ double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate); |
62 |
+- FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate); |
63 |
++ FileLock::s_refreshRate = boost::posix_time::seconds(static_cast<long>(refreshRate)); |
64 |
+ |
65 |
+ // logging |
66 |
+ bool loggingEnabled = settings.getBool("enable-logging", false); |
67 |
+@@ -212,8 +212,8 @@ |
68 |
+ |
69 |
+ // default values for static members |
70 |
+ FileLock::LockType FileLock::s_defaultType(FileLock::LOCKTYPE_LINKBASED); |
71 |
+-boost::posix_time::seconds FileLock::s_timeoutInterval(kDefaultTimeoutInterval); |
72 |
+-boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate); |
73 |
++boost::posix_time::seconds FileLock::s_timeoutInterval(static_cast<long>(kDefaultTimeoutInterval)); |
74 |
++boost::posix_time::seconds FileLock::s_refreshRate(static_cast<long>(kDefaultRefreshRate)); |
75 |
+ bool FileLock::s_loggingEnabled(false); |
76 |
+ bool FileLock::s_isLoadBalanced(false); |
77 |
+ FilePath FileLock::s_logFile; |
78 |
|
79 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch |
80 |
new file mode 100644 |
81 |
index 00000000000..641f7710167 |
82 |
--- /dev/null |
83 |
+++ b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch |
84 |
@@ -0,0 +1,143 @@ |
85 |
+--- rstudio-1.1.453-orig/src/cpp/session/SessionClientInit.cpp 2018-05-15 04:19:30.000000000 +1000 |
86 |
++++ rstudio-1.1.453/src/cpp/session/SessionClientInit.cpp 2018-07-02 20:21:41.595654877 +1000 |
87 |
+@@ -105,7 +105,7 @@ |
88 |
+ } |
89 |
+ |
90 |
+ // prepare session info |
91 |
+- json::Object sessionInfo ; |
92 |
++ core::json::Object sessionInfo ; |
93 |
+ sessionInfo["clientId"] = clientId; |
94 |
+ sessionInfo["mode"] = options.programMode(); |
95 |
+ |
96 |
+@@ -119,8 +119,8 @@ |
97 |
+ } |
98 |
+ |
99 |
+ // temp dir |
100 |
+- FilePath tempDir = rstudio::r::session::utils::tempDir(); |
101 |
+- Error error = tempDir.ensureDirectory(); |
102 |
++ core::FilePath tempDir = rstudio::r::session::utils::tempDir(); |
103 |
++ core::Error error = tempDir.ensureDirectory(); |
104 |
+ if (error) |
105 |
+ LOG_ERROR(error); |
106 |
+ sessionInfo["temp_dir"] = tempDir.absolutePath(); |
107 |
+@@ -132,12 +132,12 @@ |
108 |
+ sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt"); |
109 |
+ |
110 |
+ // client state |
111 |
+- json::Object clientStateObject; |
112 |
++ core::json::Object clientStateObject; |
113 |
+ rstudio::r::session::clientState().currentState(&clientStateObject); |
114 |
+ sessionInfo["client_state"] = clientStateObject; |
115 |
+ |
116 |
+ // source documents |
117 |
+- json::Array jsonDocs; |
118 |
++ core::json::Array jsonDocs; |
119 |
+ error = modules::source::clientInitDocuments(&jsonDocs); |
120 |
+ if (error) |
121 |
+ LOG_ERROR(error); |
122 |
+@@ -159,7 +159,7 @@ |
123 |
+ if (resumed) |
124 |
+ { |
125 |
+ // console actions |
126 |
+- json::Object actionsObject; |
127 |
++ core::json::Object actionsObject; |
128 |
+ consoleActions.asJson(&actionsObject); |
129 |
+ sessionInfo["console_actions"] = actionsObject; |
130 |
+ } |
131 |
+@@ -211,12 +211,12 @@ |
132 |
+ } |
133 |
+ else |
134 |
+ { |
135 |
+- sessionInfo["active_project_file"] = json::Value(); |
136 |
+- sessionInfo["project_ui_prefs"] = json::Value(); |
137 |
+- sessionInfo["project_open_docs"] = json::Value(); |
138 |
++ sessionInfo["active_project_file"] = core::json::Value(); |
139 |
++ sessionInfo["project_ui_prefs"] = core::json::Value(); |
140 |
++ sessionInfo["project_open_docs"] = core::json::Value(); |
141 |
+ sessionInfo["project_supports_sharing"] = false; |
142 |
+ sessionInfo["project_owned_by_user"] = false; |
143 |
+- sessionInfo["project_user_data_directory"] = json::Value(); |
144 |
++ sessionInfo["project_user_data_directory"] = core::json::Value(); |
145 |
+ } |
146 |
+ |
147 |
+ sessionInfo["system_encoding"] = std::string(::locale2charset(NULL)); |
148 |
+@@ -253,20 +253,20 @@ |
149 |
+ sessionInfo["build_tools_bookdown_website"] = |
150 |
+ module_context::isBookdownWebsite(); |
151 |
+ |
152 |
+- FilePath buildTargetDir = projects::projectContext().buildTargetPath(); |
153 |
++ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath(); |
154 |
+ if (!buildTargetDir.empty()) |
155 |
+ { |
156 |
+ sessionInfo["build_target_dir"] = module_context::createAliasedPath( |
157 |
+ buildTargetDir); |
158 |
+- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) && |
159 |
++ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) && |
160 |
+ buildTargetDir.childPath("src").exists(); |
161 |
+ sessionInfo["has_pkg_vig"] = |
162 |
+- (type == r_util::kBuildTypePackage) && |
163 |
++ (type == core::r_util::kBuildTypePackage) && |
164 |
+ buildTargetDir.childPath("vignettes").exists(); |
165 |
+ } |
166 |
+ else |
167 |
+ { |
168 |
+- sessionInfo["build_target_dir"] = json::Value(); |
169 |
++ sessionInfo["build_target_dir"] = core::json::Value(); |
170 |
+ sessionInfo["has_pkg_src"] = false; |
171 |
+ sessionInfo["has_pkg_vig"] = false; |
172 |
+ } |
173 |
+@@ -274,9 +274,9 @@ |
174 |
+ } |
175 |
+ else |
176 |
+ { |
177 |
+- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone; |
178 |
++ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone; |
179 |
+ sessionInfo["build_tools_bookdown_website"] = false; |
180 |
+- sessionInfo["build_target_dir"] = json::Value(); |
181 |
++ sessionInfo["build_target_dir"] = core::json::Value(); |
182 |
+ sessionInfo["has_pkg_src"] = false; |
183 |
+ sessionInfo["has_pkg_vig"] = false; |
184 |
+ } |
185 |
+@@ -285,7 +285,7 @@ |
186 |
+ sessionInfo["presentation_commands"] = options.allowPresentationCommands(); |
187 |
+ |
188 |
+ sessionInfo["tutorial_api_available"] = false; |
189 |
+- sessionInfo["tutorial_api_client_origin"] = json::Value(); |
190 |
++ sessionInfo["tutorial_api_client_origin"] = core::json::Value(); |
191 |
+ |
192 |
+ sessionInfo["build_state"] = modules::build::buildStateAsJson(); |
193 |
+ sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled(); |
194 |
+@@ -296,7 +296,7 @@ |
195 |
+ |
196 |
+ // console history -- we do this at the end because |
197 |
+ // restoreBuildRestartContext may have reset it |
198 |
+- json::Array historyArray; |
199 |
++ core::json::Array historyArray; |
200 |
+ rstudio::r::session::consoleHistory().asJson(&historyArray); |
201 |
+ sessionInfo["console_history"] = historyArray; |
202 |
+ sessionInfo["console_history_capacity"] = |
203 |
+@@ -364,13 +364,13 @@ |
204 |
+ |
205 |
+ sessionInfo["multi_session"] = options.multiSession(); |
206 |
+ |
207 |
+- json::Object rVersionsJson; |
208 |
++ core::json::Object rVersionsJson; |
209 |
+ rVersionsJson["r_version"] = module_context::rVersion(); |
210 |
+ rVersionsJson["r_home_dir"] = module_context::rHomeDir(); |
211 |
+ sessionInfo["r_versions_info"] = rVersionsJson; |
212 |
+ |
213 |
+ sessionInfo["show_user_home_page"] = options.showUserHomePage(); |
214 |
+- sessionInfo["user_home_page_url"] = json::Value(); |
215 |
++ sessionInfo["user_home_page_url"] = core::json::Value(); |
216 |
+ |
217 |
+ sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson(); |
218 |
+ sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload(); |
219 |
+@@ -394,7 +394,7 @@ |
220 |
+ |
221 |
+ // send response (we always set kEventsPending to false so that the client |
222 |
+ // won't poll for events until it is ready) |
223 |
+- json::JsonRpcResponse jsonRpcResponse ; |
224 |
++ core::json::JsonRpcResponse jsonRpcResponse ; |
225 |
+ jsonRpcResponse.setField(kEventsPending, "false"); |
226 |
+ jsonRpcResponse.setResult(sessionInfo) ; |
227 |
+ ptrConnection->sendJsonRpcResponse(jsonRpcResponse); |
228 |
|
229 |
diff --git a/sci-mathematics/rstudio/rstudio-1.1.453.ebuild b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild |
230 |
new file mode 100644 |
231 |
index 00000000000..35c991b9bd1 |
232 |
--- /dev/null |
233 |
+++ b/sci-mathematics/rstudio/rstudio-1.1.453.ebuild |
234 |
@@ -0,0 +1,249 @@ |
235 |
+# Copyright 1999-2018 Gentoo Foundation |
236 |
+# Distributed under the terms of the GNU General Public License v2 |
237 |
+ |
238 |
+EAPI=6 |
239 |
+ |
240 |
+inherit eutils user cmake-utils gnome2-utils pam versionator xdg-utils java-pkg-2 pax-utils qmake-utils |
241 |
+ |
242 |
+# TODO |
243 |
+# * package gin and gwt |
244 |
+# * use dict from tree, linguas |
245 |
+# * do src_test (use junit from tree?) |
246 |
+ |
247 |
+# update from scripts in dependencies/common |
248 |
+# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt |
249 |
+GWT_VER=2.7.0 |
250 |
+GIN_VER=1.5 |
251 |
+SELENIUM_VER=2.37.0 |
252 |
+CHROMEDRIVER_VER=2.7 |
253 |
+# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc |
254 |
+PANDOC_VER=1.19.2.1 |
255 |
+# ls dependencies/common/*.tar.gz |
256 |
+PACKRAT_VER=0.98.1000 |
257 |
+RMARKDOWN_VER=0.98.1000 |
258 |
+SHINYAPPS_VER=0.98.1000 |
259 |
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 |
260 |
+ |
261 |
+DESCRIPTION="IDE for the R language" |
262 |
+HOMEPAGE=" |
263 |
+ http://www.rstudio.org |
264 |
+ https://github.com/rstudio/rstudio/" |
265 |
+SRC_URI=" |
266 |
+ https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz |
267 |
+ https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip |
268 |
+ https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip |
269 |
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip |
270 |
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar |
271 |
+ https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux |
272 |
+ https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip |
273 |
+ https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz |
274 |
+ https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz |
275 |
+ https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz |
276 |
+ https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz |
277 |
+" |
278 |
+ |
279 |
+LICENSE="AGPL-3" |
280 |
+SLOT="0" |
281 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
282 |
+IUSE="dedicated server" |
283 |
+ |
284 |
+QT_VER=5.4 |
285 |
+QT_SLOT=5 |
286 |
+RDEPEND=" |
287 |
+ >=app-text/pandoc-${PANDOC_VER} |
288 |
+ dev-haskell/pandoc-citeproc |
289 |
+ >=dev-lang/R-2.11.1 |
290 |
+ >=dev-libs/boost-1.63:= |
291 |
+ >=dev-libs/mathjax-2.7.4 |
292 |
+ dev-libs/openssl:0 |
293 |
+ sys-apps/util-linux |
294 |
+ >=sys-devel/clang-3.5.0:* |
295 |
+ sys-libs/zlib |
296 |
+ >=virtual/jre-1.8:= |
297 |
+ x11-libs/pango |
298 |
+ !dedicated? ( |
299 |
+ >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} |
300 |
+ >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} |
301 |
+ >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} |
302 |
+ >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} |
303 |
+ >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} |
304 |
+ >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
305 |
+ >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
306 |
+ >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
307 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] |
308 |
+ >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
309 |
+ >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
310 |
+ >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
311 |
+ >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} |
312 |
+ >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} |
313 |
+ >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} |
314 |
+ >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} |
315 |
+ >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} |
316 |
+ server? ( virtual/pam ) |
317 |
+ ) |
318 |
+ dedicated? ( virtual/pam )" |
319 |
+DEPEND="${RDEPEND} |
320 |
+ app-arch/unzip |
321 |
+ dev-java/ant-core |
322 |
+ >=virtual/jdk-1.8:= |
323 |
+ virtual/pkgconfig" |
324 |
+# test? ( dev-java/junit:4 ) |
325 |
+ |
326 |
+PATCHES=( |
327 |
+ "${FILESDIR}/${PN}-0.99.879-prefs.patch" |
328 |
+ "${FILESDIR}/${PN}-1.0.44-paths.patch" |
329 |
+ "${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch" |
330 |
+ "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" |
331 |
+ "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" |
332 |
+ "${FILESDIR}/${PN}-1.0.44-systemd.patch" |
333 |
+ "${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch" |
334 |
+ "${FILESDIR}/${PN}-1.1.453-core.patch" |
335 |
+) |
336 |
+ |
337 |
+src_unpack() { |
338 |
+ unpack ${P}.tar.gz gwt-${GWT_VER}.zip |
339 |
+ cd "${S}" || die |
340 |
+ mkdir -p src/gwt/lib/{gin,gwt} \ |
341 |
+ dependencies/common/dictionaries \ |
342 |
+ src/gwt/lib/selenium/${SELENIUM_VER} \ |
343 |
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die |
344 |
+ mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die |
345 |
+ unzip -qd src/gwt/lib/gin/${GIN_VER} \ |
346 |
+ "${DISTDIR}"/gin-${GIN_VER}.zip || die |
347 |
+ unzip -qd dependencies/common/dictionaries \ |
348 |
+ "${DISTDIR}"/core-dictionaries.zip || die |
349 |
+ unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ |
350 |
+ "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die |
351 |
+ cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ |
352 |
+ src/gwt/lib/selenium/${SELENIUM_VER}/ || die |
353 |
+ cp "${DISTDIR}"/chromedriver-linux \ |
354 |
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die |
355 |
+ cd dependencies/common || die |
356 |
+ unpack packrat-${PACKRAT_VER}.tar.gz |
357 |
+ unpack rmarkdown-${RMARKDOWN_VER}.tar.gz |
358 |
+ unpack shinyapps-${SHINYAPPS_VER}.tar.gz |
359 |
+ unpack rsconnect_${RSCONNECT_VER}.tar.gz |
360 |
+ cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ |
361 |
+ . || die |
362 |
+ cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ |
363 |
+ . || die |
364 |
+ cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ |
365 |
+ . || die |
366 |
+ cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ |
367 |
+ . || die |
368 |
+} |
369 |
+ |
370 |
+src_prepare() { |
371 |
+ cmake-utils_src_prepare |
372 |
+ java-pkg-2_src_prepare |
373 |
+ egit_clean |
374 |
+ |
375 |
+ # Enable CMake to install our .service file for systemd usage |
376 |
+ mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die |
377 |
+ cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die |
378 |
+ |
379 |
+ # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using |
380 |
+ # this sed hack for now. ~RMH |
381 |
+ sed -i \ |
382 |
+ -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ |
383 |
+ src/cpp/server/ServerOptions.cpp \ |
384 |
+ src/cpp/session/SessionOptions.cpp || die |
385 |
+ |
386 |
+ # use mathjax from system |
387 |
+ ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die |
388 |
+ |
389 |
+ # make sure icons and mime stuff are with prefix |
390 |
+ sed -i \ |
391 |
+ -e "s:/usr:${EPREFIX}/usr:g" \ |
392 |
+ CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die |
393 |
+ |
394 |
+ # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf |
395 |
+ sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ |
396 |
+ -i src/cpp/server/ServerOptions.cpp \ |
397 |
+ || die |
398 |
+ |
399 |
+ # Set the rsession.conf file location for Gentoo prefix |
400 |
+ sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ |
401 |
+ -i src/cpp/session/SessionOptions.cpp \ |
402 |
+ || die |
403 |
+ |
404 |
+ # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. |
405 |
+ # It provides a library that has its version number appended to the end, |
406 |
+ # which is difficult to handle in cmake, as find_library does not support |
407 |
+ # searching for wildcard library names. So I find the library name from the |
408 |
+ # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
409 |
+ rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
410 |
+ local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
411 |
+ $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
412 |
+ | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
413 |
+ -e 's@LIBS \*= -l@@') |
414 |
+ sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
415 |
+ -i "${S}"/src/cpp/desktop/CMakeLists.txt \ |
416 |
+ || die |
417 |
+ |
418 |
+ # The git commit for tag: git rev-list -n 1 v${PV} |
419 |
+ sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\ |
420 |
+ -i "${S}"/CMakeLists.txt \ |
421 |
+ "${S}"/CMakeGlobals.txt \ |
422 |
+ || die |
423 |
+} |
424 |
+ |
425 |
+src_configure() { |
426 |
+ export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) |
427 |
+ export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) |
428 |
+ export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) |
429 |
+ |
430 |
+ local mycmakeargs=( |
431 |
+ -DDISTRO_SHARE=share/${PN} |
432 |
+ -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" |
433 |
+ -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
434 |
+ -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
435 |
+ -DRSTUDIO_VERIFY_R_VERSION=FALSE |
436 |
+ ) |
437 |
+ |
438 |
+ cmake-utils_src_configure |
439 |
+} |
440 |
+ |
441 |
+src_compile() { |
442 |
+ # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny |
443 |
+ # P: /root/.oracle_jre_usage. |
444 |
+ export ANT_OPTS="-Duser.home=${T}" |
445 |
+ cmake-utils_src_compile |
446 |
+} |
447 |
+ |
448 |
+src_install() { |
449 |
+ export ANT_OPTS="-Duser.home=${T}" |
450 |
+ cmake-utils_src_install |
451 |
+ pax-mark m "${ED}usr/bin/rstudio" |
452 |
+ doconfd "${FILESDIR}"/rstudio-server.conf |
453 |
+ dodir /etc/rstudio |
454 |
+ insinto /etc/rstudio |
455 |
+ doins "${FILESDIR}"/rsession.conf |
456 |
+ dosym "${ROOT}etc/conf.d/rstudio-server.conf" "${ROOT}etc/rstudio/rserver.conf" |
457 |
+ if use dedicated || use server; then |
458 |
+ dopamd src/cpp/server/extras/pam/rstudio |
459 |
+ newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server |
460 |
+ fi |
461 |
+} |
462 |
+ |
463 |
+pkg_preinst() { |
464 |
+ use dedicated || gnome2_icon_savelist |
465 |
+ java-pkg-2_pkg_preinst |
466 |
+} |
467 |
+ |
468 |
+pkg_postinst() { |
469 |
+ use dedicated || { xdg_desktop_database_update |
470 |
+ xdg_mimeinfo_database_update |
471 |
+ gnome2_icon_cache_update ;} |
472 |
+ |
473 |
+ if use dedicated || use server; then |
474 |
+ enewgroup rstudio-server |
475 |
+ enewuser rstudio-server -1 -1 -1 rstudio-server |
476 |
+ fi |
477 |
+} |
478 |
+ |
479 |
+pkg_postrm() { |
480 |
+ use dedicated || { xdg_desktop_database_update |
481 |
+ xdg_mimeinfo_database_update |
482 |
+ gnome2_icon_cache_update ;} |
483 |
+} |