1 |
commit: 6d07d1869d0fd8bb0fa03777b2c48bc577eddd04 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 31 22:47:33 2022 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 1 07:57:07 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d07d186 |
7 |
|
8 |
sci-mathematics/rkward: Drop 0.7.2-r1 |
9 |
|
10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
sci-mathematics/rkward/Manifest | 1 - |
14 |
.../files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch | 99 ------------ |
15 |
.../files/rkward-0.7.2-fix-dark-themes.patch | 172 --------------------- |
16 |
.../files/rkward-0.7.2-fix-eop-tag-in-html.patch | 32 ---- |
17 |
.../files/rkward-0.7.2-fix-hang-on-exit.patch | 28 ---- |
18 |
.../rkward/files/rkward-0.7.2-fix-hidpi.patch | 25 --- |
19 |
sci-mathematics/rkward/rkward-0.7.2-r1.ebuild | 64 -------- |
20 |
7 files changed, 421 deletions(-) |
21 |
|
22 |
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest |
23 |
index 4335505a63bf..b6b2bd584d0c 100644 |
24 |
--- a/sci-mathematics/rkward/Manifest |
25 |
+++ b/sci-mathematics/rkward/Manifest |
26 |
@@ -1,2 +1 @@ |
27 |
-DIST rkward-0.7.2.tar.gz 6307769 BLAKE2B df72d5d03ecbb57cb08787cc27e66cfacca517a08ca10190c1bb0d627f991dab6b79e9399b0b6c38a545d370d0ecdc8fc5796c1e046a0aac20c0485405a2d72c SHA512 af872b59dea8535eb6ddc0b3db56c45114fc64b0b657e5c8373eb2f7b3a63aa13f9e3c8f6050ff3eff0126df595ed30e1d1e66b91c19b7ba950838613798cb6d |
28 |
DIST rkward-0.7.3.tar.gz 5486401 BLAKE2B 0410c29b79567e3e1b8e1947fa89c2b696a67396a51bf6a0bb5ddee485ee295e66cf20442b5b585f272bb4a6afa77c3217997b2a02752cd7b0bc945d9f099a35 SHA512 dc93b88653c6303fdbe82406837534118ad56eec9a95613b1da8a5711d3f7cc798bb8e0d15955584a8c143c1944469a0e80728b5e5e46edef2d23e9d818782ec |
29 |
|
30 |
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch |
31 |
deleted file mode 100644 |
32 |
index 2cc50575672b..000000000000 |
33 |
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch |
34 |
+++ /dev/null |
35 |
@@ -1,99 +0,0 @@ |
36 |
-From 157207b915647cd8600c616cf6dfed8f83ecff30 Mon Sep 17 00:00:00 2001 |
37 |
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier@×××××××.net> |
38 |
-Date: Sat, 26 Jun 2021 22:16:22 +0200 |
39 |
-Subject: [PATCH] Add dummies for the new R graphics functions to avoid crash. |
40 |
- |
41 |
-This is not a proper implementation, yet. |
42 |
- |
43 |
-CCBUG: https://bugs.kde.org/show_bug.cgi?id=438993 |
44 |
---- |
45 |
- ChangeLog | 3 ++ |
46 |
- .../rkwarddevice/rkgraphicsdevice_setup.cpp | 15 +++++++- |
47 |
- .../rkwarddevice/rkgraphicsdevice_stubs.cpp | 36 +++++++++++++++++++ |
48 |
- 3 files changed, 53 insertions(+), 1 deletion(-) |
49 |
- |
50 |
-diff --git a/ChangeLog b/ChangeLog |
51 |
-index 0210df6e..ae17bc62 100644 |
52 |
---- a/ChangeLog |
53 |
-+++ b/ChangeLog |
54 |
-@@ -1,3 +1,6 @@ |
55 |
-+--- Version 0.7.2b - UNRELEASED |
56 |
-+- Fixed: Crash when attempting to use new graphics features in R 4.1.0 (esp. plotting using ggplot2) |
57 |
-+ |
58 |
- --- Version 0.7.2 - Oct-16-2020 |
59 |
- - Script preview keeps vertical scroll position when updating |
60 |
- - Python development scripts have been ported to python3 |
61 |
-diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp |
62 |
-index 9909639f..e215c090 100644 |
63 |
---- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp |
64 |
-+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp |
65 |
-@@ -216,6 +216,19 @@ bool RKGraphicsDeviceDesc::init (pDevDesc dev, double pointsize, const QStringLi |
66 |
- #endif |
67 |
- dev->newFrameConfirm = RKD_NewFrameConfirm; |
68 |
- |
69 |
-+#if R_VERSION >= R_Version (2, 14, 0) |
70 |
-+ dev->holdflush = RKD_HoldFlush; |
71 |
-+#endif |
72 |
-+ |
73 |
-+#if R_VERSION >= R_Version (4, 1, 0) |
74 |
-+ dev->setPattern = RKD_SetPattern; |
75 |
-+ dev->releasePattern = RKD_ReleasePattern; |
76 |
-+ dev->setClipPath = RKD_SetClipPath; |
77 |
-+ dev->releaseClipPath = RKD_ReleaseClipPath; |
78 |
-+ dev->setMask = RKD_SetMask; |
79 |
-+ dev->releaseMask = RKD_ReleaseMask; |
80 |
-+ dev->deviceVersion = 14; |
81 |
-+ dev->deviceClip = FALSE; // for now |
82 |
-+#endif |
83 |
- return true; |
84 |
- } |
85 |
-- |
86 |
-diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp |
87 |
-index 716a9511..b7be1609 100644 |
88 |
---- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp |
89 |
-+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp |
90 |
-@@ -579,5 +579,41 @@ void RKD_onExit (pDevDesc dev) { |
91 |
- } |
92 |
- dev->gettingEvent = (Rboolean) false; |
93 |
- } |
94 |
-+#endif |
95 |
-+ |
96 |
-+#if R_VERSION >= R_Version (2, 14, 0) |
97 |
-+int RKD_HoldFlush (pDevDesc dev, int level) { |
98 |
-+#warning implement me |
99 |
-+ return 0; |
100 |
-+} |
101 |
-+#endif |
102 |
-+ |
103 |
-+#if R_VERSION >= R_Version (4, 1, 0) |
104 |
-+SEXP RKD_SetPattern (SEXP pattern, pDevDesc dd) { |
105 |
-+#warning implement me |
106 |
-+ return R_NilValue; |
107 |
-+} |
108 |
-+ |
109 |
-+void RKD_ReleasePattern (SEXP ref, pDevDesc dd) { |
110 |
-+#warning implement me |
111 |
-+} |
112 |
-+ |
113 |
-+SEXP RKD_SetClipPath (SEXP path, SEXP ref, pDevDesc dd) { |
114 |
-+#warning implement me |
115 |
-+ return R_NilValue; |
116 |
-+} |
117 |
-+ |
118 |
-+void RKD_ReleaseClipPath (SEXP ref, pDevDesc dd) { |
119 |
-+#warning implement me |
120 |
-+} |
121 |
-+ |
122 |
-+SEXP RKD_SetMask (SEXP path, SEXP ref, pDevDesc dd) { |
123 |
-+#warning implement me |
124 |
-+ return R_NilValue; |
125 |
-+} |
126 |
-+ |
127 |
-+void RKD_ReleaseMask (SEXP ref, pDevDesc dd) { |
128 |
-+#warning implement me |
129 |
-+} |
130 |
- |
131 |
- #endif |
132 |
--- |
133 |
-GitLab |
134 |
- |
135 |
|
136 |
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch |
137 |
deleted file mode 100644 |
138 |
index 005285e281bf..000000000000 |
139 |
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch |
140 |
+++ /dev/null |
141 |
@@ -1,172 +0,0 @@ |
142 |
-From 5d64b6d23f19f4307fca2d79838bb6e1e38c7f36 Mon Sep 17 00:00:00 2001 |
143 |
-From: Nick Panayioto <npanayioto3@×××××.com> |
144 |
-Date: Thu, 28 Oct 2021 05:31:00 -0400 |
145 |
-Subject: [PATCH] Change plugin widgets that set their colors to use |
146 |
- setStyleSheet, then clear the style sheet to restore the default color. |
147 |
- |
148 |
-This looks the same on light themes and makes dark themes not use white text on white background. |
149 |
- |
150 |
-BUG: 389914 |
151 |
---- |
152 |
- rkward/misc/getfilenamewidget.cpp | 8 ++------ |
153 |
- rkward/misc/getfilenamewidget.h | 2 +- |
154 |
- rkward/misc/rksaveobjectchooser.cpp | 6 ++---- |
155 |
- rkward/misc/rksaveobjectchooser.h | 2 +- |
156 |
- rkward/plugin/rkinput.cpp | 8 +++----- |
157 |
- rkward/plugin/rkpluginbrowser.cpp | 8 ++++---- |
158 |
- rkward/plugin/rkpluginsaveobject.cpp | 4 ++-- |
159 |
- rkward/plugin/rkvarslot.cpp | 7 +++---- |
160 |
- 8 files changed, 18 insertions(+), 27 deletions(-) |
161 |
- |
162 |
-diff --git a/rkward/misc/getfilenamewidget.cpp b/rkward/misc/getfilenamewidget.cpp |
163 |
-index 6b7f1d26..a439b8a4 100644 |
164 |
---- a/rkward/misc/getfilenamewidget.cpp |
165 |
-+++ b/rkward/misc/getfilenamewidget.cpp |
166 |
-@@ -137,11 +137,7 @@ QString GetFileNameWidget::getLocation () { |
167 |
- return (edit->url ().url ()); |
168 |
- } |
169 |
- |
170 |
--void GetFileNameWidget::setBackgroundColor (const QColor & color) { |
171 |
-+void GetFileNameWidget::setStyleSheet (const QString & style) { |
172 |
- RK_TRACE (MISC); |
173 |
-- |
174 |
-- QPalette palette = edit->lineEdit ()->palette (); |
175 |
-- palette.setColor (edit->lineEdit ()->backgroundRole (), color); |
176 |
-- edit->lineEdit ()->setPalette (palette); |
177 |
-+ edit->setStyleSheet(style); |
178 |
- } |
179 |
-- |
180 |
-diff --git a/rkward/misc/getfilenamewidget.h b/rkward/misc/getfilenamewidget.h |
181 |
-index ecbf1364..71390667 100644 |
182 |
---- a/rkward/misc/getfilenamewidget.h |
183 |
-+++ b/rkward/misc/getfilenamewidget.h |
184 |
-@@ -41,7 +41,7 @@ public: |
185 |
- /** set the filename/location from outside */ |
186 |
- void setLocation (const QString &new_location); |
187 |
- |
188 |
-- void setBackgroundColor (const QColor & color); |
189 |
-+ void setStyleSheet (const QString &style); |
190 |
- |
191 |
- /** retrieves the current location */ |
192 |
- QString getLocation (); |
193 |
-diff --git a/rkward/misc/rksaveobjectchooser.cpp b/rkward/misc/rksaveobjectchooser.cpp |
194 |
-index 5d53111d..157f6940 100644 |
195 |
---- a/rkward/misc/rksaveobjectchooser.cpp |
196 |
-+++ b/rkward/misc/rksaveobjectchooser.cpp |
197 |
-@@ -194,12 +194,10 @@ void RKSaveObjectChooser::updateState () { |
198 |
- } |
199 |
- } |
200 |
- |
201 |
--void RKSaveObjectChooser::setBackgroundColor (const QColor &color) { |
202 |
-+void RKSaveObjectChooser::setStyleSheet (const QString &style) { |
203 |
- RK_TRACE (MISC); |
204 |
- |
205 |
-- QPalette palette = name_edit->palette (); |
206 |
-- palette.setColor (name_edit->backgroundRole (), color); |
207 |
-- name_edit->setPalette (palette); |
208 |
-+ name_edit->setStyleSheet(style); |
209 |
- } |
210 |
- |
211 |
- QString RKSaveObjectChooser::currentBaseName () const { |
212 |
-diff --git a/rkward/misc/rksaveobjectchooser.h b/rkward/misc/rksaveobjectchooser.h |
213 |
-index c5da85c8..3cc56a85 100644 |
214 |
---- a/rkward/misc/rksaveobjectchooser.h |
215 |
-+++ b/rkward/misc/rksaveobjectchooser.h |
216 |
-@@ -37,7 +37,7 @@ public: |
217 |
- QString currentBaseName () const; |
218 |
- bool isOk () const; |
219 |
- void setBaseName (const QString &name); |
220 |
-- void setBackgroundColor (const QColor &color); |
221 |
-+ void setStyleSheet (const QString &style); |
222 |
- RObject* rootObject () const { return root_object; }; |
223 |
- void setRootObject (RObject* new_root); |
224 |
- private slots: |
225 |
-diff --git a/rkward/plugin/rkinput.cpp b/rkward/plugin/rkinput.cpp |
226 |
-index fdbab36a..a1a03ebd 100644 |
227 |
---- a/rkward/plugin/rkinput.cpp |
228 |
-+++ b/rkward/plugin/rkinput.cpp |
229 |
-@@ -96,17 +96,15 @@ void RKInput::updateColor () { |
230 |
- if (!widget) widget = textedit; |
231 |
- RK_ASSERT (widget); |
232 |
- |
233 |
-- QPalette palette = widget->palette (); |
234 |
- if (isEnabled ()) { |
235 |
- if (isSatisfied ()) { |
236 |
-- palette.setColor (widget->backgroundRole (), QColor (255, 255, 255)); |
237 |
-+ widget->setStyleSheet(""); |
238 |
- } else { |
239 |
-- palette.setColor (widget->backgroundRole (), QColor (255, 0, 0)); |
240 |
-+ widget->setStyleSheet("background: red; color: black"); |
241 |
- } |
242 |
- } else { |
243 |
-- palette.setColor (widget->backgroundRole (), QColor (200, 200, 200)); |
244 |
-+ widget->setStyleSheet("background: rgb(200, 200, 200); color: black"); |
245 |
- } |
246 |
-- widget->setPalette (palette); |
247 |
- } |
248 |
- |
249 |
- void RKInput::requirednessChanged (RKComponentPropertyBase *) { |
250 |
-diff --git a/rkward/plugin/rkpluginbrowser.cpp b/rkward/plugin/rkpluginbrowser.cpp |
251 |
-index 9612acb5..ff862d16 100644 |
252 |
---- a/rkward/plugin/rkpluginbrowser.cpp |
253 |
-+++ b/rkward/plugin/rkpluginbrowser.cpp |
254 |
-@@ -184,14 +184,14 @@ void RKPluginBrowser::updateColor () { |
255 |
- |
256 |
- if (isEnabled ()) { |
257 |
- if (status == RKComponentBase::Satisfied) { |
258 |
-- selector->setBackgroundColor (QColor (255, 255, 255)); |
259 |
-+ selector->setStyleSheet (QString ("")); |
260 |
- } else if (status == RKComponentBase::Processing) { |
261 |
-- selector->setBackgroundColor (QColor (255, 255, 0)); |
262 |
-+ selector->setStyleSheet (QString ("background: yellow; color: black")); |
263 |
- } else { |
264 |
-- selector->setBackgroundColor (QColor (255, 0, 0)); |
265 |
-+ selector->setStyleSheet (QString ("background: red; color: black")); |
266 |
- } |
267 |
- } else { |
268 |
-- selector->setBackgroundColor (QColor (200, 200, 200)); |
269 |
-+ selector->setStyleSheet (QString ("background: rgb(200, 200, 200); color: black")); |
270 |
- } |
271 |
- } |
272 |
- |
273 |
-diff --git a/rkward/plugin/rkpluginsaveobject.cpp b/rkward/plugin/rkpluginsaveobject.cpp |
274 |
-index 7c084a99..52b9d867 100644 |
275 |
---- a/rkward/plugin/rkpluginsaveobject.cpp |
276 |
-+++ b/rkward/plugin/rkpluginsaveobject.cpp |
277 |
-@@ -82,8 +82,8 @@ RKPluginSaveObject::~RKPluginSaveObject () { |
278 |
- void RKPluginSaveObject::update () { |
279 |
- RK_TRACE (PLUGIN); |
280 |
- |
281 |
-- if (isSatisfied ()) selector->setBackgroundColor (QColor (255, 255, 255)); |
282 |
-- else selector->setBackgroundColor (QColor (255, 0, 0)); |
283 |
-+ if (isSatisfied ()) selector->setStyleSheet(QString("")); |
284 |
-+ else selector->setStyleSheet(QString("background: red; color: black")); |
285 |
- changed (); |
286 |
- } |
287 |
- |
288 |
-diff --git a/rkward/plugin/rkvarslot.cpp b/rkward/plugin/rkvarslot.cpp |
289 |
-index bc250b25..6a2ae601 100644 |
290 |
---- a/rkward/plugin/rkvarslot.cpp |
291 |
-+++ b/rkward/plugin/rkvarslot.cpp |
292 |
-@@ -183,15 +183,14 @@ void RKVarSlot::updateLook () { |
293 |
- |
294 |
- QPalette palette = list->palette (); |
295 |
- if (!isSatisfied ()) { // implies that it is enabled |
296 |
-- palette.setColor (QPalette::Base, QColor (255, 0, 0)); |
297 |
-+ list->setStyleSheet(QString("background: red; color: black")); |
298 |
- } else { |
299 |
- if (isEnabled ()) { |
300 |
-- palette.setColor (QPalette::Base, QColor (255, 255, 255)); |
301 |
-+ list->setStyleSheet(QString("")); |
302 |
- } else { |
303 |
-- palette.setColor (QPalette::Base, QColor (200, 200, 200)); |
304 |
-+ list->setStyleSheet(QString("background: rgb(200, 200, 200); color: black")); |
305 |
- } |
306 |
- } |
307 |
-- list->setPalette(palette); |
308 |
- } |
309 |
- |
310 |
- void RKVarSlot::changeEvent (QEvent* event) { |
311 |
--- |
312 |
-GitLab |
313 |
- |
314 |
|
315 |
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch |
316 |
deleted file mode 100644 |
317 |
index bd95490cbe4c..000000000000 |
318 |
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch |
319 |
+++ /dev/null |
320 |
@@ -1,32 +0,0 @@ |
321 |
-From 5f8fb9cd211f0e12ef40a0fc34a42c31f2a24475 Mon Sep 17 00:00:00 2001 |
322 |
-From: Johnny Jazeix <jazeix@×××××.com> |
323 |
-Date: Tue, 7 Dec 2021 19:03:19 +0100 |
324 |
-Subject: [PATCH] fix end of paragraph tag in html for the rksetupwizard |
325 |
- |
326 |
---- |
327 |
- rkward/dialogs/rksetupwizard.cpp | 6 +++--- |
328 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
329 |
- |
330 |
-diff --git a/rkward/dialogs/rksetupwizard.cpp b/rkward/dialogs/rksetupwizard.cpp |
331 |
-index b14e06ec..e4787793 100644 |
332 |
---- a/rkward/dialogs/rksetupwizard.cpp |
333 |
-+++ b/rkward/dialogs/rksetupwizard.cpp |
334 |
-@@ -130,12 +130,12 @@ RKSetupWizard::RKSetupWizard(QWidget* parent, InvokationReason reason, const QLi |
335 |
- auto l = new QVBoxLayout(firstpage); |
336 |
- QString intro = i18n("<p>This dialog will guide you through a quick check of the basic setup of the required (or recommended) components.</p>"); |
337 |
- if (reason == NewVersionRKWard) { |
338 |
-- intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of RKWard has been detected.</p"); |
339 |
-+ intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of RKWard has been detected.</p>"); |
340 |
- } else if (reason == NewVersionR) { |
341 |
- // TODO: invoke this! |
342 |
-- intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of R has been detected.</p"); |
343 |
-+ intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of R has been detected.</p>"); |
344 |
- } else if (reason == ProblemsDetected) { |
345 |
-- intro += i18n("<p>The setup assistant has been invoked, automatically, because a problem has been detected in your setup.</p"); |
346 |
-+ intro += i18n("<p>The setup assistant has been invoked, automatically, because a problem has been detected in your setup.</p>"); |
347 |
- } |
348 |
- l->addWidget(RKCommonFunctions::wordWrappedLabel(intro)); |
349 |
- auto waiting_to_start_label = RKCommonFunctions::wordWrappedLabel(i18n("<b>Waiting for R backend...</b>") + "<p> </p><p> </p>"); |
350 |
--- |
351 |
-GitLab |
352 |
- |
353 |
|
354 |
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch |
355 |
deleted file mode 100644 |
356 |
index 1ce37d11ffeb..000000000000 |
357 |
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch |
358 |
+++ /dev/null |
359 |
@@ -1,28 +0,0 @@ |
360 |
-From 4f17155eae5b81246e8172a80b9421ec0ad22bed Mon Sep 17 00:00:00 2001 |
361 |
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier@×××××××.net> |
362 |
-Date: Tue, 12 Jan 2021 09:21:29 +0100 |
363 |
-Subject: [PATCH] Fix hang on exit. |
364 |
- |
365 |
-(Not sure, whether there are other potential hang conditions on exit, but this is one.) |
366 |
- |
367 |
-BUG: 430680 |
368 |
---- |
369 |
- rkward/rbackend/rkrbackendprotocol_frontend.cpp | 2 +- |
370 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
371 |
- |
372 |
-diff --git a/rkward/rbackend/rkrbackendprotocol_frontend.cpp b/rkward/rbackend/rkrbackendprotocol_frontend.cpp |
373 |
-index c46ed5de..e5cf5d68 100644 |
374 |
---- a/rkward/rbackend/rkrbackendprotocol_frontend.cpp |
375 |
-+++ b/rkward/rbackend/rkrbackendprotocol_frontend.cpp |
376 |
-@@ -42,7 +42,7 @@ RKRBackendProtocolFrontend::~RKRBackendProtocolFrontend () { |
377 |
- RKFrontendTransmitter::instance ()->wait(1000); // Wait for thread to catch the backend's exit request, and exit() |
378 |
- RKFrontendTransmitter::instance ()->quit(); // Tell it to quit, otherwise |
379 |
- RKFrontendTransmitter::instance ()->wait(3000); // Wait for thread to quit and clean up. |
380 |
-- qApp->processEvents(); // Not strictly needed, but avoids some mem leaks on exit by handling all posted BackendExit events |
381 |
-+ qApp->processEvents(QEventLoop::AllEvents, 500); // Not strictly needed, but avoids some mem leaks on exit by handling all posted BackendExit events |
382 |
- delete RKFrontendTransmitter::instance (); |
383 |
- } |
384 |
- |
385 |
--- |
386 |
-GitLab |
387 |
- |
388 |
|
389 |
diff --git a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch b/sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch |
390 |
deleted file mode 100644 |
391 |
index cff7b60f1951..000000000000 |
392 |
--- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch |
393 |
+++ /dev/null |
394 |
@@ -1,25 +0,0 @@ |
395 |
-From f34cb38798e8a7d3f9a39f26be4ecab3013ea57c Mon Sep 17 00:00:00 2001 |
396 |
-From: Nicolas Fella <nicolas.fella@×××.de> |
397 |
-Date: Tue, 5 Oct 2021 22:36:30 +0200 |
398 |
-Subject: [PATCH] Enable highdpi pixmaps |
399 |
- |
400 |
-This fixes icons being pixelated on highdpi screens |
401 |
---- |
402 |
- rkward/main.cpp | 1 + |
403 |
- 1 file changed, 1 insertion(+) |
404 |
- |
405 |
-diff --git a/rkward/main.cpp b/rkward/main.cpp |
406 |
-index 8eafd25c..7dcb34a5 100644 |
407 |
---- a/rkward/main.cpp |
408 |
-+++ b/rkward/main.cpp |
409 |
-@@ -239,6 +239,7 @@ QString resolveRSpecOrFail (QString input, QString message) { |
410 |
- |
411 |
- int main (int argc, char *argv[]) { |
412 |
- RK_Debug::RK_Debug_Level = DL_WARNING; |
413 |
-+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); |
414 |
- #ifndef NO_QT_WEBENGINE |
415 |
- // annoyingly, QWebEngineUrlSchemes have to be registered before creating the app. |
416 |
- QWebEngineUrlScheme scheme("help"); |
417 |
--- |
418 |
-GitLab |
419 |
- |
420 |
|
421 |
diff --git a/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild b/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild |
422 |
deleted file mode 100644 |
423 |
index 80ead3401703..000000000000 |
424 |
--- a/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild |
425 |
+++ /dev/null |
426 |
@@ -1,64 +0,0 @@ |
427 |
-# Copyright 1999-2021 Gentoo Authors |
428 |
-# Distributed under the terms of the GNU General Public License v2 |
429 |
- |
430 |
-EAPI=8 |
431 |
- |
432 |
-ECM_HANDBOOK="forceoptional" |
433 |
-inherit ecm kde.org optfeature |
434 |
- |
435 |
-DESCRIPTION="IDE for the R-project" |
436 |
-HOMEPAGE="https://rkward.kde.org/" |
437 |
- |
438 |
-if [[ ${KDE_BUILD_TYPE} = release ]]; then |
439 |
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz" |
440 |
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
441 |
-fi |
442 |
- |
443 |
-LICENSE="GPL-2+ LGPL-2" |
444 |
-SLOT="5" |
445 |
-IUSE="" |
446 |
- |
447 |
-DEPEND=" |
448 |
- dev-lang/R |
449 |
- dev-qt/qtgui:5 |
450 |
- dev-qt/qtnetwork:5 |
451 |
- dev-qt/qtprintsupport:5 |
452 |
- dev-qt/qtscript:5 |
453 |
- dev-qt/qtwebengine:5[widgets] |
454 |
- dev-qt/qtwidgets:5 |
455 |
- dev-qt/qtxml:5 |
456 |
- kde-frameworks/kcompletion:5 |
457 |
- kde-frameworks/kconfig:5 |
458 |
- kde-frameworks/kconfigwidgets:5 |
459 |
- kde-frameworks/kcoreaddons:5 |
460 |
- kde-frameworks/kcrash:5 |
461 |
- kde-frameworks/ki18n:5 |
462 |
- kde-frameworks/kio:5 |
463 |
- kde-frameworks/kjobwidgets:5 |
464 |
- kde-frameworks/knotifications:5 |
465 |
- kde-frameworks/kparts:5 |
466 |
- kde-frameworks/kservice:5 |
467 |
- kde-frameworks/ktexteditor:5 |
468 |
- kde-frameworks/kwidgetsaddons:5 |
469 |
- kde-frameworks/kwindowsystem:5 |
470 |
- kde-frameworks/kxmlgui:5 |
471 |
-" |
472 |
-RDEPEND="${DEPEND}" |
473 |
-BDEPEND="sys-devel/gettext" |
474 |
- |
475 |
-PATCHES=( |
476 |
- "${FILESDIR}"/${P}-fix-crash-w-R-4.1.0.patch # KDE-bug 438993 |
477 |
- "${FILESDIR}"/${P}-fix-hang-on-exit.patch # KDE-bug 430680 |
478 |
- "${FILESDIR}"/${P}-fix-dark-themes.patch # KDE-bug 389914 |
479 |
- "${FILESDIR}"/${P}-fix-eop-tag-in-html.patch |
480 |
- "${FILESDIR}"/${P}-fix-hidpi.patch |
481 |
-) |
482 |
- |
483 |
-pkg_postinst() { |
484 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
485 |
- optfeature "kate plugins support" "kde-apps/kate:${SLOT}" |
486 |
- optfeature "prendering (or previewing) R markdown (.Rmd) files" "app-text/pandoc" |
487 |
- optfeature "managing citations while writing articles" "app-text/kbibtex" |
488 |
- fi |
489 |
- ecm_pkg_postinst |
490 |
-} |