1 |
commit: 03406d4343f6bf8e63fcc86bfc6264cdb429fefb |
2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 23 12:34:01 2020 +0000 |
4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 23 12:42:05 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03406d43 |
7 |
|
8 |
sci-mathematics/rstudio: Remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
11 |
Signed-off-by: Mark Wright <gienah <AT> gentoo.org> |
12 |
|
13 |
sci-mathematics/rstudio/Manifest | 13 - |
14 |
.../files/rstudio-0.98.490-linker_flags.patch | 18 - |
15 |
.../rstudio-0.99.473-qtsingleapplication.patch | 60 --- |
16 |
.../rstudio/files/rstudio-0.99.879-prefs.patch | 45 -- |
17 |
.../rstudio/files/rstudio-1.0.44-paths.patch | 130 ------ |
18 |
.../files/rstudio-1.1.357-clang-pandoc.patch | 76 ---- |
19 |
.../files/rstudio-1.1.453-boost-1.67.0.patch | 38 -- |
20 |
.../rstudio/files/rstudio-1.1.453-core.patch | 143 ------- |
21 |
.../files/rstudio-1.1.463-boost-1.69.0_p1.patch | 460 --------------------- |
22 |
.../files/rstudio-1.1.463-boost-1.69.0_p2.patch | 220 ---------- |
23 |
.../files/rstudio-1.1.463-boost-1.69.0_p3.patch | 167 -------- |
24 |
.../files/rstudio-1.1.463-boost-1.70.0.patch | 46 --- |
25 |
.../rstudio-1.1.463-fix-ptr-int-compare.patch | 13 - |
26 |
.../rstudio-1.2.1335-boost-1.72-filesystem.patch | 31 -- |
27 |
.../rstudio-1.2.1335-fix-ptr-int-compare.patch | 13 - |
28 |
.../rstudio/files/rstudio-1.2.1335-pandoc.patch | 32 -- |
29 |
.../rstudio/files/rstudio-1.2.1335-paths.patch | 118 ------ |
30 |
.../rstudio/files/rstudio-1.2.1335-prefs.patch | 53 --- |
31 |
sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild | 255 ------------ |
32 |
sci-mathematics/rstudio/rstudio-1.2.1335.ebuild | 254 ------------ |
33 |
20 files changed, 2185 deletions(-) |
34 |
|
35 |
diff --git a/sci-mathematics/rstudio/Manifest b/sci-mathematics/rstudio/Manifest |
36 |
index 314a334a3e7..6821cacc59b 100644 |
37 |
--- a/sci-mathematics/rstudio/Manifest |
38 |
+++ b/sci-mathematics/rstudio/Manifest |
39 |
@@ -1,16 +1,3 @@ |
40 |
-DIST chromedriver-linux 19303552 BLAKE2B 610396fd74f2adc4c249ca971a53a6dd4ab06145d0b37d59adf66180dfada52192b20203bf3d992c270bd4f787df5c85511ca325aed06cbd9318add3eccfde30 SHA512 18774ede961dec222058dd0e3f128d63732cd444ee310136b44d5bf508a4f2f2c164a2c8d195d80bce8b5fb6303559e167f82f384e4a58e30f48b151a4206ee8 |
41 |
DIST core-dictionaries.zip 876339 BLAKE2B f29afcbf5a7f8ec635e5a5b248d978af286d18488f54c9a09a2b95fde19b796e4473e5846402a46dd24b71c6e4167512539aaa32ab6d99713d500a80aaf46796 SHA512 9c5830cc9fed575e223f1c61f02e48c5aea6801bb0cd2586f02437c17fdffdb1d36c396d5a8ecbe02ba01196e73458304345b1f6b92c052bc7a7d05961fac2c9 |
42 |
-DIST gin-1.5.zip 1055663 BLAKE2B 11b86245d54967f0c76f22f7460fb752c410db3c59a019bb538a48fd0de7e87552f2f5bb9ce604e6ed508136a6a2b0814f061161579429daae8ca55b1a448114 SHA512 3f6649565f9600daaca6ddf3fb431925b5a1ce1ada38e6389de64cef617abba9d3f49c555d0a20053fb06f17ccbe4e1141b39966fbe4b2975d7b120377504897 |
43 |
-DIST gin-2.1.2.zip 1341053 BLAKE2B 515338ba50ba2183c101b42183e42ebf15613aae8751a0dcedb4b047de4ca8fab85eb240f5f0c92955441dbb87e80b3edbdae8d83f1e74f74c7de067d18cf108 SHA512 03407b6318ffb0dd504ce520649ed90e845f13fbdbd0bfb4d7e3b127842f1735093e39674077c3a04a11d434aefdc3a734652c3f85e8ab00ff37ae760ccb8dbb |
44 |
-DIST gwt-2.7.0.zip 108818328 BLAKE2B 9af969f3f2577be041fcfb58f228fab4b5479fa0da5ff054ab0a59cad751590a1b4ae8d7fabc8a50e3b0e5d7eb9b2896c485d929421f75e6a2f6513480438a31 SHA512 a1eed5cc25c888cf81d4f22b1f9494d5d8567b911f7aeb1d164a6359120543668280afe1a3ffc9ed87b139c7db67fbcaaabde2066e3279909d7cd6fc22eaf499 |
45 |
-DIST gwt-2.8.1.zip 95650299 BLAKE2B 3853d50d1346e313903b6f0c4b8405ce9e896e51652483e5c7e9d711daa213e1341c71765b4a3fb061b58f90d49420245963a0480db8b71fe7aed6cd43782c14 SHA512 feeb00cb0413c2703dfd6931f57ba669813bd65f814715f2c04dd6dc69e885a8048337272333d7504c48e9fa52cdab699f854ee13211228ab142a1f458ee33ae |
46 |
-DIST packrat-0.98.1000.tar.gz 97677 BLAKE2B 282fe33dc5ba366ceea05a222ae2d018bc3ad8f35fad73c585a3d4901c3287e6902277a9c7ca087854f3944bd85ff1b1d1f02869ece686b10f946e2f1cb1296c SHA512 2290c768ecf27a037e73c3f8336b9fd71c68ff19d071b4a8fbc469550d29007cacacdb75f854f73b5db2139a5104f129b85a3612e2ee47bd6118ee13f7d103a6 |
47 |
-DIST rmarkdown-0.98.1000.tar.gz 1423820 BLAKE2B eac8c9cf438c9b44ddfe954602dd67a83764b0c988b3ba571877c986b0d5d237059ed6643a86bb404428857ec8c346bfecd12f7cd15cde301cb0ce331f842b7f SHA512 df3540c24c87930fe55bff2ffe67c86c219800cb00ed72ba9451ecd0d0cad411548a78c1a04b9a2e301e853616dcb77e09129c4e48ade6f16d3f14b7ea7e4852 |
48 |
-DIST rsconnect_0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0.tar.gz 197051 BLAKE2B 1f3f9fe71d7b50ab5108dfdbd3cc0b882bcc935ee58e8a9145b07a18bb86c39bc45e321a13add24df99492bc30548df716775c339bcbf4efc2bfe158299ae55a SHA512 208dc349f4aa7613ecf94939aba60d22d3a06972344b526c9b6c951015571f5922927bca08db571a7b8a268e42609a4f558f01278c9685f6da2ffc66a1f95ade |
49 |
-DIST rstudio-1.1.463.tar.gz 20203779 BLAKE2B 97f879539cbb7051af362a8469795a47feb42d18ff46dbbdffe36e0685d1cd5704848b3bf5a5611d482a09567722e35288527302cd521b18e2a48b347c919e17 SHA512 987347563a9726363c28d866e1372eae8eb19a5cbd0e33c7ee0e0c8f90471c4b69de0f559c00410523841b6c090b584652e01496f5db33c015a4554d2f4e179b |
50 |
-DIST rstudio-1.2.1335.tar.gz 20440199 BLAKE2B cdd54a7df5a234bcc6d440f4ba5b45e58ea469f8dac5a17d9088f9d65035495c86b5a308cde28a224648f96a74038299863291f3c516a1d567762ecc5bfb079c SHA512 90657effc55264bf3efa1a8a5d2bbe94a37727f0450202ade99b9fbb71ea75b6dd9fa798d17cd4d1a1a97a16f186de8004d1888b6ea43f36d5252508520d3cde |
51 |
DIST rstudio-1.2.5033.tar.gz 20456976 BLAKE2B 3cbca6a5180690104dddf1456168bd38708d4152ed9b7a167035dd66e270aeb6405169d34461cbd899738be1872607e3f3b6f81ff0b3c9e6a9ed965a889b1393 SHA512 3569d4fed342275a9905c87e4f97be63b6391d2c37f75397e06201a7c31f80d94799214f51ff8e57d458ef18d5e54afe1ec8a7c56ac05ed8b8225ecca72d1daf |
52 |
DIST rstudio-1.2.5042.tar.gz 20456999 BLAKE2B 3251ab2511daefefa395256fedb273ecc36dbc8118457474e3647f7616baea91301e597896582ad4b191195fc7baf17645c4c25b9a957a0c17a6251151b1dd87 SHA512 e09f2360abecde0c16e240e6838efb270a355bec3d3982ffde2b01b32b21e9281fef465734edbfeb5e05375529cc7f06d5b5d41304f367982f53ae7ad98e20f9 |
53 |
-DIST selenium-java-2.37.0.zip 24625928 BLAKE2B b369a805ae96f0d0913c4be42888d9c2a1e213ff982f9daefe73fadb705baa80ab0186ab50ed52609e83697cffaf8d617d06d75405cb8e1c3fe8e7c5b81dba25 SHA512 68624e82dbc751a25c50fad72702a98eb30d77fd4337d2a969f8e06bcc49e5f8c835cd27ec53772f3375014ddde1d5636936e966b75f3594a9f86aa18ba4e779 |
54 |
-DIST selenium-server-standalone-2.37.0.jar 34730734 BLAKE2B 3899b1d4c5f9153c1f9f13bec66f7c1456ea2e0f34db7d8e54a1ce9063c33a05b3cf95216c2ae06bb40504f72f343a4b9ba6c8553fbbc340e7c18a5b612dde5c SHA512 b215446d42d2d1f69664349b6ae6dc53a532d3624c91254f0f4183d0ad764648792e5cc1126a55a1e60d9687d55200fed01d6d2f46cc3d853b1fa6ee38111018 |
55 |
-DIST shinyapps-0.98.1000.tar.gz 910095 BLAKE2B 4f9364692348bb52cbd12cc6ee447841cb0c805327f2518b2a9545920b602b954a98dea68ccb3daf32d2c3bab6464fb15402844d93277193315f1ae7b3ca5190 SHA512 3162317c4c20cfc1497e952a8235867084d629ae88407e6c465b3e208adb1dc97abfe6b9922e0374ddf4c8e38a76e112942bd312c54a66f74e6f2a3fe4c0a07c |
56 |
|
57 |
diff --git a/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch b/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch |
58 |
deleted file mode 100644 |
59 |
index a336fccbc98..00000000000 |
60 |
--- a/sci-mathematics/rstudio/files/rstudio-0.98.490-linker_flags.patch |
61 |
+++ /dev/null |
62 |
@@ -1,18 +0,0 @@ |
63 |
-Some gcc hardening options were added, however since we add |
64 |
-"-Wl,--as-needed" we end up with "-Wl,--as-needed;-Wl,-z,relro" which |
65 |
-leads to linker errors about unknown options, if we make it so the |
66 |
-as-needed option is the last option on the line, everything is fine. |
67 |
- |
68 |
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt |
69 |
-index 0589ca0..fe5bd5f 100644 |
70 |
---- a/src/cpp/CMakeLists.txt |
71 |
-+++ b/src/cpp/CMakeLists.txt |
72 |
-@@ -57,7 +57,7 @@ if(UNIX) |
73 |
- add_definitions(-D_FORTIFY_SOURCE=2) |
74 |
- add_definitions(-fstack-protector --param ssp-buffer-size=4) |
75 |
- add_definitions(-pie -fPIE) |
76 |
-- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,relro,-z,now") |
77 |
-+ set(CMAKE_EXE_LINKER_FLAGS "-Wl,-z,relro,-z,now ${CMAKE_EXE_LINKER_FLAGS}") |
78 |
- endif() |
79 |
- |
80 |
- # Win32 specific global directives |
81 |
|
82 |
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch |
83 |
deleted file mode 100644 |
84 |
index bf66bd23678..00000000000 |
85 |
--- a/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch |
86 |
+++ /dev/null |
87 |
@@ -1,60 +0,0 @@ |
88 |
---- rstudio-0.99.473-orig/src/cpp/desktop/CMakeLists.txt 2015-08-12 09:58:43.000000000 +1000 |
89 |
-+++ rstudio-0.99.473/src/cpp/desktop/CMakeLists.txt 2015-08-30 23:16:11.396175587 +1000 |
90 |
-@@ -93,7 +93,12 @@ |
91 |
- find_package(Qt5DBus REQUIRED) |
92 |
- endif() |
93 |
- |
94 |
-- |
95 |
-+find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication |
96 |
-+ PATH_SUFFIXES QtSolutions |
97 |
-+ PATHS |
98 |
-+ /usr/include/qt5) |
99 |
-+find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6 |
100 |
-+ libQt5Solutions_SingleApplication-2.6) |
101 |
- |
102 |
- # disable clang warnings for qt sources |
103 |
- if(APPLE) |
104 |
-@@ -113,7 +118,6 @@ |
105 |
- |
106 |
- set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES}) |
107 |
- list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES |
108 |
-- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h |
109 |
- ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp |
110 |
- ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp |
111 |
- ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp |
112 |
-@@ -175,8 +179,6 @@ |
113 |
- DesktopSubMenu.cpp |
114 |
- DesktopSynctex.cpp |
115 |
- DesktopNetworkAccessManager.cpp |
116 |
-- 3rdparty/qtsingleapplication/qtsingleapplication.cpp |
117 |
-- 3rdparty/qtsingleapplication/qtlocalpeer.cpp |
118 |
- ) |
119 |
- |
120 |
- if(WIN32) |
121 |
-@@ -219,6 +221,7 @@ |
122 |
- ${CORE_SOURCE_DIR}/include |
123 |
- ${CMAKE_CURRENT_SOURCE_DIR} |
124 |
- ${CMAKE_CURRENT_BINARY_DIR} |
125 |
-+ ${QTSINGLEAPPLIB_INCLUDE_DIR} |
126 |
- ${TESTS_INCLUDE_DIR} |
127 |
- ) |
128 |
- |
129 |
-@@ -332,6 +335,7 @@ |
130 |
- |
131 |
- # set link dependencies |
132 |
- target_link_libraries(rstudio |
133 |
-+ ${QTSINGLEAPPLIB} |
134 |
- ${QT_LIBRARIES} |
135 |
- rstudio-core |
136 |
- ${LINK_FLAGS} |
137 |
---- rstudio-0.99.473-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2015-08-12 09:58:43.000000000 +1000 |
138 |
-+++ rstudio-0.99.473/src/cpp/desktop/DesktopPosixApplication.hpp 2015-08-30 21:41:21.616934106 +1000 |
139 |
-@@ -16,7 +16,7 @@ |
140 |
- #ifndef DESKTOP_POSIX_APPLICATION_HPP |
141 |
- #define DESKTOP_POSIX_APPLICATION_HPP |
142 |
- |
143 |
--#include "3rdparty/qtsingleapplication/QtSingleApplication" |
144 |
-+#include <QtSingleApplication> |
145 |
- |
146 |
- namespace rstudio { |
147 |
- namespace desktop { |
148 |
|
149 |
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch b/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch |
150 |
deleted file mode 100644 |
151 |
index 483613cc5c0..00000000000 |
152 |
--- a/sci-mathematics/rstudio/files/rstudio-0.99.879-prefs.patch |
153 |
+++ /dev/null |
154 |
@@ -1,45 +0,0 @@ |
155 |
---- rstudio-0.99.879-orig/src/gwt/build.xml 2016-02-12 09:24:39.000000000 +1100 |
156 |
-+++ rstudio-0.99.879/src/gwt/build.xml 2016-02-20 00:25:39.458756693 +1100 |
157 |
-@@ -25,6 +25,7 @@ |
158 |
- <property name="gwt.extra.args" value=""/> |
159 |
- <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> |
160 |
- <property name="ace.bin" value="src/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> |
161 |
-+ <property environment="env"/> |
162 |
- |
163 |
- <path id="project.class.path"> |
164 |
- <pathelement location="bin"/> |
165 |
-@@ -101,8 +102,10 @@ |
166 |
- <pathelement location="src"/> |
167 |
- <path refid="project.class.path"/> |
168 |
- </classpath> |
169 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
170 |
- <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> |
171 |
- <jvmarg value="-Xmx1536M"/> |
172 |
-+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> |
173 |
- <arg value="-war"/> |
174 |
- <arg value="www"/> |
175 |
- <arg value="-localWorkers"/> |
176 |
-@@ -142,6 +145,7 @@ |
177 |
- <pathelement location="src"/> |
178 |
- <path refid="project.class.path"/> |
179 |
- </classpath> |
180 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
181 |
- <jvmarg value="-Xmx2048M"/> |
182 |
- <arg value="-war"/> |
183 |
- <arg value="www"/> |
184 |
-@@ -163,6 +167,7 @@ |
185 |
- <pathelement location="src"/> |
186 |
- <path refid="project.class.path"/> |
187 |
- </classpath> |
188 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
189 |
- <jvmarg value="-Xmx2048M"/> |
190 |
- <arg value="-src"/> |
191 |
- <arg value = "src"/> |
192 |
-@@ -194,6 +199,7 @@ |
193 |
- <pathelement location="src"/> |
194 |
- <path refid="test.class.path"/> |
195 |
- </classpath> |
196 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
197 |
- <arg value="org.rstudio.studio.selenium.RStudioTestSuite"/> |
198 |
- </java> |
199 |
- </sequential> |
200 |
|
201 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch |
202 |
deleted file mode 100644 |
203 |
index b2a1a33b44c..00000000000 |
204 |
--- a/sci-mathematics/rstudio/files/rstudio-1.0.44-paths.patch |
205 |
+++ /dev/null |
206 |
@@ -1,130 +0,0 @@ |
207 |
---- rstudio-1.0.44-orig/CMakeGlobals.txt 2016-10-19 08:32:41.000000000 +1100 |
208 |
-+++ rstudio-1.0.44/CMakeGlobals.txt 2016-12-01 23:33:04.149326324 +1100 |
209 |
-@@ -123,7 +123,7 @@ |
210 |
- else() |
211 |
- set(RSTUDIO_INSTALL_BIN bin) |
212 |
- endif() |
213 |
-- set(RSTUDIO_INSTALL_SUPPORTING .) |
214 |
-+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) |
215 |
- endif() |
216 |
- |
217 |
- # if the install prefix is /usr/local then tweak as appropriate |
218 |
---- rstudio-1.0.44-orig/src/cpp/server/CMakeLists.txt 2016-10-19 08:32:41.000000000 +1100 |
219 |
-+++ rstudio-1.0.44/src/cpp/server/CMakeLists.txt 2016-12-01 23:35:51.634862018 +1100 |
220 |
-@@ -155,7 +155,7 @@ |
221 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in |
222 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) |
223 |
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} |
224 |
-- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) |
225 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) |
226 |
- |
227 |
- # install configured redhat init.d script |
228 |
- set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") |
229 |
-@@ -163,7 +163,7 @@ |
230 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in |
231 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) |
232 |
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} |
233 |
-- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) |
234 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) |
235 |
- |
236 |
- # install configured suse init.d script |
237 |
- set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") |
238 |
-@@ -171,13 +171,13 @@ |
239 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in |
240 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) |
241 |
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} |
242 |
-- DESTINATION ${RSERVER_INITD_SUSE_DIR}) |
243 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) |
244 |
- |
245 |
- # install pam profile |
246 |
- set(RSERVER_PAM_DIR "extras/pam") |
247 |
- set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") |
248 |
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} |
249 |
-- DESTINATION ${RSERVER_PAM_DIR}) |
250 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) |
251 |
- |
252 |
- # install configured apparmor profile |
253 |
- set(RSERVER_APPARMOR_DIR "extras/apparmor") |
254 |
-@@ -185,9 +185,9 @@ |
255 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_PROFILE}.in |
256 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE}) |
257 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_APPARMOR_PROFILE} |
258 |
-- DESTINATION ${RSERVER_APPARMOR_DIR}) |
259 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) |
260 |
- install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_APPARMOR_DIR}/apparmor-profile-load |
261 |
-- DESTINATION ${RSERVER_APPARMOR_DIR}) |
262 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_APPARMOR_DIR}) |
263 |
- |
264 |
- # install configured upstart profile |
265 |
- set(RSERVER_UPSTART_DIR "extras/upstart") |
266 |
-@@ -195,12 +195,12 @@ |
267 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in |
268 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) |
269 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} |
270 |
-- DESTINATION ${RSERVER_UPSTART_DIR}) |
271 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) |
272 |
- set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") |
273 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in |
274 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) |
275 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} |
276 |
-- DESTINATION ${RSERVER_UPSTART_DIR}) |
277 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) |
278 |
- |
279 |
- # install configured systemd profile |
280 |
- set(RSERVER_SYSTEMD_DIR "extras/systemd") |
281 |
---- rstudio-1.0.44-orig/src/cpp/server/ServerOptions.cpp 2016-10-19 08:32:41.000000000 +1100 |
282 |
-+++ rstudio-1.0.44/src/cpp/server/ServerOptions.cpp 2016-12-01 23:33:04.151326331 +1100 |
283 |
-@@ -386,8 +386,8 @@ |
284 |
- |
285 |
- // convert relative paths by completing from the system installation |
286 |
- // path (this allows us to be relocatable) |
287 |
-- resolvePath(resourcePath, &wwwLocalPath_); |
288 |
-- resolvePath(resourcePath, &wwwSymbolMapsPath_); |
289 |
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); |
290 |
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); |
291 |
- resolvePath(binaryPath, &authPamHelperPath_); |
292 |
- resolvePath(binaryPath, &rsessionPath_); |
293 |
- resolvePath(binaryPath, &rldpathPath_); |
294 |
---- rstudio-1.0.44-orig/src/cpp/session/SessionOptions.cpp 2016-10-19 08:32:41.000000000 +1100 |
295 |
-+++ rstudio-1.0.44/src/cpp/session/SessionOptions.cpp 2016-12-01 23:33:04.151326331 +1100 |
296 |
-@@ -49,7 +49,7 @@ |
297 |
- namespace session { |
298 |
- |
299 |
- namespace { |
300 |
--const char* const kDefaultPandocPath = "bin/pandoc"; |
301 |
-+const char* const kDefaultPandocPath = "bin"; |
302 |
- const char* const kDefaultPostbackPath = "bin/postback/rpostback"; |
303 |
- const char* const kDefaultRsclangPath = "bin/rsclang"; |
304 |
- |
305 |
-@@ -481,14 +481,14 @@ |
306 |
- } |
307 |
- |
308 |
- // convert relative paths by completing from the app resource path |
309 |
-- resolvePath(resourcePath_, &rResourcesPath_); |
310 |
-- resolvePath(resourcePath_, &agreementFilePath_); |
311 |
-- resolvePath(resourcePath_, &wwwLocalPath_); |
312 |
-- resolvePath(resourcePath_, &wwwSymbolMapsPath_); |
313 |
-- resolvePath(resourcePath_, &coreRSourcePath_); |
314 |
-- resolvePath(resourcePath_, &modulesRSourcePath_); |
315 |
-- resolvePath(resourcePath_, &sessionLibraryPath_); |
316 |
-- resolvePath(resourcePath_, &sessionPackageArchivesPath_); |
317 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); |
318 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); |
319 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); |
320 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); |
321 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); |
322 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); |
323 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); |
324 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); |
325 |
- resolvePostbackPath(resourcePath_, &rpostbackPath_); |
326 |
- #ifdef _WIN32 |
327 |
- resolvePath(resourcePath_, &consoleIoPath_); |
328 |
-@@ -498,7 +498,7 @@ |
329 |
- resolvePath(resourcePath_, &sumatraPath_); |
330 |
- resolvePath(resourcePath_, &winutilsPath_); |
331 |
- #endif |
332 |
-- resolvePath(resourcePath_, &hunspellDictionariesPath_); |
333 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); |
334 |
- resolvePath(resourcePath_, &mathjaxPath_); |
335 |
- resolvePath(resourcePath_, &libclangHeadersPath_); |
336 |
- resolvePandocPath(resourcePath_, &pandocPath_); |
337 |
|
338 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch |
339 |
deleted file mode 100644 |
340 |
index 28b0220912a..00000000000 |
341 |
--- a/sci-mathematics/rstudio/files/rstudio-1.1.357-clang-pandoc.patch |
342 |
+++ /dev/null |
343 |
@@ -1,76 +0,0 @@ |
344 |
-Index: rstudio-1.1.357/src/cpp/session/CMakeLists.txt |
345 |
-=================================================================== |
346 |
---- rstudio-1.1.357.orig/src/cpp/session/CMakeLists.txt |
347 |
-+++ rstudio-1.1.357/src/cpp/session/CMakeLists.txt |
348 |
-@@ -25,9 +25,6 @@ endif() |
349 |
- if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") |
350 |
- message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") |
351 |
- endif() |
352 |
--if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") |
353 |
-- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") |
354 |
--endif() |
355 |
- |
356 |
- # we often install embedded versions of these packages but don't do so currently |
357 |
- |
358 |
-@@ -38,22 +35,6 @@ endif() |
359 |
- # message(FATAL_ERROR "rsconnect package not found (re-run install-dependencies script to install)") |
360 |
- # endif() |
361 |
- |
362 |
--# verify libclang is installed |
363 |
--if(WIN32) |
364 |
-- set(LIBCLANG_VERSION "3.4") |
365 |
--else() |
366 |
-- set(LIBCLANG_VERSION "3.5") |
367 |
--endif() |
368 |
--set(LIBCLANG_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/${LIBCLANG_VERSION}") |
369 |
--if(NOT EXISTS "${LIBCLANG_DIR}") |
370 |
-- message(FATAL_ERROR "libclang ${LIBCLANG_VERSION} not found (re-run install-dependencies script to install)") |
371 |
--endif() |
372 |
--set(LIBCLANG_HEADERS_DIR "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers") |
373 |
--if(NOT EXISTS "${LIBCLANG_HEADERS_DIR}") |
374 |
-- message(FATAL_ERROR "libclang builtin-headers not found (re-run install-dependencies script to install)") |
375 |
--endif() |
376 |
-- |
377 |
-- |
378 |
- # include files |
379 |
- file(GLOB_RECURSE SESSION_HEADER_FILES "*.h*") |
380 |
- |
381 |
-@@ -465,13 +446,6 @@ if (NOT RSTUDIO_SESSION_WIN64) |
382 |
- install(DIRECTORY "resources/connections" |
383 |
- DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) |
384 |
- |
385 |
-- # install pandoc |
386 |
-- set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/1.19.2.1") |
387 |
-- file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") |
388 |
-- install(FILES ${PANDOC_FILES} |
389 |
-- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE |
390 |
-- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) |
391 |
-- |
392 |
- # install rmarkdown package |
393 |
- # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") |
394 |
- # install(FILES ${RMARKDOWN_PACKAGE} |
395 |
-@@ -502,24 +476,6 @@ if (NOT RSTUDIO_SESSION_WIN64) |
396 |
- install(DIRECTORY "resources/profiler" |
397 |
- DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) |
398 |
- |
399 |
-- # install libclang |
400 |
-- if(WIN32) |
401 |
-- file(GLOB LIBCLANG_32_FILES "${LIBCLANG_DIR}/x86/libclang.*") |
402 |
-- install(PROGRAMS ${LIBCLANG_32_FILES} |
403 |
-- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86) |
404 |
-- file(GLOB LIBCLANG_64_FILES "${LIBCLANG_DIR}/x86_64/libclang.*") |
405 |
-- install(PROGRAMS ${LIBCLANG_64_FILES} |
406 |
-- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang/x86_64) |
407 |
-- else() |
408 |
-- file(GLOB_RECURSE LIBCLANG_FILES "${LIBCLANG_DIR}/libclang.*") |
409 |
-- install(PROGRAMS ${LIBCLANG_FILES} |
410 |
-- DESTINATION ${RSTUDIO_INSTALL_BIN}/rsclang) |
411 |
-- endif() |
412 |
-- |
413 |
-- # install libclang builtin-headers |
414 |
-- install(DIRECTORY "${RSTUDIO_DEPENDENCIES_DIR}/common/libclang/builtin-headers" |
415 |
-- DESTINATION "${RSTUDIO_INSTALL_SUPPORTING}/resources/libclang") |
416 |
-- |
417 |
- # install winpty on windows |
418 |
- if(WIN32) |
419 |
- install(PROGRAMS "${WINPTY_BINDIR_32}/winpty.dll" |
420 |
|
421 |
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 |
422 |
deleted file mode 100644 |
423 |
index 760c9b56105..00000000000 |
424 |
--- a/sci-mathematics/rstudio/files/rstudio-1.1.453-boost-1.67.0.patch |
425 |
+++ /dev/null |
426 |
@@ -1,38 +0,0 @@ |
427 |
---- rstudio-1.1.453-orig/src/cpp/core/DateTime.cpp 2018-05-15 04:19:30.000000000 +1000 |
428 |
-+++ rstudio-1.1.453/src/cpp/core/DateTime.cpp 2018-07-02 16:19:21.335703471 +1000 |
429 |
-@@ -65,7 +65,7 @@ |
430 |
- using namespace boost::posix_time; |
431 |
- |
432 |
- ptime time_t_epoch(date(1970,1,1)); |
433 |
-- return time_t_epoch + seconds(sec); |
434 |
-+ return time_t_epoch + seconds(static_cast<long>(sec)); |
435 |
- } |
436 |
- |
437 |
- boost::posix_time::ptime timeFromMillisecondsSinceEpoch(int64_t ms) |
438 |
---- rstudio-1.1.453-orig/src/cpp/core/file_lock/FileLock.cpp 2018-05-15 04:19:30.000000000 +1000 |
439 |
-+++ rstudio-1.1.453/src/cpp/core/file_lock/FileLock.cpp 2018-07-02 17:00:35.915695201 +1000 |
440 |
-@@ -133,11 +133,11 @@ |
441 |
- |
442 |
- // timeout interval |
443 |
- double timeoutInterval = getFieldPositive(settings, "timeout-interval", kDefaultTimeoutInterval); |
444 |
-- FileLock::s_timeoutInterval = boost::posix_time::seconds(timeoutInterval); |
445 |
-+ FileLock::s_timeoutInterval = boost::posix_time::seconds(static_cast<long>(timeoutInterval)); |
446 |
- |
447 |
- // refresh rate |
448 |
- double refreshRate = getFieldPositive(settings, "refresh-rate", kDefaultRefreshRate); |
449 |
-- FileLock::s_refreshRate = boost::posix_time::seconds(refreshRate); |
450 |
-+ FileLock::s_refreshRate = boost::posix_time::seconds(static_cast<long>(refreshRate)); |
451 |
- |
452 |
- // logging |
453 |
- bool loggingEnabled = settings.getBool("enable-logging", false); |
454 |
-@@ -212,8 +212,8 @@ |
455 |
- |
456 |
- // default values for static members |
457 |
- FileLock::LockType FileLock::s_defaultType(FileLock::LOCKTYPE_LINKBASED); |
458 |
--boost::posix_time::seconds FileLock::s_timeoutInterval(kDefaultTimeoutInterval); |
459 |
--boost::posix_time::seconds FileLock::s_refreshRate(kDefaultRefreshRate); |
460 |
-+boost::posix_time::seconds FileLock::s_timeoutInterval(static_cast<long>(kDefaultTimeoutInterval)); |
461 |
-+boost::posix_time::seconds FileLock::s_refreshRate(static_cast<long>(kDefaultRefreshRate)); |
462 |
- bool FileLock::s_loggingEnabled(false); |
463 |
- bool FileLock::s_isLoadBalanced(false); |
464 |
- FilePath FileLock::s_logFile; |
465 |
|
466 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch b/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch |
467 |
deleted file mode 100644 |
468 |
index 641f7710167..00000000000 |
469 |
--- a/sci-mathematics/rstudio/files/rstudio-1.1.453-core.patch |
470 |
+++ /dev/null |
471 |
@@ -1,143 +0,0 @@ |
472 |
---- rstudio-1.1.453-orig/src/cpp/session/SessionClientInit.cpp 2018-05-15 04:19:30.000000000 +1000 |
473 |
-+++ rstudio-1.1.453/src/cpp/session/SessionClientInit.cpp 2018-07-02 20:21:41.595654877 +1000 |
474 |
-@@ -105,7 +105,7 @@ |
475 |
- } |
476 |
- |
477 |
- // prepare session info |
478 |
-- json::Object sessionInfo ; |
479 |
-+ core::json::Object sessionInfo ; |
480 |
- sessionInfo["clientId"] = clientId; |
481 |
- sessionInfo["mode"] = options.programMode(); |
482 |
- |
483 |
-@@ -119,8 +119,8 @@ |
484 |
- } |
485 |
- |
486 |
- // temp dir |
487 |
-- FilePath tempDir = rstudio::r::session::utils::tempDir(); |
488 |
-- Error error = tempDir.ensureDirectory(); |
489 |
-+ core::FilePath tempDir = rstudio::r::session::utils::tempDir(); |
490 |
-+ core::Error error = tempDir.ensureDirectory(); |
491 |
- if (error) |
492 |
- LOG_ERROR(error); |
493 |
- sessionInfo["temp_dir"] = tempDir.absolutePath(); |
494 |
-@@ -132,12 +132,12 @@ |
495 |
- sessionInfo["prompt"] = rstudio::r::options::getOption<std::string>("prompt"); |
496 |
- |
497 |
- // client state |
498 |
-- json::Object clientStateObject; |
499 |
-+ core::json::Object clientStateObject; |
500 |
- rstudio::r::session::clientState().currentState(&clientStateObject); |
501 |
- sessionInfo["client_state"] = clientStateObject; |
502 |
- |
503 |
- // source documents |
504 |
-- json::Array jsonDocs; |
505 |
-+ core::json::Array jsonDocs; |
506 |
- error = modules::source::clientInitDocuments(&jsonDocs); |
507 |
- if (error) |
508 |
- LOG_ERROR(error); |
509 |
-@@ -159,7 +159,7 @@ |
510 |
- if (resumed) |
511 |
- { |
512 |
- // console actions |
513 |
-- json::Object actionsObject; |
514 |
-+ core::json::Object actionsObject; |
515 |
- consoleActions.asJson(&actionsObject); |
516 |
- sessionInfo["console_actions"] = actionsObject; |
517 |
- } |
518 |
-@@ -211,12 +211,12 @@ |
519 |
- } |
520 |
- else |
521 |
- { |
522 |
-- sessionInfo["active_project_file"] = json::Value(); |
523 |
-- sessionInfo["project_ui_prefs"] = json::Value(); |
524 |
-- sessionInfo["project_open_docs"] = json::Value(); |
525 |
-+ sessionInfo["active_project_file"] = core::json::Value(); |
526 |
-+ sessionInfo["project_ui_prefs"] = core::json::Value(); |
527 |
-+ sessionInfo["project_open_docs"] = core::json::Value(); |
528 |
- sessionInfo["project_supports_sharing"] = false; |
529 |
- sessionInfo["project_owned_by_user"] = false; |
530 |
-- sessionInfo["project_user_data_directory"] = json::Value(); |
531 |
-+ sessionInfo["project_user_data_directory"] = core::json::Value(); |
532 |
- } |
533 |
- |
534 |
- sessionInfo["system_encoding"] = std::string(::locale2charset(NULL)); |
535 |
-@@ -253,20 +253,20 @@ |
536 |
- sessionInfo["build_tools_bookdown_website"] = |
537 |
- module_context::isBookdownWebsite(); |
538 |
- |
539 |
-- FilePath buildTargetDir = projects::projectContext().buildTargetPath(); |
540 |
-+ core::FilePath buildTargetDir = projects::projectContext().buildTargetPath(); |
541 |
- if (!buildTargetDir.empty()) |
542 |
- { |
543 |
- sessionInfo["build_target_dir"] = module_context::createAliasedPath( |
544 |
- buildTargetDir); |
545 |
-- sessionInfo["has_pkg_src"] = (type == r_util::kBuildTypePackage) && |
546 |
-+ sessionInfo["has_pkg_src"] = (type == core::r_util::kBuildTypePackage) && |
547 |
- buildTargetDir.childPath("src").exists(); |
548 |
- sessionInfo["has_pkg_vig"] = |
549 |
-- (type == r_util::kBuildTypePackage) && |
550 |
-+ (type == core::r_util::kBuildTypePackage) && |
551 |
- buildTargetDir.childPath("vignettes").exists(); |
552 |
- } |
553 |
- else |
554 |
- { |
555 |
-- sessionInfo["build_target_dir"] = json::Value(); |
556 |
-+ sessionInfo["build_target_dir"] = core::json::Value(); |
557 |
- sessionInfo["has_pkg_src"] = false; |
558 |
- sessionInfo["has_pkg_vig"] = false; |
559 |
- } |
560 |
-@@ -274,9 +274,9 @@ |
561 |
- } |
562 |
- else |
563 |
- { |
564 |
-- sessionInfo["build_tools_type"] = r_util::kBuildTypeNone; |
565 |
-+ sessionInfo["build_tools_type"] = core::r_util::kBuildTypeNone; |
566 |
- sessionInfo["build_tools_bookdown_website"] = false; |
567 |
-- sessionInfo["build_target_dir"] = json::Value(); |
568 |
-+ sessionInfo["build_target_dir"] = core::json::Value(); |
569 |
- sessionInfo["has_pkg_src"] = false; |
570 |
- sessionInfo["has_pkg_vig"] = false; |
571 |
- } |
572 |
-@@ -285,7 +285,7 @@ |
573 |
- sessionInfo["presentation_commands"] = options.allowPresentationCommands(); |
574 |
- |
575 |
- sessionInfo["tutorial_api_available"] = false; |
576 |
-- sessionInfo["tutorial_api_client_origin"] = json::Value(); |
577 |
-+ sessionInfo["tutorial_api_client_origin"] = core::json::Value(); |
578 |
- |
579 |
- sessionInfo["build_state"] = modules::build::buildStateAsJson(); |
580 |
- sessionInfo["devtools_installed"] = module_context::isMinimumDevtoolsInstalled(); |
581 |
-@@ -296,7 +296,7 @@ |
582 |
- |
583 |
- // console history -- we do this at the end because |
584 |
- // restoreBuildRestartContext may have reset it |
585 |
-- json::Array historyArray; |
586 |
-+ core::json::Array historyArray; |
587 |
- rstudio::r::session::consoleHistory().asJson(&historyArray); |
588 |
- sessionInfo["console_history"] = historyArray; |
589 |
- sessionInfo["console_history_capacity"] = |
590 |
-@@ -364,13 +364,13 @@ |
591 |
- |
592 |
- sessionInfo["multi_session"] = options.multiSession(); |
593 |
- |
594 |
-- json::Object rVersionsJson; |
595 |
-+ core::json::Object rVersionsJson; |
596 |
- rVersionsJson["r_version"] = module_context::rVersion(); |
597 |
- rVersionsJson["r_home_dir"] = module_context::rHomeDir(); |
598 |
- sessionInfo["r_versions_info"] = rVersionsJson; |
599 |
- |
600 |
- sessionInfo["show_user_home_page"] = options.showUserHomePage(); |
601 |
-- sessionInfo["user_home_page_url"] = json::Value(); |
602 |
-+ sessionInfo["user_home_page_url"] = core::json::Value(); |
603 |
- |
604 |
- sessionInfo["r_addins"] = modules::r_addins::addinRegistryAsJson(); |
605 |
- sessionInfo["package_provided_extensions"] = modules::ppe::indexer().getPayload(); |
606 |
-@@ -394,7 +394,7 @@ |
607 |
- |
608 |
- // send response (we always set kEventsPending to false so that the client |
609 |
- // won't poll for events until it is ready) |
610 |
-- json::JsonRpcResponse jsonRpcResponse ; |
611 |
-+ core::json::JsonRpcResponse jsonRpcResponse ; |
612 |
- jsonRpcResponse.setField(kEventsPending, "false"); |
613 |
- jsonRpcResponse.setResult(sessionInfo) ; |
614 |
- ptrConnection->sendJsonRpcResponse(jsonRpcResponse); |
615 |
|
616 |
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 |
617 |
deleted file mode 100644 |
618 |
index a7a48572de3..00000000000 |
619 |
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p1.patch |
620 |
+++ /dev/null |
621 |
@@ -1,460 +0,0 @@ |
622 |
---- /dev/null 2019-03-19 11:03:33.121000004 +1100 |
623 |
-+++ rstudio-1.1.463/src/cpp/core/include/core/BoostSignals.hpp 2018-11-17 21:24:35.285976284 +1100 |
624 |
-@@ -0,0 +1,40 @@ |
625 |
-+/* |
626 |
-+ * BoostSignals.hpp |
627 |
-+ * |
628 |
-+ * Copyright (C) 2009-18 by RStudio, Inc. |
629 |
-+ * |
630 |
-+ * Unless you have received this program directly from RStudio pursuant |
631 |
-+ * to the terms of a commercial license agreement with RStudio, then |
632 |
-+ * this program is licensed to you under the terms of version 3 of the |
633 |
-+ * GNU Affero General Public License. This program is distributed WITHOUT |
634 |
-+ * ANY EXPRESS OR IMPLIED WARRANTY, INCLUDING THOSE OF NON-INFRINGEMENT, |
635 |
-+ * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Please refer to the |
636 |
-+ * AGPL (http://www.gnu.org/licenses/agpl-3.0.txt) for more details. |
637 |
-+ * |
638 |
-+ */ |
639 |
-+ |
640 |
-+#ifndef CORE_RSTUDIO_BOOST_SIGNALS_HPP |
641 |
-+#define CORE_RSTUDIO_BOOST_SIGNALS_HPP |
642 |
-+ |
643 |
-+#if RSTUDIO_BOOST_SIGNALS_VERSION == 1 |
644 |
-+ |
645 |
-+# include <boost/signals.hpp> |
646 |
-+# define RSTUDIO_BOOST_SIGNAL boost::signal |
647 |
-+# define RSTUDIO_BOOST_CONNECTION boost::signals::connection |
648 |
-+# define RSTUDIO_BOOST_SCOPED_CONNECTION boost::signals::scoped_connection |
649 |
-+# define RSTUDIO_BOOST_LAST_VALUE boost::last_value |
650 |
-+ |
651 |
-+#elif RSTUDIO_BOOST_SIGNALS_VERSION == 2 |
652 |
-+ |
653 |
-+# include <boost/signals2.hpp> |
654 |
-+# define RSTUDIO_BOOST_SIGNAL boost::signals2::signal |
655 |
-+# define RSTUDIO_BOOST_CONNECTION boost::signals2::connection |
656 |
-+# define RSTUDIO_BOOST_SCOPED_CONNECTION boost::signals2::scoped_connection |
657 |
-+# define RSTUDIO_BOOST_LAST_VALUE boost::signals2::last_value |
658 |
-+ |
659 |
-+#else |
660 |
-+# error "Unrecognized RSTUDIO_BOOST_SIGNALS_VERSION" |
661 |
-+#endif |
662 |
-+ |
663 |
-+#endif // CORE_RSTUDIO_BOOST_SIGNALS_HPP |
664 |
-+ |
665 |
---- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-10-25 09:42:55.000000000 +1100 |
666 |
-+++ rstudio-1.1.463/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100 |
667 |
-@@ -208,6 +208,18 @@ |
668 |
- message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}") |
669 |
- endif() |
670 |
- |
671 |
-+# allow opt-in to using Boost.Signals2 |
672 |
-+# TODO: remove this in RStudio v1.3 and port to signals2 |
673 |
-+if(NOT RSTUDIO_BOOST_SIGNALS_VERSION) |
674 |
-+ if (BOOST_VERSION VERSION_LESS 1.69.0) |
675 |
-+ set(RSTUDIO_BOOST_SIGNALS_VERSION 1) |
676 |
-+ else() |
677 |
-+ set(RSTUDIO_BOOST_SIGNALS_VERSION 2) |
678 |
-+ endif() |
679 |
-+endif() |
680 |
-+ |
681 |
-+message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}") |
682 |
-+add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION}) |
683 |
- |
684 |
- # add boost as system include directory |
685 |
- include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) |
686 |
---- rstudio-1.1.463-orig/src/cpp/r/include/r/session/RConsoleHistory.hpp 2018-10-25 09:42:55.000000000 +1100 |
687 |
-+++ rstudio-1.1.463/src/cpp/r/include/r/session/RConsoleHistory.hpp 2018-11-17 21:24:35.285976284 +1100 |
688 |
-@@ -20,8 +20,8 @@ |
689 |
- |
690 |
- #include <boost/utility.hpp> |
691 |
- #include <boost/circular_buffer.hpp> |
692 |
--#include <boost/signal.hpp> |
693 |
- |
694 |
-+#include <core/BoostSignals.hpp> |
695 |
- #include <core/json/Json.hpp> |
696 |
- |
697 |
- namespace rstudio { |
698 |
-@@ -44,7 +44,7 @@ |
699 |
- public: |
700 |
- typedef boost::circular_buffer<std::string>::value_type value_type; |
701 |
- typedef boost::circular_buffer<std::string>::const_iterator const_iterator; |
702 |
-- typedef boost::signal<void (const std::string&)> AddSignal; |
703 |
-+ typedef RSTUDIO_BOOST_SIGNAL<void (const std::string&)> AddSignal; |
704 |
- |
705 |
- private: |
706 |
- ConsoleHistory(); |
707 |
-@@ -86,8 +86,7 @@ |
708 |
- core::Error loadFromFile(const core::FilePath& filePath, bool verifyFile); |
709 |
- core::Error saveToFile(const core::FilePath& filePath) const; |
710 |
- |
711 |
-- boost::signals::connection connectOnAdd( |
712 |
-- const AddSignal::slot_function_type& slot) |
713 |
-+ RSTUDIO_BOOST_CONNECTION connectOnAdd(const AddSignal::slot_function_type& slot) |
714 |
- { |
715 |
- return onAdd_.connect(slot); |
716 |
- } |
717 |
---- rstudio-1.1.463-orig/src/cpp/r/include/r/session/RGraphics.hpp 2018-10-25 09:42:55.000000000 +1100 |
718 |
-+++ rstudio-1.1.463/src/cpp/r/include/r/session/RGraphics.hpp 2018-11-17 21:24:35.286976293 +1100 |
719 |
-@@ -19,6 +19,8 @@ |
720 |
- #include <boost/system/error_code.hpp> |
721 |
- #include <boost/date_time/posix_time/ptime.hpp> |
722 |
- |
723 |
-+#include <core/BoostSignals.hpp> |
724 |
-+ |
725 |
- namespace rstudio { |
726 |
- namespace r { |
727 |
- namespace session { |
728 |
-@@ -56,8 +58,8 @@ |
729 |
- #include <vector> |
730 |
- |
731 |
- #include <boost/function.hpp> |
732 |
--#include <boost/signal.hpp> |
733 |
- |
734 |
-+#include <core/BoostSignals.hpp> |
735 |
- #include <core/Error.hpp> |
736 |
- #include <core/json/Json.hpp> |
737 |
- |
738 |
-@@ -162,7 +164,7 @@ |
739 |
- virtual void clear() = 0; |
740 |
- |
741 |
- // subscribe to showManipulator event |
742 |
-- virtual boost::signal<void ()>& onShowManipulator() = 0; |
743 |
-+ virtual RSTUDIO_BOOST_SIGNAL<void ()>& onShowManipulator() = 0; |
744 |
- |
745 |
- // set manipulator values |
746 |
- virtual void setPlotManipulatorValues(const core::json::Object& values) = 0; |
747 |
---- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManager.cpp 2018-10-25 09:42:55.000000000 +1100 |
748 |
-+++ rstudio-1.1.463/src/cpp/r/session/graphics/RGraphicsPlotManager.cpp 2018-11-17 21:24:35.286976293 +1100 |
749 |
-@@ -540,7 +540,7 @@ |
750 |
- |
751 |
- |
752 |
- |
753 |
--boost::signal<void ()>& PlotManager::onShowManipulator() |
754 |
-+RSTUDIO_BOOST_SIGNAL<void ()>& PlotManager::onShowManipulator() |
755 |
- { |
756 |
- return plotManipulatorManager().onShowManipulator(); |
757 |
- } |
758 |
---- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManager.hpp 2018-10-25 09:42:55.000000000 +1100 |
759 |
-+++ rstudio-1.1.463/src/cpp/r/session/graphics/RGraphicsPlotManager.hpp 2018-11-17 21:24:35.287976303 +1100 |
760 |
-@@ -22,10 +22,10 @@ |
761 |
- #include <boost/utility.hpp> |
762 |
- #include <boost/shared_ptr.hpp> |
763 |
- #include <boost/function.hpp> |
764 |
--#include <boost/signal.hpp> |
765 |
- #include <boost/regex.hpp> |
766 |
- #include <boost/circular_buffer.hpp> |
767 |
- |
768 |
-+#include <core/BoostSignals.hpp> |
769 |
- #include <core/Error.hpp> |
770 |
- #include <core/FilePath.hpp> |
771 |
- |
772 |
-@@ -45,10 +45,10 @@ |
773 |
- |
774 |
- struct GraphicsDeviceEvents |
775 |
- { |
776 |
-- boost::signal<void (SEXP)> onNewPage; |
777 |
-- boost::signal<void ()> onDrawing; |
778 |
-- boost::signal<void ()> onResized; |
779 |
-- boost::signal<void ()> onClosed; |
780 |
-+ RSTUDIO_BOOST_SIGNAL<void (SEXP)> onNewPage; |
781 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onDrawing; |
782 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onResized; |
783 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onClosed; |
784 |
- }; |
785 |
- |
786 |
- class PlotManipulatorManager; |
787 |
-@@ -110,7 +110,7 @@ |
788 |
- |
789 |
- virtual void clear(); |
790 |
- |
791 |
-- virtual boost::signal<void ()>& onShowManipulator() ; |
792 |
-+ virtual RSTUDIO_BOOST_SIGNAL<void ()>& onShowManipulator() ; |
793 |
- virtual void setPlotManipulatorValues(const core::json::Object& values); |
794 |
- virtual void manipulatorPlotClicked(int x, int y); |
795 |
- |
796 |
---- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.cpp 2018-10-25 09:42:55.000000000 +1100 |
797 |
-+++ rstudio-1.1.463/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.cpp 2018-11-17 21:24:35.287976303 +1100 |
798 |
-@@ -184,7 +184,7 @@ |
799 |
- } |
800 |
- |
801 |
- |
802 |
--boost::signal<void ()>& PlotManipulatorManager::onShowManipulator() |
803 |
-+RSTUDIO_BOOST_SIGNAL<void ()>& PlotManipulatorManager::onShowManipulator() |
804 |
- { |
805 |
- return onShowManipulator_; |
806 |
- } |
807 |
---- rstudio-1.1.463-orig/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.hpp 2018-10-25 09:42:55.000000000 +1100 |
808 |
-+++ rstudio-1.1.463/src/cpp/r/session/graphics/RGraphicsPlotManipulatorManager.hpp 2018-11-17 21:24:35.287976303 +1100 |
809 |
-@@ -16,8 +16,7 @@ |
810 |
- #ifndef R_SESSION_GRAPHICS_PLOT_MANIPULATOR_MANAGER_HPP |
811 |
- #define R_SESSION_GRAPHICS_PLOT_MANIPULATOR_MANAGER_HPP |
812 |
- |
813 |
--#include <boost/signal.hpp> |
814 |
-- |
815 |
-+#include <core/BoostSignals.hpp> |
816 |
- #include <core/Error.hpp> |
817 |
- #include <core/json/Json.hpp> |
818 |
- |
819 |
-@@ -53,7 +52,7 @@ |
820 |
- public: |
821 |
- core::Error initialize(const UnitConversionFunctions& convert); |
822 |
- |
823 |
-- boost::signal<void ()>& onShowManipulator() ; |
824 |
-+ RSTUDIO_BOOST_SIGNAL<void ()>& onShowManipulator() ; |
825 |
- void setPlotManipulatorValues(const core::json::Object& values); |
826 |
- void manipulatorPlotClicked(int x, int y); |
827 |
- |
828 |
-@@ -85,7 +84,7 @@ |
829 |
- bool replayingManipulator_; |
830 |
- |
831 |
- // manipulator event hook |
832 |
-- boost::signal<void ()> onShowManipulator_; |
833 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onShowManipulator_; |
834 |
- |
835 |
- // unit conversion function |
836 |
- UnitConversionFunctions convert_; |
837 |
---- rstudio-1.1.463-orig/src/cpp/server/include/server/ServerSessionManager.hpp 2018-10-25 09:42:55.000000000 +1100 |
838 |
-+++ rstudio-1.1.463/src/cpp/server/include/server/ServerSessionManager.hpp 2018-11-17 21:27:05.255436316 +1100 |
839 |
-@@ -20,9 +20,9 @@ |
840 |
- #include <vector> |
841 |
- #include <map> |
842 |
- |
843 |
--#include <boost/signals.hpp> |
844 |
- #include <boost/asio/io_service.hpp> |
845 |
- |
846 |
-+#include <core/BoostSignals.hpp> |
847 |
- #include <core/Thread.hpp> |
848 |
- |
849 |
- #include <core/system/PosixSystem.hpp> |
850 |
---- rstudio-1.1.463-orig/src/cpp/session/SessionMain.cpp 2018-10-25 09:42:55.000000000 +1100 |
851 |
-+++ rstudio-1.1.463/src/cpp/session/SessionMain.cpp 2018-11-17 21:24:35.288976313 +1100 |
852 |
-@@ -33,12 +33,12 @@ |
853 |
- #include <boost/lexical_cast.hpp> |
854 |
- #include <boost/format.hpp> |
855 |
- |
856 |
--#include <boost/signals.hpp> |
857 |
- #include <boost/date_time/posix_time/posix_time.hpp> |
858 |
- #include <boost/algorithm/string/predicate.hpp> |
859 |
- #include <boost/algorithm/string/join.hpp> |
860 |
- |
861 |
- #include <core/Error.hpp> |
862 |
-+#include <core/BoostSignals.hpp> |
863 |
- #include <core/BoostThread.hpp> |
864 |
- #include <core/ConfigUtils.hpp> |
865 |
- #include <core/FilePath.hpp> |
866 |
---- rstudio-1.1.463-orig/src/cpp/session/SessionModuleContext.cpp 2018-10-25 09:42:55.000000000 +1100 |
867 |
-+++ rstudio-1.1.463/src/cpp/session/SessionModuleContext.cpp 2018-11-17 21:24:35.289976322 +1100 |
868 |
-@@ -19,10 +19,10 @@ |
869 |
- |
870 |
- #include <boost/assert.hpp> |
871 |
- #include <boost/utility.hpp> |
872 |
--#include <boost/signal.hpp> |
873 |
- #include <boost/format.hpp> |
874 |
- #include <boost/numeric/conversion/cast.hpp> |
875 |
- |
876 |
-+#include <core/BoostSignals.hpp> |
877 |
- #include <core/BoostThread.hpp> |
878 |
- #include <core/Error.hpp> |
879 |
- #include <core/FilePath.hpp> |
880 |
-@@ -586,13 +586,13 @@ |
881 |
- |
882 |
- int nextGroup_; |
883 |
- |
884 |
-- boost::signal<void(const r::session::RSuspendOptions&,Settings*), |
885 |
-- boost::last_value<void>, |
886 |
-+ RSTUDIO_BOOST_SIGNAL<void(const r::session::RSuspendOptions&,Settings*), |
887 |
-+ RSTUDIO_BOOST_LAST_VALUE<void>, |
888 |
- int, |
889 |
- std::less<int> > suspendSignal_; |
890 |
- |
891 |
-- boost::signal<void(const Settings&), |
892 |
-- boost::last_value<void>, |
893 |
-+ RSTUDIO_BOOST_SIGNAL<void(const Settings&), |
894 |
-+ RSTUDIO_BOOST_LAST_VALUE<void>, |
895 |
- int, |
896 |
- std::greater<int> > resumeSignal_; |
897 |
- }; |
898 |
---- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionConsoleProcess.hpp 2018-10-25 09:42:55.000000000 +1100 |
899 |
-+++ rstudio-1.1.463/src/cpp/session/include/session/SessionConsoleProcess.hpp 2018-11-17 21:24:35.290976332 +1100 |
900 |
-@@ -20,10 +20,10 @@ |
901 |
- #include <deque> |
902 |
- |
903 |
- #include <boost/regex.hpp> |
904 |
--#include <boost/signals.hpp> |
905 |
- #include <boost/circular_buffer.hpp> |
906 |
- #include <boost/enable_shared_from_this.hpp> |
907 |
- |
908 |
-+#include <core/BoostSignals.hpp> |
909 |
- #include <core/system/Process.hpp> |
910 |
- #include <core/terminal/PrivateCommand.hpp> |
911 |
- |
912 |
-@@ -146,7 +146,7 @@ |
913 |
- void setPromptHandler( |
914 |
- const boost::function<bool(const std::string&, Input*)>& onPrompt); |
915 |
- |
916 |
-- boost::signal<void(int)>& onExit() { return onExit_; } |
917 |
-+ RSTUDIO_BOOST_SIGNAL<void(int)>& onExit() { return onExit_; } |
918 |
- |
919 |
- std::string handle() const { return procInfo_->getHandle(); } |
920 |
- InteractionMode interactionMode() const { return procInfo_->getInteractionMode(); } |
921 |
-@@ -264,7 +264,7 @@ |
922 |
- boost::mutex inputOutputQueueMutex_; |
923 |
- |
924 |
- boost::function<bool(const std::string&, Input*)> onPrompt_; |
925 |
-- boost::signal<void(int)> onExit_; |
926 |
-+ RSTUDIO_BOOST_SIGNAL<void(int)> onExit_; |
927 |
- |
928 |
- // regex for prompt detection |
929 |
- boost::regex controlCharsPattern_; |
930 |
---- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionModuleContext.hpp 2018-10-25 09:42:55.000000000 +1100 |
931 |
-+++ rstudio-1.1.463/src/cpp/session/include/session/SessionModuleContext.hpp 2018-11-17 21:28:25.019212857 +1100 |
932 |
-@@ -21,9 +21,9 @@ |
933 |
- |
934 |
- #include <boost/utility.hpp> |
935 |
- #include <boost/function.hpp> |
936 |
--#include <boost/signals.hpp> |
937 |
- #include <boost/shared_ptr.hpp> |
938 |
- |
939 |
-+#include <core/BoostSignals.hpp> |
940 |
- #include <core/HtmlUtils.hpp> |
941 |
- #include <core/system/System.hpp> |
942 |
- #include <core/system/ShellUtils.hpp> |
943 |
-@@ -315,35 +315,35 @@ |
944 |
- // session events |
945 |
- struct Events : boost::noncopyable |
946 |
- { |
947 |
-- boost::signal<void (core::json::Object*)> onSessionInfo; |
948 |
-- boost::signal<void ()> onClientInit; |
949 |
-- boost::signal<void ()> onBeforeExecute; |
950 |
-- boost::signal<void(const std::string&)> onConsolePrompt; |
951 |
-- boost::signal<void(const std::string&)> onConsoleInput; |
952 |
-- boost::signal<void(const std::string&, const std::string&)> |
953 |
-+ RSTUDIO_BOOST_SIGNAL<void (core::json::Object*)> onSessionInfo; |
954 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onClientInit; |
955 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onBeforeExecute; |
956 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&)> onConsolePrompt; |
957 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&)> onConsoleInput; |
958 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&)> |
959 |
- onActiveConsoleChanged; |
960 |
-- boost::signal<void (ConsoleOutputType, const std::string&)> |
961 |
-+ RSTUDIO_BOOST_SIGNAL<void (ConsoleOutputType, const std::string&)> |
962 |
- onConsoleOutput; |
963 |
-- boost::signal<void()> onUserInterrupt; |
964 |
-- boost::signal<void (ChangeSource)> onDetectChanges; |
965 |
-- boost::signal<void (core::FilePath)> onSourceEditorFileSaved; |
966 |
-- boost::signal<void(bool)> onDeferredInit; |
967 |
-- boost::signal<void(bool)> afterSessionInitHook; |
968 |
-- boost::signal<void(bool)> onBackgroundProcessing; |
969 |
-- boost::signal<void(bool)> onShutdown; |
970 |
-- boost::signal<void ()> onQuit; |
971 |
-- boost::signal<void ()> onDestroyed; |
972 |
-- boost::signal<void (const std::vector<std::string>&)> |
973 |
-+ RSTUDIO_BOOST_SIGNAL<void()> onUserInterrupt; |
974 |
-+ RSTUDIO_BOOST_SIGNAL<void (ChangeSource)> onDetectChanges; |
975 |
-+ RSTUDIO_BOOST_SIGNAL<void (core::FilePath)> onSourceEditorFileSaved; |
976 |
-+ RSTUDIO_BOOST_SIGNAL<void(bool)> onDeferredInit; |
977 |
-+ RSTUDIO_BOOST_SIGNAL<void(bool)> afterSessionInitHook; |
978 |
-+ RSTUDIO_BOOST_SIGNAL<void(bool)> onBackgroundProcessing; |
979 |
-+ RSTUDIO_BOOST_SIGNAL<void(bool)> onShutdown; |
980 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onQuit; |
981 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onDestroyed; |
982 |
-+ RSTUDIO_BOOST_SIGNAL<void (const std::vector<std::string>&)> |
983 |
- onLibPathsChanged; |
984 |
-- boost::signal<void (const std::string&)> onPackageLoaded; |
985 |
-- boost::signal<void ()> onPackageLibraryMutated; |
986 |
-- boost::signal<void ()> onPreferencesSaved; |
987 |
-- boost::signal<void (const core::DistributedEvent&)> |
988 |
-+ RSTUDIO_BOOST_SIGNAL<void (const std::string&)> onPackageLoaded; |
989 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onPackageLibraryMutated; |
990 |
-+ RSTUDIO_BOOST_SIGNAL<void ()> onPreferencesSaved; |
991 |
-+ RSTUDIO_BOOST_SIGNAL<void (const core::DistributedEvent&)> |
992 |
- onDistributedEvent; |
993 |
-- boost::signal<void (core::FilePath)> onPermissionsChanged; |
994 |
-+ RSTUDIO_BOOST_SIGNAL<void (core::FilePath)> onPermissionsChanged; |
995 |
- |
996 |
- // signal for detecting extended type of documents |
997 |
-- boost::signal<std::string(boost::shared_ptr<source_database::SourceDocument>), |
998 |
-+ RSTUDIO_BOOST_SIGNAL<std::string(boost::shared_ptr<source_database::SourceDocument>), |
999 |
- firstNonEmpty<std::string> > onDetectSourceExtendedType; |
1000 |
- }; |
1001 |
- |
1002 |
---- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionSourceDatabase.hpp 2018-10-25 09:42:55.000000000 +1100 |
1003 |
-+++ rstudio-1.1.463/src/cpp/session/include/session/SessionSourceDatabase.hpp 2018-11-17 21:24:35.291976342 +1100 |
1004 |
-@@ -21,8 +21,8 @@ |
1005 |
- |
1006 |
- #include <boost/utility.hpp> |
1007 |
- #include <boost/shared_ptr.hpp> |
1008 |
--#include <boost/signals.hpp> |
1009 |
- |
1010 |
-+#include <core/BoostSignals.hpp> |
1011 |
- #include <core/FilePath.hpp> |
1012 |
- #include <core/json/Json.hpp> |
1013 |
- |
1014 |
-@@ -204,14 +204,14 @@ |
1015 |
- // source database events |
1016 |
- struct Events : boost::noncopyable |
1017 |
- { |
1018 |
-- boost::signal<void(boost::shared_ptr<SourceDocument>)> onDocUpdated; |
1019 |
-- boost::signal<void(const std::string&, |
1020 |
-+ RSTUDIO_BOOST_SIGNAL<void(boost::shared_ptr<SourceDocument>)> onDocUpdated; |
1021 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, |
1022 |
- boost::shared_ptr<SourceDocument>)> onDocRenamed; |
1023 |
-- boost::signal<void(const std::string&)> onDocAdded; |
1024 |
-- boost::signal<void( |
1025 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&)> onDocAdded; |
1026 |
-+ RSTUDIO_BOOST_SIGNAL<void( |
1027 |
- boost::shared_ptr<source_database::SourceDocument>)> onDocPendingRemove; |
1028 |
-- boost::signal<void(const std::string&, const std::string&)> onDocRemoved; |
1029 |
-- boost::signal<void()> onRemoveAll; |
1030 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&)> onDocRemoved; |
1031 |
-+ RSTUDIO_BOOST_SIGNAL<void()> onRemoveAll; |
1032 |
- }; |
1033 |
- |
1034 |
- Events& events(); |
1035 |
---- rstudio-1.1.463-orig/src/cpp/session/include/session/SessionUserSettings.hpp 2018-10-25 09:42:55.000000000 +1100 |
1036 |
-+++ rstudio-1.1.463/src/cpp/session/include/session/SessionUserSettings.hpp 2018-11-17 21:24:35.291976342 +1100 |
1037 |
-@@ -20,8 +20,8 @@ |
1038 |
- |
1039 |
- #include <boost/utility.hpp> |
1040 |
- #include <boost/scoped_ptr.hpp> |
1041 |
--#include <boost/signal.hpp> |
1042 |
- |
1043 |
-+#include <core/BoostSignals.hpp> |
1044 |
- #include <core/Settings.hpp> |
1045 |
- #include <core/FilePath.hpp> |
1046 |
- #include <core/StringUtils.hpp> |
1047 |
-@@ -62,7 +62,7 @@ |
1048 |
- friend UserSettings& userSettings(); |
1049 |
- |
1050 |
- public: |
1051 |
-- boost::signal<void()> onChanged; |
1052 |
-+ RSTUDIO_BOOST_SIGNAL<void()> onChanged; |
1053 |
- |
1054 |
- public: |
1055 |
- // COPYING: boost::noncopyable |
1056 |
---- rstudio-1.1.463-orig/src/cpp/session/include/session/projects/SessionProjects.hpp 2018-10-25 09:42:55.000000000 +1100 |
1057 |
-+++ rstudio-1.1.463/src/cpp/session/include/session/projects/SessionProjects.hpp 2018-11-17 21:24:35.291976342 +1100 |
1058 |
-@@ -22,8 +22,8 @@ |
1059 |
- #include <boost/utility.hpp> |
1060 |
- #include <boost/shared_ptr.hpp> |
1061 |
- #include <boost/foreach.hpp> |
1062 |
--#include <boost/signals.hpp> |
1063 |
- |
1064 |
-+#include <core/BoostSignals.hpp> |
1065 |
- #include <core/FileInfo.hpp> |
1066 |
- #include <core/FilePath.hpp> |
1067 |
- #include <core/Settings.hpp> |
1068 |
-@@ -220,10 +220,10 @@ |
1069 |
- |
1070 |
- bool hasFileMonitor_; |
1071 |
- std::vector<std::string> monitorSubscribers_; |
1072 |
-- boost::signal<void(const tree<core::FileInfo>&)> onMonitoringEnabled_; |
1073 |
-- boost::signal<void(const std::vector<core::system::FileChangeEvent>&)> |
1074 |
-+ RSTUDIO_BOOST_SIGNAL<void(const tree<core::FileInfo>&)> onMonitoringEnabled_; |
1075 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::vector<core::system::FileChangeEvent>&)> |
1076 |
- onFilesChanged_; |
1077 |
-- boost::signal<void()> onMonitoringDisabled_; |
1078 |
-+ RSTUDIO_BOOST_SIGNAL<void()> onMonitoringDisabled_; |
1079 |
- }; |
1080 |
- |
1081 |
- ProjectContext& projectContext(); |
1082 |
|
1083 |
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 |
1084 |
deleted file mode 100644 |
1085 |
index d90ce005a1a..00000000000 |
1086 |
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p2.patch |
1087 |
+++ /dev/null |
1088 |
@@ -1,220 +0,0 @@ |
1089 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionPlots.hpp 2018-10-25 09:42:55.000000000 +1100 |
1090 |
-+++ rstudio-1.1.463/src/cpp/session/modules/SessionPlots.hpp 2018-11-17 21:24:35.292976352 +1100 |
1091 |
-@@ -16,7 +16,7 @@ |
1092 |
- #ifndef SESSION_PLOTS_HPP |
1093 |
- #define SESSION_PLOTS_HPP |
1094 |
- |
1095 |
--#include <boost/signals.hpp> |
1096 |
-+#include <core/BoostSignals.hpp> |
1097 |
- |
1098 |
- namespace rstudio { |
1099 |
- namespace core { |
1100 |
-@@ -35,9 +35,9 @@ |
1101 |
- |
1102 |
- struct Events : boost::noncopyable |
1103 |
- { |
1104 |
-- boost::signal<void()> onBeforeNewPlot; |
1105 |
-- boost::signal<void()> onBeforeNewGridPage; |
1106 |
-- boost::signal<void()> onNewPlot; |
1107 |
-+ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewPlot; |
1108 |
-+ RSTUDIO_BOOST_SIGNAL<void()> onBeforeNewGridPage; |
1109 |
-+ RSTUDIO_BOOST_SIGNAL<void()> onNewPlot; |
1110 |
- }; |
1111 |
- |
1112 |
- Events& events(); |
1113 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-10-25 09:42:55.000000000 +1100 |
1114 |
-+++ rstudio-1.1.463/src/cpp/session/modules/build/SessionSourceCpp.cpp 2018-11-17 21:24:35.293976361 +1100 |
1115 |
-@@ -15,11 +15,11 @@ |
1116 |
- |
1117 |
- #include "SessionSourceCpp.hpp" |
1118 |
- |
1119 |
--#include <boost/signal.hpp> |
1120 |
- #include <boost/algorithm/string/trim.hpp> |
1121 |
- #include <boost/algorithm/string/predicate.hpp> |
1122 |
- #include <boost/algorithm/string/join.hpp> |
1123 |
- |
1124 |
-+#include <core/BoostSignals.hpp> |
1125 |
- #include <core/Error.hpp> |
1126 |
- #include <core/FilePath.hpp> |
1127 |
- #include <core/StringUtils.hpp> |
1128 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-10-25 09:42:55.000000000 +1100 |
1129 |
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookAlternateEngines.cpp 2018-11-17 21:24:35.294976371 +1100 |
1130 |
-@@ -142,7 +142,7 @@ |
1131 |
- LOG_ERROR(error); |
1132 |
- |
1133 |
- // capture console output, error |
1134 |
-- boost::signals::scoped_connection consoleHandler = |
1135 |
-+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler = |
1136 |
- module_context::events().onConsoleOutput.connect( |
1137 |
- boost::bind(chunkConsoleOutputHandler, |
1138 |
- _1, |
1139 |
-@@ -219,7 +219,7 @@ |
1140 |
- LOG_ERROR(error); |
1141 |
- |
1142 |
- // capture console output, error |
1143 |
-- boost::signals::scoped_connection consoleHandler = |
1144 |
-+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler = |
1145 |
- module_context::events().onConsoleOutput.connect( |
1146 |
- boost::bind(chunkConsoleOutputHandler, |
1147 |
- _1, |
1148 |
-@@ -363,7 +363,7 @@ |
1149 |
- LOG_ERROR(error); |
1150 |
- |
1151 |
- // capture console output, error |
1152 |
-- boost::signals::scoped_connection consoleHandler = |
1153 |
-+ RSTUDIO_BOOST_SCOPED_CONNECTION consoleHandler = |
1154 |
- module_context::events().onConsoleOutput.connect( |
1155 |
- boost::bind(chunkConsoleOutputHandler, |
1156 |
- _1, |
1157 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-10-25 09:42:55.000000000 +1100 |
1158 |
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookCapture.cpp 2018-11-17 21:24:35.294976371 +1100 |
1159 |
-@@ -16,6 +16,8 @@ |
1160 |
- #include "SessionRmdNotebook.hpp" |
1161 |
- #include "NotebookCapture.hpp" |
1162 |
- |
1163 |
-+#include <boost/make_shared.hpp> |
1164 |
-+ |
1165 |
- namespace rstudio { |
1166 |
- namespace session { |
1167 |
- namespace modules { |
1168 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-10-25 09:42:55.000000000 +1100 |
1169 |
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.cpp 2018-11-17 21:24:35.295976381 +1100 |
1170 |
-@@ -441,7 +441,7 @@ |
1171 |
- } |
1172 |
- |
1173 |
- // unhook all our event handlers |
1174 |
-- BOOST_FOREACH(const boost::signals::connection connection, connections_) |
1175 |
-+ BOOST_FOREACH(const RSTUDIO_BOOST_CONNECTION connection, connections_) |
1176 |
- { |
1177 |
- connection.disconnect(); |
1178 |
- } |
1179 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-10-25 09:42:55.000000000 +1100 |
1180 |
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookExec.hpp 2018-11-17 21:24:35.295976381 +1100 |
1181 |
-@@ -18,8 +18,7 @@ |
1182 |
- |
1183 |
- #include <session/SessionModuleContext.hpp> |
1184 |
- |
1185 |
--#include <boost/signal.hpp> |
1186 |
-- |
1187 |
-+#include <core/BoostSignals.hpp> |
1188 |
- #include <core/json/Json.hpp> |
1189 |
- |
1190 |
- #include <r/RSexp.hpp> |
1191 |
-@@ -99,7 +98,7 @@ |
1192 |
- bool hasErrors_; |
1193 |
- |
1194 |
- std::vector<boost::shared_ptr<NotebookCapture> > captures_; |
1195 |
-- std::vector<boost::signals::connection> connections_; |
1196 |
-+ std::vector<RSTUDIO_BOOST_CONNECTION> connections_; |
1197 |
- }; |
1198 |
- |
1199 |
- } // namespace notebook |
1200 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-10-25 09:42:55.000000000 +1100 |
1201 |
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.cpp 2018-11-17 21:24:35.295976381 +1100 |
1202 |
-@@ -20,11 +20,12 @@ |
1203 |
- |
1204 |
- #include <boost/format.hpp> |
1205 |
- #include <boost/foreach.hpp> |
1206 |
--#include <boost/signals/connection.hpp> |
1207 |
- |
1208 |
--#include <core/system/FileMonitor.hpp> |
1209 |
--#include <core/StringUtils.hpp> |
1210 |
-+#include <core/BoostSignals.hpp> |
1211 |
- #include <core/Exec.hpp> |
1212 |
-+#include <core/StringUtils.hpp> |
1213 |
-+ |
1214 |
-+#include <core/system/FileMonitor.hpp> |
1215 |
- |
1216 |
- #include <session/SessionModuleContext.hpp> |
1217 |
- |
1218 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-10-25 09:42:55.000000000 +1100 |
1219 |
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookPlots.hpp 2018-11-17 21:24:35.296976391 +1100 |
1220 |
-@@ -18,8 +18,10 @@ |
1221 |
- #define SESSION_NOTEBOOK_PLOTS_HPP |
1222 |
- |
1223 |
- #include <boost/function.hpp> |
1224 |
--#include <boost/signals/connection.hpp> |
1225 |
-+ |
1226 |
-+#include <core/BoostSignals.hpp> |
1227 |
- #include <core/FilePath.hpp> |
1228 |
-+ |
1229 |
- #include <r/RSexp.hpp> |
1230 |
- |
1231 |
- #include "NotebookCapture.hpp" |
1232 |
-@@ -80,9 +82,9 @@ |
1233 |
- |
1234 |
- unsigned lastOrdinal_; |
1235 |
- |
1236 |
-- boost::signals::connection onBeforeNewPlot_; |
1237 |
-- boost::signals::connection onBeforeNewGridPage_; |
1238 |
-- boost::signals::connection onNewPlot_; |
1239 |
-+ RSTUDIO_BOOST_CONNECTION onBeforeNewPlot_; |
1240 |
-+ RSTUDIO_BOOST_CONNECTION onBeforeNewGridPage_; |
1241 |
-+ RSTUDIO_BOOST_CONNECTION onNewPlot_; |
1242 |
- |
1243 |
- double width_; |
1244 |
- double height_; |
1245 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-10-25 09:42:55.000000000 +1100 |
1246 |
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/NotebookQueue.cpp 2018-11-17 21:24:35.296976391 +1100 |
1247 |
-@@ -87,7 +87,7 @@ |
1248 |
- pInput_->enque(kThreadQuitCommand); |
1249 |
- |
1250 |
- // unregister handlers |
1251 |
-- BOOST_FOREACH(boost::signals::connection connection, handlers_) |
1252 |
-+ BOOST_FOREACH(RSTUDIO_BOOST_CONNECTION connection, handlers_) |
1253 |
- { |
1254 |
- connection.disconnect(); |
1255 |
- } |
1256 |
-@@ -651,7 +651,7 @@ |
1257 |
- boost::shared_ptr<ChunkExecContext> execContext_; |
1258 |
- |
1259 |
- // registered signal handlers |
1260 |
-- std::vector<boost::signals::connection> handlers_; |
1261 |
-+ std::vector<RSTUDIO_BOOST_CONNECTION> handlers_; |
1262 |
- |
1263 |
- // the thread which submits console input, and the queue which feeds it |
1264 |
- boost::thread console_; |
1265 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-10-25 09:42:55.000000000 +1100 |
1266 |
-+++ rstudio-1.1.463/src/cpp/session/modules/rmarkdown/SessionRmdNotebook.hpp 2018-11-17 21:24:35.296976391 +1100 |
1267 |
-@@ -18,7 +18,8 @@ |
1268 |
- #define SESSION_RMARKDOWN_NOTEBOOK_HPP |
1269 |
- |
1270 |
- #include <ctime> |
1271 |
--#include <boost/signals.hpp> |
1272 |
-+ |
1273 |
-+#include <core/BoostSignals.hpp> |
1274 |
- #include <core/json/Json.hpp> |
1275 |
- |
1276 |
- #define kChunkLibDir "lib" |
1277 |
-@@ -76,24 +77,24 @@ |
1278 |
- struct Events : boost::noncopyable |
1279 |
- { |
1280 |
- // Document {0}, chunk {1} from context id {3} execution completed |
1281 |
-- boost::signal<void(const std::string&, const std::string&, |
1282 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, |
1283 |
- const std::string&)> |
1284 |
- onChunkExecCompleted; |
1285 |
- |
1286 |
- // Document {0}, chunk {1} had console output of type {2} and text {3} |
1287 |
-- boost::signal<void(const std::string&, const std::string&, int, |
1288 |
-+ RSTUDIO_BOOST_SIGNAL<void(const std::string&, const std::string&, int, |
1289 |
- const std::string&)> |
1290 |
- onChunkConsoleOutput; |
1291 |
- |
1292 |
-- boost::signal<void(const core::FilePath&, const core::FilePath&, |
1293 |
-+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&, |
1294 |
- const core::json::Value& metadata, unsigned ordinal)> |
1295 |
- onPlotOutput; |
1296 |
-- boost::signal<void(const core::FilePath&, const core::FilePath&, |
1297 |
-+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&, |
1298 |
- const core::json::Value& metadata)> onHtmlOutput; |
1299 |
-- boost::signal<void(const core::json::Object&)> onErrorOutput; |
1300 |
-- boost::signal<void(const core::FilePath&, const core::FilePath&, |
1301 |
-+ RSTUDIO_BOOST_SIGNAL<void(const core::json::Object&)> onErrorOutput; |
1302 |
-+ RSTUDIO_BOOST_SIGNAL<void(const core::FilePath&, const core::FilePath&, |
1303 |
- const core::json::Value& metadata)> onDataOutput; |
1304 |
-- boost::signal<void(Condition condition, const std::string& message)> |
1305 |
-+ RSTUDIO_BOOST_SIGNAL<void(Condition condition, const std::string& message)> |
1306 |
- onCondition; |
1307 |
- }; |
1308 |
- |
1309 |
|
1310 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch |
1311 |
deleted file mode 100644 |
1312 |
index 961723fd224..00000000000 |
1313 |
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.69.0_p3.patch |
1314 |
+++ /dev/null |
1315 |
@@ -1,167 +0,0 @@ |
1316 |
---- rstudio-1.1.463-orig/src/cpp/CMakeLists.txt 2018-11-17 21:24:35.285976284 +1100 |
1317 |
-+++ rstudio-1.1.463/src/cpp/CMakeLists.txt 2018-11-17 21:41:02.712507842 +1100 |
1318 |
-@@ -175,6 +175,9 @@ |
1319 |
- set(Boost_USE_STATIC_LIBS ON) |
1320 |
- set(BOOST_INCLUDEDIR ${RSTUDIO_TOOLS_BOOST}/include) |
1321 |
- find_package(Boost ${BOOST_VERSION} REQUIRED) |
1322 |
-+ if(NOT Boost_VERSION VERSION_LESS 1.69.0) |
1323 |
-+ list(REMOVE_ITEM BOOST_LIBS signals) |
1324 |
-+ endif() |
1325 |
- |
1326 |
- # define library list manually (find_package doesn't always pick them up) |
1327 |
- set(BOOST_LIB_DIR ${RSTUDIO_TOOLS_BOOST}/lib) |
1328 |
-@@ -184,11 +187,15 @@ |
1329 |
- message(STATUS "Using RStudio-provided Boost ${BOOST_VERSION}") |
1330 |
- else() |
1331 |
- add_definitions(-DRSTUDIO_BOOST_NAMESPACE=boost) |
1332 |
-+ find_package(Boost ${BOOST_VERSION} REQUIRED) |
1333 |
-+ if(NOT Boost_VERSION VERSION_LESS 1.69.0) |
1334 |
-+ list(REMOVE_ITEM BOOST_LIBS signals) |
1335 |
-+ endif() |
1336 |
- find_package(Boost ${BOOST_VERSION} REQUIRED COMPONENTS ${BOOST_LIBS}) |
1337 |
- message(STATUS "Using system Boost ${BOOST_VERSION}") |
1338 |
- endif() |
1339 |
- |
1340 |
-- # WIN32 BOOST |
1341 |
-+# WIN32 BOOST |
1342 |
- else() |
1343 |
- # hard-code to our own prebuilt boost libs |
1344 |
- add_definitions(-DRSTUDIO_BOOST_NAMESPACE=rstudio_boost) |
1345 |
-@@ -211,14 +218,14 @@ |
1346 |
- # allow opt-in to using Boost.Signals2 |
1347 |
- # TODO: remove this in RStudio v1.3 and port to signals2 |
1348 |
- if(NOT RSTUDIO_BOOST_SIGNALS_VERSION) |
1349 |
-- if (BOOST_VERSION VERSION_LESS 1.69.0) |
1350 |
-+ if (Boost_VERSION VERSION_LESS 1.69.0) |
1351 |
- set(RSTUDIO_BOOST_SIGNALS_VERSION 1) |
1352 |
- else() |
1353 |
- set(RSTUDIO_BOOST_SIGNALS_VERSION 2) |
1354 |
- endif() |
1355 |
- endif() |
1356 |
- |
1357 |
--message(STATUS "Using Booost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}") |
1358 |
-+message(STATUS "Using Boost.Signals version ${RSTUDIO_BOOST_SIGNALS_VERSION}") |
1359 |
- add_definitions(-DRSTUDIO_BOOST_SIGNALS_VERSION=${RSTUDIO_BOOST_SIGNALS_VERSION}) |
1360 |
- |
1361 |
- # add boost as system include directory |
1362 |
---- rstudio-1.1.463-orig/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-10-25 09:42:55.000000000 +1100 |
1363 |
-+++ rstudio-1.1.463/src/cpp/core/include/core/r_util/RFunctionInformation.hpp 2018-11-17 21:41:02.713507852 +1100 |
1364 |
-@@ -75,9 +75,9 @@ |
1365 |
- const std::string& name() const { return name_; } |
1366 |
- const boost::optional<std::string>& defaultValue() const { return defaultValue_; } |
1367 |
- boost::tribool hasDefault() const { return hasDefault_; } |
1368 |
-- bool isUsed() const { return isUsed_; } |
1369 |
-+ bool isUsed() const { return bool(isUsed_); } |
1370 |
- void setIsUsed(bool value) { isUsed_ = value; } |
1371 |
-- bool isMissingnessHandled() const { return isMissingnessHandled_; } |
1372 |
-+ bool isMissingnessHandled() const { return bool(isMissingnessHandled_); } |
1373 |
- void setMissingnessHandled(bool value) { isMissingnessHandled_ = value; } |
1374 |
- |
1375 |
- private: |
1376 |
-@@ -130,7 +130,7 @@ |
1377 |
- |
1378 |
- bool isPrimitive() |
1379 |
- { |
1380 |
-- return isPrimitive_ == true; |
1381 |
-+ return bool(isPrimitive_); |
1382 |
- } |
1383 |
- |
1384 |
- void setIsPrimitive(bool isPrimitive) |
1385 |
---- rstudio-1.1.463-orig/src/cpp/session/modules/SessionRParser.cpp 2018-10-25 09:42:55.000000000 +1100 |
1386 |
-+++ rstudio-1.1.463/src/cpp/session/modules/SessionRParser.cpp 2018-11-17 21:41:02.714507862 +1100 |
1387 |
-@@ -390,7 +390,7 @@ |
1388 |
- if (!failed) |
1389 |
- { |
1390 |
- DEBUG("--- Found function in pkgInfo index: " << *fnInfo.binding()); |
1391 |
-- return fnInfo.performsNse(); |
1392 |
-+ return bool(fnInfo.performsNse()); |
1393 |
- } |
1394 |
- |
1395 |
- // Handle some special cases first. |
1396 |
---- rstudio-1.1.463-orig/src/tools/clang-ubsan-build 2018-10-25 09:42:55.000000000 +1100 |
1397 |
-+++ rstudio-1.1.463/src/tools/clang-ubsan-build 2018-11-17 21:41:02.714507862 +1100 |
1398 |
-@@ -10,19 +10,19 @@ |
1399 |
- |
1400 |
- : ${RSTUDIO_USE_LIBCXX="Yes"} |
1401 |
- : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"} |
1402 |
--: ${RSTUDIO_BOOST_VERSION="1.56.0"} |
1403 |
-+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.56.0"} |
1404 |
- |
1405 |
- mkdir -p "${BUILD_DIR}" |
1406 |
- cd "${BUILD_DIR}" |
1407 |
--cmake ../cpp \ |
1408 |
-- -DLIBR_HOME="${R_HOME}" \ |
1409 |
-- -DCMAKE_C_COMPILER="${CC}" \ |
1410 |
-- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ |
1411 |
-- -DCMAKE_CXX_COMPILER="${CXX}" \ |
1412 |
-- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ |
1413 |
-- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \ |
1414 |
-- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \ |
1415 |
-- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \ |
1416 |
-+cmake ../cpp \ |
1417 |
-+ -DLIBR_HOME="${R_HOME}" \ |
1418 |
-+ -DCMAKE_C_COMPILER="${CC}" \ |
1419 |
-+ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ |
1420 |
-+ -DCMAKE_CXX_COMPILER="${CXX}" \ |
1421 |
-+ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ |
1422 |
-+ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \ |
1423 |
-+ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \ |
1424 |
-+ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \ |
1425 |
- "$@" |
1426 |
- cd .. |
1427 |
- |
1428 |
---- rstudio-1.1.463-orig/src/tools/gcc-ubsan-build 2018-10-25 09:42:55.000000000 +1100 |
1429 |
-+++ rstudio-1.1.463/src/tools/gcc-ubsan-build 2018-11-17 21:41:02.715507871 +1100 |
1430 |
-@@ -19,19 +19,19 @@ |
1431 |
- # NOTE: Boost 1.50.0 not compatible with gcc-6 |
1432 |
- : ${RSTUDIO_USE_LIBCXX="No"} |
1433 |
- : ${RSTUDIO_USE_SYSTEM_BOOST="Yes"} |
1434 |
--: ${RSTUDIO_BOOST_VERSION="1.54.0"} |
1435 |
-+: ${RSTUDIO_BOOST_REQUESTED_VERSION="1.54.0"} |
1436 |
- |
1437 |
- mkdir -p "${BUILD_DIR}" |
1438 |
- cd "${BUILD_DIR}" |
1439 |
--cmake ../cpp \ |
1440 |
-- -DLIBR_HOME="${R_HOME}" \ |
1441 |
-- -DCMAKE_C_COMPILER="${CC}" \ |
1442 |
-- -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ |
1443 |
-- -DCMAKE_CXX_COMPILER="${CXX}" \ |
1444 |
-- -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ |
1445 |
-- -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \ |
1446 |
-- -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \ |
1447 |
-- -DRSTUDIO_BOOST_VERSION="${RSTUDIO_BOOST_VERSION}" \ |
1448 |
-+cmake ../cpp \ |
1449 |
-+ -DLIBR_HOME="${R_HOME}" \ |
1450 |
-+ -DCMAKE_C_COMPILER="${CC}" \ |
1451 |
-+ -DCMAKE_C_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ |
1452 |
-+ -DCMAKE_CXX_COMPILER="${CXX}" \ |
1453 |
-+ -DCMAKE_CXX_FLAGS="${ASANFLAGS} ${LDFLAGS}" \ |
1454 |
-+ -DRSTUDIO_USE_LIBCXX="${RSTUDIO_USE_LIBCXX}" \ |
1455 |
-+ -DRSTUDIO_USE_SYSTEM_BOOST="${RSTUDIO_USE_SYSTEM_BOOST}" \ |
1456 |
-+ -DRSTUDIO_BOOST_REQUESTED_VERSION="${RSTUDIO_BOOST_REQUESTED_VERSION}" \ |
1457 |
- "$@" |
1458 |
- cd .. |
1459 |
- |
1460 |
---- rstudio-1.1.463-orig/src/tools/xcode-ubsan-build 2018-10-25 09:42:55.000000000 +1100 |
1461 |
-+++ rstudio-1.1.463/src/tools/xcode-ubsan-build 2018-11-17 21:41:02.715507871 +1100 |
1462 |
-@@ -15,13 +15,13 @@ |
1463 |
- # sanitizers released with newer versions of clang) |
1464 |
- mkdir -p "${BUILD_DIR}" |
1465 |
- cd "${BUILD_DIR}" |
1466 |
--cmake ../cpp -GXcode \ |
1467 |
-- -DLIBR_HOME="${R_HOME}" \ |
1468 |
-- -DLIBR_INCLUDE_DIRS="${R_INCL}" \ |
1469 |
-- -DLIBR_DOC_DIR="${R_DOCS}" \ |
1470 |
-- -DRSTUDIO_USE_LIBCXX="Yes" \ |
1471 |
-- -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \ |
1472 |
-- -DRSTUDIO_BOOST_VERSION="1.56.0" \ |
1473 |
-+cmake ../cpp -GXcode \ |
1474 |
-+ -DLIBR_HOME="${R_HOME}" \ |
1475 |
-+ -DLIBR_INCLUDE_DIRS="${R_INCL}" \ |
1476 |
-+ -DLIBR_DOC_DIR="${R_DOCS}" \ |
1477 |
-+ -DRSTUDIO_USE_LIBCXX="Yes" \ |
1478 |
-+ -DRSTUDIO_USE_SYSTEM_BOOST="Yes" \ |
1479 |
-+ -DRSTUDIO_BOOST_REQUESTED_VERSION="1.56.0" \ |
1480 |
- "$@" |
1481 |
- cmake ../cpp -DLIBR_LIBRARIES="${R_LIBS}/libR.dylib" |
1482 |
- cd .. |
1483 |
|
1484 |
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 |
1485 |
deleted file mode 100644 |
1486 |
index 320b823355a..00000000000 |
1487 |
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-boost-1.70.0.patch |
1488 |
+++ /dev/null |
1489 |
@@ -1,46 +0,0 @@ |
1490 |
---- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2018-10-25 09:42:55.000000000 +1100 |
1491 |
-+++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/connection.hpp 2019-03-30 20:14:40.634057634 +1100 |
1492 |
-@@ -296,7 +296,11 @@ |
1493 |
- */ |
1494 |
- timer_ptr set_timer(long duration, timer_handler callback) { |
1495 |
- timer_ptr new_timer = lib::make_shared<boost::asio::deadline_timer>( |
1496 |
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 |
1497 |
-+ *m_io_service, |
1498 |
-+#else |
1499 |
- lib::ref(*m_io_service), |
1500 |
-+#endif |
1501 |
- boost::posix_time::milliseconds(duration) |
1502 |
- ); |
1503 |
- |
1504 |
---- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2018-10-25 09:42:55.000000000 +1100 |
1505 |
-+++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/endpoint.hpp 2019-03-30 20:14:36.319021594 +1100 |
1506 |
-@@ -184,7 +184,12 @@ |
1507 |
- m_io_service = ptr; |
1508 |
- m_external_io_service = true; |
1509 |
- m_acceptor = lib::make_shared<boost::asio::ip::tcp::acceptor>( |
1510 |
-- lib::ref(*m_io_service)); |
1511 |
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 |
1512 |
-+ *m_io_service |
1513 |
-+#else |
1514 |
-+ lib::ref(*m_io_service) |
1515 |
-+#endif |
1516 |
-+ ); |
1517 |
- |
1518 |
- m_state = READY; |
1519 |
- ec = lib::error_code(); |
1520 |
---- rstudio-1.1.463-orig/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2018-10-25 09:42:55.000000000 +1100 |
1521 |
-+++ rstudio-1.1.463/src/cpp/ext/websocketpp/transport/asio/security/none.hpp 2019-03-30 20:15:22.353406097 +1100 |
1522 |
-@@ -167,7 +167,12 @@ |
1523 |
- } |
1524 |
- |
1525 |
- m_socket = lib::make_shared<boost::asio::ip::tcp::socket>( |
1526 |
-- lib::ref(*service)); |
1527 |
-+#if defined(BOOST_VERSION) && BOOST_VERSION >= 107000 |
1528 |
-+ *service |
1529 |
-+#else |
1530 |
-+ lib::ref(*service) |
1531 |
-+#endif |
1532 |
-+ ); |
1533 |
- |
1534 |
- m_state = READY; |
1535 |
- |
1536 |
|
1537 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.1.463-fix-ptr-int-compare.patch b/sci-mathematics/rstudio/files/rstudio-1.1.463-fix-ptr-int-compare.patch |
1538 |
deleted file mode 100644 |
1539 |
index 914cd942e8f..00000000000 |
1540 |
--- a/sci-mathematics/rstudio/files/rstudio-1.1.463-fix-ptr-int-compare.patch |
1541 |
+++ /dev/null |
1542 |
@@ -1,13 +0,0 @@ |
1543 |
---- rstudio-1.1.463-orig/src/cpp/server/ServerSecureKeyFile.cpp 2018-10-25 09:42:55.000000000 +1100 |
1544 |
-+++ rstudio-1.1.463/src/cpp/server/ServerSecureKeyFile.cpp 2018-11-17 22:17:18.110012955 +1100 |
1545 |
-@@ -79,8 +79,8 @@ |
1546 |
- return error; |
1547 |
- |
1548 |
- // change mode it so it is only readable and writeable by this user |
1549 |
-- if (changeFileMode(secureKeyPath, |
1550 |
-- core::system::UserReadWriteMode) < 0) |
1551 |
-+ if (!!changeFileMode(secureKeyPath, |
1552 |
-+ core::system::UserReadWriteMode)) |
1553 |
- { |
1554 |
- return systemError(errno, ERROR_LOCATION); |
1555 |
- } |
1556 |
|
1557 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch |
1558 |
deleted file mode 100644 |
1559 |
index b2c4d2392f6..00000000000 |
1560 |
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-boost-1.72-filesystem.patch |
1561 |
+++ /dev/null |
1562 |
@@ -1,31 +0,0 @@ |
1563 |
-From a11d0454e5fe9c50005a03b9d9de84355df5c7fd Mon Sep 17 00:00:00 2001 |
1564 |
-From: Kevin Ushey <kevinushey@×××××.com> |
1565 |
-Date: Fri, 15 Nov 2019 14:54:02 -0800 |
1566 |
-Subject: [PATCH] avoid use of deprecated APIs |
1567 |
- |
1568 |
---- |
1569 |
- src/cpp/core/FilePath.cpp | 4 +--- |
1570 |
- 1 file changed, 1 insertion(+), 3 deletions(-) |
1571 |
- |
1572 |
-diff --git a/src/cpp/shared_core/FilePath.cpp b/src/cpp/shared_core/FilePath.cpp |
1573 |
-index 088366a9d6..495289e7fc 100644 |
1574 |
---- a/src/cpp/core/FilePath.cpp |
1575 |
-+++ b/src/cpp/core/FilePath.cpp |
1576 |
-@@ -22,8 +22,6 @@ |
1577 |
- #include <windows.h> |
1578 |
- #endif |
1579 |
- |
1580 |
--#define BOOST_FILESYSTEM_NO_DEPRECATED |
1581 |
-- |
1582 |
- #define BOOST_NO_CXX11_SCOPED_ENUMS |
1583 |
- #include <boost/filesystem.hpp> |
1584 |
- #undef BOOST_NO_CXX11_SCOPED_ENUMS |
1585 |
-@@ -1032,7 +1030,7 @@ |
1586 |
- { |
1587 |
- // NOTE: The path gets round-tripped through toString/fromString, would |
1588 |
- // be nice to have a direct constructor |
1589 |
-- if (!iterationFunction(itr.level(), |
1590 |
-+ if (!iterationFunction(itr.depth(), |
1591 |
- FilePath(BOOST_FS_PATH2STR(itr->path())))) |
1592 |
- { |
1593 |
- // end the iteration if requested |
1594 |
|
1595 |
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 |
1596 |
deleted file mode 100644 |
1597 |
index e38f5e0c444..00000000000 |
1598 |
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-fix-ptr-int-compare.patch |
1599 |
+++ /dev/null |
1600 |
@@ -1,13 +0,0 @@ |
1601 |
---- rstudio-1.2.1335-orig/src/cpp/server_core/SecureKeyFile.cpp 2019-03-28 16:08:20.000000000 +1100 |
1602 |
-+++ rstudio-1.2.1335/src/cpp/server_core/SecureKeyFile.cpp 2019-04-09 20:47:57.943317208 +1000 |
1603 |
-@@ -68,8 +68,8 @@ |
1604 |
- return error; |
1605 |
- |
1606 |
- // change mode it so it is only readable and writeable by this user |
1607 |
-- if (changeFileMode(secureKeyPath, |
1608 |
-- core::system::UserReadWriteMode) < 0) |
1609 |
-+ if (!!changeFileMode(secureKeyPath, |
1610 |
-+ core::system::UserReadWriteMode)) |
1611 |
- { |
1612 |
- return systemError(errno, ERROR_LOCATION); |
1613 |
- } |
1614 |
|
1615 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch |
1616 |
deleted file mode 100644 |
1617 |
index e2fe83867bc..00000000000 |
1618 |
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-pandoc.patch |
1619 |
+++ /dev/null |
1620 |
@@ -1,32 +0,0 @@ |
1621 |
---- rstudio-1.2.1335-orig/src/cpp/session/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 |
1622 |
-+++ rstudio-1.2.1335/src/cpp/session/CMakeLists.txt 2019-04-09 17:22:59.210201624 +1000 |
1623 |
-@@ -25,9 +25,6 @@ |
1624 |
- if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/mathjax-26") |
1625 |
- message(FATAL_ERROR "Mathjax 2.6 not found (re-run install-dependencies script to install)") |
1626 |
- endif() |
1627 |
--if(NOT EXISTS "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc") |
1628 |
-- message(FATAL_ERROR "pandoc not found (re-run install-dependencies script to install)") |
1629 |
--endif() |
1630 |
- |
1631 |
- # we often install embedded versions of these packages but don't do so currently |
1632 |
- |
1633 |
-@@ -479,19 +476,6 @@ |
1634 |
- install(DIRECTORY "resources/connections" |
1635 |
- DESTINATION ${RSTUDIO_INSTALL_SUPPORTING}/resources) |
1636 |
- |
1637 |
--# install pandoc |
1638 |
--if(WIN32) |
1639 |
-- set(PANDOC_VERSION "2.6" CACHE INTERNAL "Pandoc version") |
1640 |
--else() |
1641 |
-- set(PANDOC_VERSION "2.3.1" CACHE INTERNAL "Pandoc version") |
1642 |
--endif() |
1643 |
-- |
1644 |
--set(PANDOC_BIN "${RSTUDIO_DEPENDENCIES_DIR}/common/pandoc/${PANDOC_VERSION}") |
1645 |
--file(GLOB PANDOC_FILES "${PANDOC_BIN}/pandoc*") |
1646 |
--install(FILES ${PANDOC_FILES} |
1647 |
-- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE |
1648 |
-- DESTINATION ${RSTUDIO_INSTALL_BIN}/pandoc) |
1649 |
-- |
1650 |
- # install rmarkdown package |
1651 |
- # file(GLOB RMARKDOWN_PACKAGE "${RSTUDIO_DEPENDENCIES_DIR}/common/rmarkdown*.tar.gz") |
1652 |
- # install(FILES ${RMARKDOWN_PACKAGE} |
1653 |
|
1654 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch |
1655 |
deleted file mode 100644 |
1656 |
index ba66ef9f0ea..00000000000 |
1657 |
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-paths.patch |
1658 |
+++ /dev/null |
1659 |
@@ -1,118 +0,0 @@ |
1660 |
---- rstudio-1.2.1335-orig/CMakeGlobals.txt 2019-03-28 16:08:20.000000000 +1100 |
1661 |
-+++ rstudio-1.2.1335/CMakeGlobals.txt 2019-04-09 17:10:07.680657631 +1000 |
1662 |
-@@ -161,7 +161,7 @@ |
1663 |
- set(RSTUDIO_INSTALL_SUPPORTING RStudio.app/Contents/Resources) |
1664 |
- else() |
1665 |
- set(RSTUDIO_INSTALL_BIN bin) |
1666 |
-- set(RSTUDIO_INSTALL_SUPPORTING .) |
1667 |
-+ set(RSTUDIO_INSTALL_SUPPORTING ${DISTRO_SHARE}) |
1668 |
- endif() |
1669 |
- |
1670 |
- # if the install prefix is /usr/local then tweak as appropriate |
1671 |
---- rstudio-1.2.1335-orig/src/cpp/server/CMakeLists.txt 2019-03-28 16:08:20.000000000 +1100 |
1672 |
-+++ rstudio-1.2.1335/src/cpp/server/CMakeLists.txt 2019-04-09 16:54:34.740739744 +1000 |
1673 |
-@@ -194,7 +194,7 @@ |
1674 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}.in |
1675 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT}) |
1676 |
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_DEBIAN_SCRIPT} |
1677 |
-- DESTINATION ${RSERVER_INITD_DEBIAN_DIR}) |
1678 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_DEBIAN_DIR}) |
1679 |
- |
1680 |
- # install configured redhat init.d script |
1681 |
- set(RSERVER_INITD_REDHAT_DIR "extras/init.d/redhat") |
1682 |
-@@ -202,7 +202,7 @@ |
1683 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}.in |
1684 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT}) |
1685 |
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_REDHAT_SCRIPT} |
1686 |
-- DESTINATION ${RSERVER_INITD_REDHAT_DIR}) |
1687 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_REDHAT_DIR}) |
1688 |
- |
1689 |
- # install configured suse init.d script |
1690 |
- set(RSERVER_INITD_SUSE_DIR "extras/init.d/suse") |
1691 |
-@@ -210,13 +210,13 @@ |
1692 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_INITD_SUSE_SCRIPT}.in |
1693 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT}) |
1694 |
- install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_INITD_SUSE_SCRIPT} |
1695 |
-- DESTINATION ${RSERVER_INITD_SUSE_DIR}) |
1696 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_INITD_SUSE_DIR}) |
1697 |
- |
1698 |
- # install pam profile |
1699 |
- set(RSERVER_PAM_DIR "extras/pam") |
1700 |
- set(RSERVER_PAM_PROFILE "${RSERVER_PAM_DIR}/rstudio") |
1701 |
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_PAM_PROFILE} |
1702 |
-- DESTINATION ${RSERVER_PAM_DIR}) |
1703 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_PAM_DIR}) |
1704 |
- |
1705 |
- # install configured upstart profile |
1706 |
- set(RSERVER_UPSTART_DIR "extras/upstart") |
1707 |
-@@ -224,12 +224,12 @@ |
1708 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE}.in |
1709 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE}) |
1710 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE} |
1711 |
-- DESTINATION ${RSERVER_UPSTART_DIR}) |
1712 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) |
1713 |
- set(RSERVER_UPSTART_PROFILE_REDHAT "${RSERVER_UPSTART_DIR}/rstudio-server.redhat.conf") |
1714 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}.in |
1715 |
- ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT}) |
1716 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RSERVER_UPSTART_PROFILE_REDHAT} |
1717 |
-- DESTINATION ${RSERVER_UPSTART_DIR}) |
1718 |
-+ DESTINATION ${DISTRO_SHARE}/${RSERVER_UPSTART_DIR}) |
1719 |
- |
1720 |
- # install configured systemd profile |
1721 |
- set(RSERVER_SYSTEMD_DIR "extras/systemd") |
1722 |
---- rstudio-1.2.1335-orig/src/cpp/server/ServerOptions.cpp 2019-03-28 16:08:20.000000000 +1100 |
1723 |
-+++ rstudio-1.2.1335/src/cpp/server/ServerOptions.cpp 2019-04-09 16:54:34.740739744 +1000 |
1724 |
-@@ -389,8 +389,8 @@ |
1725 |
- |
1726 |
- // convert relative paths by completing from the system installation |
1727 |
- // path (this allows us to be relocatable) |
1728 |
-- resolvePath(resourcePath, &wwwLocalPath_); |
1729 |
-- resolvePath(resourcePath, &wwwSymbolMapsPath_); |
1730 |
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwLocalPath_); |
1731 |
-+ resolvePath(resourcePath.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); |
1732 |
- resolvePath(binaryPath, &authPamHelperPath_); |
1733 |
- resolvePath(binaryPath, &rsessionPath_); |
1734 |
- resolvePath(binaryPath, &rldpathPath_); |
1735 |
---- rstudio-1.2.1335-orig/src/cpp/session/SessionOptions.cpp 2019-03-28 16:08:20.000000000 +1100 |
1736 |
-+++ rstudio-1.2.1335/src/cpp/session/SessionOptions.cpp 2019-04-09 17:17:06.035206050 +1000 |
1737 |
-@@ -53,7 +53,7 @@ |
1738 |
- namespace session { |
1739 |
- |
1740 |
- namespace { |
1741 |
--const char* const kDefaultPandocPath = "bin/pandoc"; |
1742 |
-+const char* const kDefaultPandocPath = "bin"; |
1743 |
- const char* const kDefaultPostbackPath = "bin/postback/rpostback"; |
1744 |
- const char* const kDefaultRsclangPath = "bin/rsclang"; |
1745 |
- |
1746 |
-@@ -569,14 +569,14 @@ |
1747 |
- } |
1748 |
- |
1749 |
- // convert relative paths by completing from the app resource path |
1750 |
-- resolvePath(resourcePath_, &rResourcesPath_); |
1751 |
-- resolvePath(resourcePath_, &agreementFilePath_); |
1752 |
-- resolvePath(resourcePath_, &wwwLocalPath_); |
1753 |
-- resolvePath(resourcePath_, &wwwSymbolMapsPath_); |
1754 |
-- resolvePath(resourcePath_, &coreRSourcePath_); |
1755 |
-- resolvePath(resourcePath_, &modulesRSourcePath_); |
1756 |
-- resolvePath(resourcePath_, &sessionLibraryPath_); |
1757 |
-- resolvePath(resourcePath_, &sessionPackageArchivesPath_); |
1758 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &rResourcesPath_); |
1759 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &agreementFilePath_); |
1760 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwLocalPath_); |
1761 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &wwwSymbolMapsPath_); |
1762 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &coreRSourcePath_); |
1763 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &modulesRSourcePath_); |
1764 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionLibraryPath_); |
1765 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &sessionPackageArchivesPath_); |
1766 |
- resolvePostbackPath(resourcePath_, &rpostbackPath_); |
1767 |
- #ifdef _WIN32 |
1768 |
- resolvePath(resourcePath_, &consoleIoPath_); |
1769 |
-@@ -601,7 +601,7 @@ |
1770 |
- } |
1771 |
- winptyPath_ = pty.complete(completion).absolutePath(); |
1772 |
- #endif // _WIN32 |
1773 |
-- resolvePath(resourcePath_, &hunspellDictionariesPath_); |
1774 |
-+ resolvePath(resourcePath_.childPath(DISTRO_SHARE), &hunspellDictionariesPath_); |
1775 |
- resolvePath(resourcePath_, &mathjaxPath_); |
1776 |
- resolvePath(resourcePath_, &libclangHeadersPath_); |
1777 |
- resolvePandocPath(resourcePath_, &pandocPath_); |
1778 |
|
1779 |
diff --git a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch b/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch |
1780 |
deleted file mode 100644 |
1781 |
index e72df553eeb..00000000000 |
1782 |
--- a/sci-mathematics/rstudio/files/rstudio-1.2.1335-prefs.patch |
1783 |
+++ /dev/null |
1784 |
@@ -1,53 +0,0 @@ |
1785 |
---- rstudio-1.2.1335-orig/src/gwt/build.xml 2019-03-28 16:08:20.000000000 +1100 |
1786 |
-+++ rstudio-1.2.1335/src/gwt/build.xml 2019-04-09 16:44:15.089471934 +1000 |
1787 |
-@@ -34,6 +34,7 @@ |
1788 |
- <property name="gwt.extra.args" value=""/> |
1789 |
- <property name="gwt.main.module" value="org.rstudio.studio.RStudio"/> |
1790 |
- <property name="ace.bin" value="${src.dir}/org/rstudio/studio/client/workbench/views/source/editors/text/ace"/> |
1791 |
-+ <property environment="env"/> |
1792 |
- |
1793 |
- <path id="project.class.path"> |
1794 |
- <pathelement location="${build.dir}"/> |
1795 |
-@@ -112,8 +113,10 @@ |
1796 |
- <pathelement location="${src.dir}"/> |
1797 |
- <path refid="project.class.path"/> |
1798 |
- </classpath> |
1799 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
1800 |
- <!-- add jvmarg -Xss16M or similar if you see a StackOverflowError --> |
1801 |
- <jvmarg value="-Xmx1536M"/> |
1802 |
-+ <jvmarg value="-Djava.util.prefs.userRoot=${env.T}"/> |
1803 |
- <arg value="-war"/> |
1804 |
- <arg value="${www.dir}"/> |
1805 |
- <arg value="-localWorkers"/> |
1806 |
-@@ -154,6 +157,7 @@ |
1807 |
- <pathelement location="${src.dir}"/> |
1808 |
- <path refid="project.class.path"/> |
1809 |
- </classpath> |
1810 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
1811 |
- <jvmarg value="-Xmx2048M"/> |
1812 |
- <arg value="-style"/> |
1813 |
- <arg value="PRETTY"/> |
1814 |
-@@ -176,6 +180,7 @@ |
1815 |
- <pathelement location="src"/> |
1816 |
- <path refid="project.class.path"/> |
1817 |
- </classpath> |
1818 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
1819 |
- <jvmarg value="-Xmx2048M"/> |
1820 |
- <arg value="-style"/> |
1821 |
- <arg value="PRETTY"/> |
1822 |
-@@ -202,6 +207,7 @@ |
1823 |
- <pathelement location="src"/> |
1824 |
- <path refid="project.class.path"/> |
1825 |
- </classpath> |
1826 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
1827 |
- <jvmarg value="-Xmx2048M"/> |
1828 |
- <arg value="-src"/> |
1829 |
- <arg value = "src"/> |
1830 |
-@@ -237,6 +243,7 @@ |
1831 |
- <pathelement location="${test.dir}"/> |
1832 |
- <pathelement location="${src.dir}"/> |
1833 |
- </classpath> |
1834 |
-+ <jvmarg value="-Duser.home=${env.T}"/> |
1835 |
- <classpath refid="project.class.path"/> |
1836 |
- <classpath refid="unittest.class.path"/> |
1837 |
- <arg value="org.rstudio.studio.client.RStudioUnitTestSuite"/> |
1838 |
|
1839 |
diff --git a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild b/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild |
1840 |
deleted file mode 100644 |
1841 |
index 8b60b2efe5b..00000000000 |
1842 |
--- a/sci-mathematics/rstudio/rstudio-1.1.463-r1.ebuild |
1843 |
+++ /dev/null |
1844 |
@@ -1,255 +0,0 @@ |
1845 |
-# Copyright 1999-2020 Gentoo Authors |
1846 |
-# Distributed under the terms of the GNU General Public License v2 |
1847 |
- |
1848 |
-EAPI=7 |
1849 |
- |
1850 |
-inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils vcs-clean |
1851 |
- |
1852 |
-# TODO |
1853 |
-# * package gin and gwt |
1854 |
-# * use dict from tree, linguas |
1855 |
-# * do src_test (use junit from tree?) |
1856 |
- |
1857 |
-# update from scripts in dependencies/common |
1858 |
-# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt |
1859 |
-GWT_VER=2.7.0 |
1860 |
-GIN_VER=1.5 |
1861 |
-SELENIUM_VER=2.37.0 |
1862 |
-CHROMEDRIVER_VER=2.7 |
1863 |
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc |
1864 |
-PANDOC_VER=1.19.2.1 |
1865 |
-# ls dependencies/common/*.tar.gz |
1866 |
-PACKRAT_VER=0.98.1000 |
1867 |
-RMARKDOWN_VER=0.98.1000 |
1868 |
-SHINYAPPS_VER=0.98.1000 |
1869 |
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 |
1870 |
- |
1871 |
-DESCRIPTION="IDE for the R language" |
1872 |
-HOMEPAGE=" |
1873 |
- http://www.rstudio.org |
1874 |
- https://github.com/rstudio/rstudio/" |
1875 |
-SRC_URI=" |
1876 |
- https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz |
1877 |
- https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip |
1878 |
- https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip |
1879 |
- https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip |
1880 |
- https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar |
1881 |
- https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux |
1882 |
- https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip |
1883 |
- https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz |
1884 |
- https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz |
1885 |
- https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz |
1886 |
- https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz |
1887 |
-" |
1888 |
- |
1889 |
-LICENSE="AGPL-3" |
1890 |
-SLOT="0" |
1891 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
1892 |
-IUSE="dedicated libressl server" |
1893 |
- |
1894 |
-QT_VER=5.4 |
1895 |
-QT_SLOT=5 |
1896 |
-RDEPEND=" |
1897 |
- >=app-text/pandoc-${PANDOC_VER} |
1898 |
- dev-haskell/pandoc-citeproc |
1899 |
- >=dev-lang/R-2.11.1 |
1900 |
- >=dev-libs/boost-1.63:= |
1901 |
- >=dev-libs/mathjax-2.7.4 |
1902 |
- sys-apps/util-linux |
1903 |
- >=sys-devel/clang-3.5.0:* |
1904 |
- sys-libs/zlib |
1905 |
- >=virtual/jre-1.8:= |
1906 |
- x11-libs/pango |
1907 |
- !dedicated? ( |
1908 |
- >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} |
1909 |
- >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} |
1910 |
- >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} |
1911 |
- >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} |
1912 |
- >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} |
1913 |
- >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
1914 |
- >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
1915 |
- >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
1916 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] |
1917 |
- >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
1918 |
- >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
1919 |
- >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
1920 |
- >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} |
1921 |
- >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} |
1922 |
- >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} |
1923 |
- >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} |
1924 |
- >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} |
1925 |
- server? ( sys-libs/pam ) |
1926 |
- ) |
1927 |
- dedicated? ( sys-libs/pam ) |
1928 |
- !libressl? ( dev-libs/openssl:0= ) |
1929 |
- libressl? ( dev-libs/libressl:0= )" |
1930 |
-DEPEND="${RDEPEND} |
1931 |
- app-arch/unzip |
1932 |
- dev-java/ant-core |
1933 |
- >=virtual/jdk-1.8:= |
1934 |
- virtual/pkgconfig" |
1935 |
-# test? ( dev-java/junit:4 ) |
1936 |
- |
1937 |
-PATCHES=( |
1938 |
- "${FILESDIR}/${PN}-0.99.879-prefs.patch" |
1939 |
- "${FILESDIR}/${PN}-1.0.44-paths.patch" |
1940 |
- "${FILESDIR}/${PN}-1.1.357-clang-pandoc.patch" |
1941 |
- "${FILESDIR}/${PN}-0.98.490-linker_flags.patch" |
1942 |
- "${FILESDIR}/${PN}-0.99.473-qtsingleapplication.patch" |
1943 |
- "${FILESDIR}/${PN}-1.0.44-systemd.patch" |
1944 |
- "${FILESDIR}/${PN}-1.1.453-boost-1.67.0.patch" |
1945 |
- "${FILESDIR}/${PN}-1.1.453-core.patch" |
1946 |
- "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p1.patch" |
1947 |
- "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p2.patch" |
1948 |
- "${FILESDIR}/${PN}-1.1.463-boost-1.69.0_p3.patch" |
1949 |
- "${FILESDIR}/${PN}-1.1.463-fix-ptr-int-compare.patch" |
1950 |
- "${FILESDIR}/${PN}-1.1.463-boost-1.70.0.patch" |
1951 |
-) |
1952 |
- |
1953 |
-src_unpack() { |
1954 |
- unpack ${P}.tar.gz gwt-${GWT_VER}.zip |
1955 |
- cd "${S}" || die |
1956 |
- mkdir -p src/gwt/lib/{gin,gwt} \ |
1957 |
- dependencies/common/dictionaries \ |
1958 |
- src/gwt/lib/selenium/${SELENIUM_VER} \ |
1959 |
- src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die |
1960 |
- mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die |
1961 |
- unzip -qd src/gwt/lib/gin/${GIN_VER} \ |
1962 |
- "${DISTDIR}"/gin-${GIN_VER}.zip || die |
1963 |
- unzip -qd dependencies/common/dictionaries \ |
1964 |
- "${DISTDIR}"/core-dictionaries.zip || die |
1965 |
- unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ |
1966 |
- "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die |
1967 |
- cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ |
1968 |
- src/gwt/lib/selenium/${SELENIUM_VER}/ || die |
1969 |
- cp "${DISTDIR}"/chromedriver-linux \ |
1970 |
- src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die |
1971 |
- cd dependencies/common || die |
1972 |
- unpack packrat-${PACKRAT_VER}.tar.gz |
1973 |
- unpack rmarkdown-${RMARKDOWN_VER}.tar.gz |
1974 |
- unpack shinyapps-${SHINYAPPS_VER}.tar.gz |
1975 |
- unpack rsconnect_${RSCONNECT_VER}.tar.gz |
1976 |
- cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ |
1977 |
- . || die |
1978 |
- cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ |
1979 |
- . || die |
1980 |
- cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ |
1981 |
- . || die |
1982 |
- cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ |
1983 |
- . || die |
1984 |
-} |
1985 |
- |
1986 |
-src_prepare() { |
1987 |
- cmake-utils_src_prepare |
1988 |
- java-pkg-2_src_prepare |
1989 |
- egit_clean |
1990 |
- |
1991 |
- # Enable CMake to install our .service file for systemd usage |
1992 |
- mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die |
1993 |
- cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die |
1994 |
- |
1995 |
- # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using |
1996 |
- # this sed hack for now. ~RMH |
1997 |
- sed -i \ |
1998 |
- -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ |
1999 |
- src/cpp/server/ServerOptions.cpp \ |
2000 |
- src/cpp/session/SessionOptions.cpp || die |
2001 |
- |
2002 |
- # use mathjax from system |
2003 |
- ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die |
2004 |
- |
2005 |
- # make sure icons and mime stuff are with prefix |
2006 |
- sed -i \ |
2007 |
- -e "s:/usr:${EPREFIX}/usr:g" \ |
2008 |
- CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die |
2009 |
- |
2010 |
- # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf |
2011 |
- sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \ |
2012 |
- -i src/cpp/server/ServerOptions.cpp \ |
2013 |
- || die |
2014 |
- |
2015 |
- # Set the rsession.conf file location for Gentoo prefix |
2016 |
- sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \ |
2017 |
- -i src/cpp/session/SessionOptions.cpp \ |
2018 |
- || die |
2019 |
- |
2020 |
- # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. |
2021 |
- # It provides a library that has its version number appended to the end, |
2022 |
- # which is difficult to handle in cmake, as find_library does not support |
2023 |
- # searching for wildcard library names. So I find the library name from the |
2024 |
- # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
2025 |
- rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
2026 |
- local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
2027 |
- $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
2028 |
- | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
2029 |
- -e 's@LIBS \*= -l@@') |
2030 |
- sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
2031 |
- -i "${S}"/src/cpp/desktop/CMakeLists.txt \ |
2032 |
- || die |
2033 |
- |
2034 |
- # The git commit for tag: git rev-list -n 1 v${PV} |
2035 |
- sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\ |
2036 |
- -i "${S}"/CMakeLists.txt \ |
2037 |
- "${S}"/CMakeGlobals.txt \ |
2038 |
- || die |
2039 |
-} |
2040 |
- |
2041 |
-src_configure() { |
2042 |
- export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) |
2043 |
- export RSTUDIO_VERSION_MINOR=$(ver_cut 2) |
2044 |
- export RSTUDIO_VERSION_PATCH=$(ver_cut 3) |
2045 |
- |
2046 |
- local mycmakeargs=( |
2047 |
- -DDISTRO_SHARE=share/${PN} |
2048 |
- -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" |
2049 |
- -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
2050 |
- -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
2051 |
- -DRSTUDIO_VERIFY_R_VERSION=FALSE |
2052 |
- ) |
2053 |
- |
2054 |
- cmake-utils_src_configure |
2055 |
-} |
2056 |
- |
2057 |
-src_compile() { |
2058 |
- # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny |
2059 |
- # P: /root/.oracle_jre_usage. |
2060 |
- export ANT_OPTS="-Duser.home=${T}" |
2061 |
- cmake-utils_src_compile |
2062 |
-} |
2063 |
- |
2064 |
-src_install() { |
2065 |
- export ANT_OPTS="-Duser.home=${T}" |
2066 |
- cmake-utils_src_install |
2067 |
- pax-mark m "${ED}/usr/bin/rstudio" |
2068 |
- doconfd "${FILESDIR}"/rstudio-server.conf |
2069 |
- dodir /etc/rstudio |
2070 |
- insinto /etc/rstudio |
2071 |
- doins "${FILESDIR}"/rsession.conf |
2072 |
- dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf |
2073 |
- if use dedicated || use server; then |
2074 |
- dopamd src/cpp/server/extras/pam/rstudio |
2075 |
- newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server |
2076 |
- fi |
2077 |
-} |
2078 |
- |
2079 |
-pkg_preinst() { |
2080 |
- use dedicated || gnome2_icon_savelist |
2081 |
- java-pkg-2_pkg_preinst |
2082 |
-} |
2083 |
- |
2084 |
-pkg_postinst() { |
2085 |
- use dedicated || { xdg_desktop_database_update |
2086 |
- xdg_mimeinfo_database_update |
2087 |
- gnome2_icon_cache_update ;} |
2088 |
- |
2089 |
- if use dedicated || use server; then |
2090 |
- enewgroup rstudio-server |
2091 |
- enewuser rstudio-server -1 -1 -1 rstudio-server |
2092 |
- fi |
2093 |
-} |
2094 |
- |
2095 |
-pkg_postrm() { |
2096 |
- use dedicated || { xdg_desktop_database_update |
2097 |
- xdg_mimeinfo_database_update |
2098 |
- gnome2_icon_cache_update ;} |
2099 |
-} |
2100 |
|
2101 |
diff --git a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild b/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild |
2102 |
deleted file mode 100644 |
2103 |
index 2ba27bd5148..00000000000 |
2104 |
--- a/sci-mathematics/rstudio/rstudio-1.2.1335.ebuild |
2105 |
+++ /dev/null |
2106 |
@@ -1,254 +0,0 @@ |
2107 |
-# Copyright 1999-2019 Gentoo Authors |
2108 |
-# Distributed under the terms of the GNU General Public License v2 |
2109 |
- |
2110 |
-EAPI=7 |
2111 |
- |
2112 |
-inherit eutils user cmake-utils gnome2-utils pam xdg-utils java-pkg-2 pax-utils qmake-utils vcs-clean |
2113 |
- |
2114 |
-# TODO |
2115 |
-# * package gin and gwt |
2116 |
-# * use dict from tree, linguas |
2117 |
-# * do src_test (use junit from tree?) |
2118 |
- |
2119 |
-# update from scripts in dependencies/common |
2120 |
-# egrep '(GWT_SDK_VER=|GIN_VER=|SELENIUM_VER=|CHROMEDRIVER_VER=)' dependencies/common/install-gwt |
2121 |
-GWT_VER=2.8.1 |
2122 |
-GIN_VER=2.1.2 |
2123 |
-SELENIUM_VER=2.37.0 |
2124 |
-CHROMEDRIVER_VER=2.7 |
2125 |
-# grep 'PANDOC_VERSION=' dependencies/common/install-pandoc |
2126 |
-# It should be PANDOC_VER=2.3.1 however >=app-text/pandoc-2.3.1 is not yet in portage |
2127 |
-PANDOC_VER=1.19.2.1 |
2128 |
-# ls dependencies/common/*.tar.gz |
2129 |
-PACKRAT_VER=0.98.1000 |
2130 |
-RMARKDOWN_VER=0.98.1000 |
2131 |
-SHINYAPPS_VER=0.98.1000 |
2132 |
-RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 |
2133 |
- |
2134 |
-DESCRIPTION="IDE for the R language" |
2135 |
-HOMEPAGE=" |
2136 |
- http://www.rstudio.org |
2137 |
- https://github.com/rstudio/rstudio/" |
2138 |
-SRC_URI=" |
2139 |
- https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz |
2140 |
- https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip |
2141 |
- https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip |
2142 |
- https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip |
2143 |
- https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar |
2144 |
- https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux |
2145 |
- https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip |
2146 |
- https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz |
2147 |
- https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz |
2148 |
- https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz |
2149 |
- https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz |
2150 |
-" |
2151 |
- |
2152 |
-LICENSE="AGPL-3" |
2153 |
-SLOT="0" |
2154 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
2155 |
-IUSE="dedicated libressl server" |
2156 |
- |
2157 |
-QT_VER=5.4 |
2158 |
-QT_SLOT=5 |
2159 |
-RDEPEND=" |
2160 |
- >=app-text/pandoc-${PANDOC_VER} |
2161 |
- dev-haskell/pandoc-citeproc |
2162 |
- >=dev-lang/R-2.11.1 |
2163 |
- >=dev-libs/boost-1.63:= |
2164 |
- >=dev-libs/mathjax-2.7.4 |
2165 |
- sys-apps/util-linux |
2166 |
- >=sys-devel/clang-3.5.0:* |
2167 |
- sys-libs/zlib |
2168 |
- >=virtual/jre-1.8:= |
2169 |
- x11-libs/pango |
2170 |
- !dedicated? ( |
2171 |
- >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} |
2172 |
- >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} |
2173 |
- >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} |
2174 |
- >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} |
2175 |
- >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} |
2176 |
- >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
2177 |
- >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
2178 |
- >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
2179 |
- >=dev-qt/qtsingleapplication-2.6.1_p20150629[X,qt5(+)] |
2180 |
- >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
2181 |
- >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
2182 |
- >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
2183 |
- >=dev-qt/qtwebchannel-${QT_VER}:${QT_SLOT} |
2184 |
- >=dev-qt/qtwebengine-${QT_VER}:${QT_SLOT}[widgets] |
2185 |
- >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} |
2186 |
- >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} |
2187 |
- >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} |
2188 |
- server? ( sys-libs/pam ) |
2189 |
- ) |
2190 |
- dedicated? ( sys-libs/pam ) |
2191 |
- !libressl? ( dev-libs/openssl:0= ) |
2192 |
- libressl? ( dev-libs/libressl:0= )" |
2193 |
-DEPEND="${RDEPEND} |
2194 |
- app-arch/unzip |
2195 |
- dev-java/ant-core |
2196 |
- >=virtual/jdk-1.8:= |
2197 |
- virtual/pkgconfig" |
2198 |
-# test? ( dev-java/junit:4 ) |
2199 |
- |
2200 |
-PATCHES=( |
2201 |
- "${FILESDIR}"/${PN}-1.2.1335-prefs.patch |
2202 |
- "${FILESDIR}"/${PN}-1.2.1335-paths.patch |
2203 |
- "${FILESDIR}"/${PN}-1.2.1335-pandoc.patch |
2204 |
- "${FILESDIR}"/${PN}-1.2.1335-linker_flags.patch |
2205 |
- "${FILESDIR}"/${PN}-1.2.1335-qtsingleapplication.patch |
2206 |
- "${FILESDIR}"/${PN}-1.0.44-systemd.patch |
2207 |
- "${FILESDIR}"/${PN}-1.2.1335-core.patch |
2208 |
- "${FILESDIR}"/${PN}-1.2.1335-fix-ptr-int-compare.patch |
2209 |
- "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p1.patch |
2210 |
- "${FILESDIR}"/${PN}-1.2.1335-boost-1.70.0_p2.patch |
2211 |
- "${FILESDIR}"/${PN}-1.2.1335-boost-1.72-filesystem.patch |
2212 |
-) |
2213 |
- |
2214 |
-src_unpack() { |
2215 |
- unpack ${P}.tar.gz gwt-${GWT_VER}.zip |
2216 |
- cd "${S}" || die |
2217 |
- mkdir -p src/gwt/lib/{gin,gwt} \ |
2218 |
- dependencies/common/dictionaries \ |
2219 |
- src/gwt/lib/selenium/${SELENIUM_VER} \ |
2220 |
- src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die |
2221 |
- mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die |
2222 |
- unzip -qd src/gwt/lib/gin/${GIN_VER} \ |
2223 |
- "${DISTDIR}"/gin-${GIN_VER}.zip || die |
2224 |
- unzip -qd dependencies/common/dictionaries \ |
2225 |
- "${DISTDIR}"/core-dictionaries.zip || die |
2226 |
- unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ |
2227 |
- "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die |
2228 |
- cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ |
2229 |
- src/gwt/lib/selenium/${SELENIUM_VER}/ || die |
2230 |
- cp "${DISTDIR}"/chromedriver-linux \ |
2231 |
- src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die |
2232 |
- cd dependencies/common || die |
2233 |
- unpack packrat-${PACKRAT_VER}.tar.gz |
2234 |
- unpack rmarkdown-${RMARKDOWN_VER}.tar.gz |
2235 |
- unpack shinyapps-${SHINYAPPS_VER}.tar.gz |
2236 |
- unpack rsconnect_${RSCONNECT_VER}.tar.gz |
2237 |
- cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ |
2238 |
- . || die |
2239 |
- cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ |
2240 |
- . || die |
2241 |
- cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ |
2242 |
- . || die |
2243 |
- cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ |
2244 |
- . || die |
2245 |
-} |
2246 |
- |
2247 |
-src_prepare() { |
2248 |
- cmake-utils_src_prepare |
2249 |
- java-pkg-2_src_prepare |
2250 |
- egit_clean |
2251 |
- |
2252 |
- # Enable CMake to install our .service file for systemd usage |
2253 |
- mkdir -vp "${S}/src/cpp/server/lib/systemd/system" || die |
2254 |
- cp -v "${FILESDIR}/rstudio-server.service.in" "${S}/src/cpp/server/lib/systemd/system/" || die |
2255 |
- |
2256 |
- # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using |
2257 |
- # this sed hack for now. ~RMH |
2258 |
- sed -i \ |
2259 |
- -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ |
2260 |
- src/cpp/server/ServerOptions.cpp \ |
2261 |
- src/cpp/session/SessionOptions.cpp || die |
2262 |
- |
2263 |
- # use mathjax from system |
2264 |
- ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-26 || die |
2265 |
- |
2266 |
- # make sure icons and mime stuff are with prefix |
2267 |
- sed -i \ |
2268 |
- -e "s:/usr:${EPREFIX}/usr:g" \ |
2269 |
- CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die |
2270 |
- |
2271 |
- # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf |
2272 |
- sed -e "s@/etc/rstudio/rserver.conf@${EROOT}/etc/conf.d/rstudio-server.conf@" \ |
2273 |
- -i src/cpp/server/ServerOptions.cpp \ |
2274 |
- || die |
2275 |
- |
2276 |
- # Set the rsession.conf file location for Gentoo prefix |
2277 |
- sed -e "s@/etc/rstudio/rsession.conf@${EROOT}/etc/rstudio/rsession.conf@" \ |
2278 |
- -i src/cpp/session/SessionOptions.cpp \ |
2279 |
- || die |
2280 |
- |
2281 |
- # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. |
2282 |
- # It provides a library that has its version number appended to the end, |
2283 |
- # which is difficult to handle in cmake, as find_library does not support |
2284 |
- # searching for wildcard library names. So I find the library name from the |
2285 |
- # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
2286 |
- rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
2287 |
- local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
2288 |
- $(qt5_get_mkspecsdir)/features/qtsingleapplication.prf \ |
2289 |
- | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
2290 |
- -e 's@LIBS \*= -l@@') |
2291 |
- sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
2292 |
- -i "${S}"/src/cpp/desktop/CMakeLists.txt \ |
2293 |
- || die |
2294 |
- |
2295 |
- # The git commit for tag: git rev-list -n 1 v${PV} |
2296 |
- sed -e 's@git ARGS rev-parse HEAD@echo ARGS 6871a99b32add885fe6fa3d50fe15f62346142e7@'\ |
2297 |
- -i "${S}"/CMakeLists.txt \ |
2298 |
- "${S}"/CMakeGlobals.txt \ |
2299 |
- || die |
2300 |
-} |
2301 |
- |
2302 |
-src_configure() { |
2303 |
- export RSTUDIO_VERSION_MAJOR=$(ver_cut 1) |
2304 |
- export RSTUDIO_VERSION_MINOR=$(ver_cut 2) |
2305 |
- export RSTUDIO_VERSION_PATCH=$(ver_cut 3) |
2306 |
- |
2307 |
- local mycmakeargs=( |
2308 |
- -DDISTRO_SHARE=share/${PN} |
2309 |
- -DRSTUDIO_INSTALL_FREEDESKTOP="$(usex !dedicated "ON" "OFF")" |
2310 |
- -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
2311 |
- -DQT_QMAKE_EXECUTABLE=$(qt5_get_bindir)/qmake |
2312 |
- -DRSTUDIO_VERIFY_R_VERSION=FALSE |
2313 |
- ) |
2314 |
- |
2315 |
- cmake-utils_src_configure |
2316 |
-} |
2317 |
- |
2318 |
-src_compile() { |
2319 |
- # Avoid the rest of the oracle-jdk-bin-1.8.0.60 sandbox violations F: mkdir S: deny |
2320 |
- # P: /root/.oracle_jre_usage. |
2321 |
- export ANT_OPTS="-Duser.home=${T}" |
2322 |
- cmake-utils_src_compile |
2323 |
-} |
2324 |
- |
2325 |
-src_install() { |
2326 |
- export ANT_OPTS="-Duser.home=${T}" |
2327 |
- cmake-utils_src_install |
2328 |
- pax-mark m "${ED}/usr/bin/rstudio" |
2329 |
- doconfd "${FILESDIR}"/rstudio-server.conf |
2330 |
- dodir /etc/rstudio |
2331 |
- insinto /etc/rstudio |
2332 |
- doins "${FILESDIR}"/rsession.conf |
2333 |
- dosym ../conf.d/rstudio-server.conf /etc/rstudio/rserver.conf |
2334 |
- if use dedicated || use server; then |
2335 |
- dopamd src/cpp/server/extras/pam/rstudio |
2336 |
- newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server |
2337 |
- fi |
2338 |
-} |
2339 |
- |
2340 |
-pkg_preinst() { |
2341 |
- use dedicated || gnome2_icon_savelist |
2342 |
- java-pkg-2_pkg_preinst |
2343 |
-} |
2344 |
- |
2345 |
-pkg_postinst() { |
2346 |
- use dedicated || { xdg_desktop_database_update |
2347 |
- xdg_mimeinfo_database_update |
2348 |
- gnome2_icon_cache_update ;} |
2349 |
- |
2350 |
- if use dedicated || use server; then |
2351 |
- enewgroup rstudio-server |
2352 |
- enewuser rstudio-server -1 -1 -1 rstudio-server |
2353 |
- fi |
2354 |
-} |
2355 |
- |
2356 |
-pkg_postrm() { |
2357 |
- use dedicated || { xdg_desktop_database_update |
2358 |
- xdg_mimeinfo_database_update |
2359 |
- gnome2_icon_cache_update ;} |
2360 |
-} |