diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-06-29 12:04:12 +0100 |
commit | 0f558761aa2dee1017b4751e4017205e015a9560 (patch) | |
tree | 037df795519468a25d9362b4e95cdaeb84eb1cf9 /sci-mathematics/rkward | |
parent | 752d6256e5204b958b0ef7905675a940b5e9172f (diff) |
gentoo resync : 29.12.2022
Diffstat (limited to 'sci-mathematics/rkward')
-rw-r--r-- | sci-mathematics/rkward/Manifest | 9 | ||||
-rw-r--r-- | sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch | 99 | ||||
-rw-r--r-- | sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch | 172 | ||||
-rw-r--r-- | sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch | 32 | ||||
-rw-r--r-- | sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch | 28 | ||||
-rw-r--r-- | sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch | 25 | ||||
-rw-r--r-- | sci-mathematics/rkward/rkward-0.7.4.ebuild (renamed from sci-mathematics/rkward/rkward-0.7.2-r1.ebuild) | 15 |
7 files changed, 6 insertions, 374 deletions
diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest index 1bcb6366b515..757f720f6c13 100644 --- a/sci-mathematics/rkward/Manifest +++ b/sci-mathematics/rkward/Manifest @@ -1,8 +1,3 @@ -AUX rkward-0.7.2-fix-crash-w-R-4.1.0.patch 3018 BLAKE2B a9d62357819b3c6f0a81f217bb9153483b9524946b0aa38fe4110be6b05c008fc67c68610969c5b4c9aff4e35f3062cc8f5c5452f789d1d29ba01adc80dd43ae SHA512 510bd191a6c9f4ffe2c30fac6af58889fe8fdeb08db37fadd6c20d61f268a6fa412b6248d569b8baaecb095f9a6d330cf2619e2fb22e01d2111a85edeb1b2c78 -AUX rkward-0.7.2-fix-dark-themes.patch 6435 BLAKE2B 9a1ee63898e04cb7147b178c2aedb7fcc0b035dd622197ade838e711aba7d19e9894377c624d4b330b15b010c161271d47fc22ebd660ad42ae053215be3f6031 SHA512 a093deab26f2f2d5284069940b89cd2744c7b9d3b8c4b8eddd9ad2cda1cd5f221db08c30c3bde84f024b3d551307e45ad7383fe597582350b6e1230faea26208 -AUX rkward-0.7.2-fix-eop-tag-in-html.patch 1937 BLAKE2B 3fe2bdd853d370aaa3a52c4cb3f8edb2a93788f932c4af0232e9c9b14b5acf42e8f157f673a4a776fa2b807ee261e2bae4c4751db4a03ec7099a8704bf5ae4da SHA512 9f9cf1377e52009d586869caab1d556998007da6a529d8207e40c62597b6053ca3e98b852d3bfa0e1ede271367ab4811a73a56f4651a551fde4d84b29d3105ff -AUX rkward-0.7.2-fix-hang-on-exit.patch 1405 BLAKE2B 66655ba68e1f2b09e35b179817f74f6a26aff7e153a9bd9a3beff2bc48ccaf70793a15f96616f38101b6d103103787d723f18b22d6b300f4a46b01dc501efbb4 SHA512 af893064c7999e10e3672818e5803740b345d0e8bfb396306eb29ac04a8a44879e8a90ecfab22a51b807a00d0975c420651e6654b0b86dae9bd35e9f66bd03bf -AUX rkward-0.7.2-fix-hidpi.patch 809 BLAKE2B f855f8de2e4fcf0ff70676a3f0b0684c2d1d4a5a85a9946824522c9b40afb8d3c233fc9d0c65a5b50a3969b4984bd314024e525464ae0fa67bb2a8c2c9975958 SHA512 4d856bae8ab9397f9efaf5ce581466ef5a6735d67b5348114f12a3446f09148e966c4562e657b872d37a0d4d1d35cd402d91372731bfc20266ef5d84fc8d5d0e -DIST rkward-0.7.2.tar.gz 6307769 BLAKE2B df72d5d03ecbb57cb08787cc27e66cfacca517a08ca10190c1bb0d627f991dab6b79e9399b0b6c38a545d370d0ecdc8fc5796c1e046a0aac20c0485405a2d72c SHA512 af872b59dea8535eb6ddc0b3db56c45114fc64b0b657e5c8373eb2f7b3a63aa13f9e3c8f6050ff3eff0126df595ed30e1d1e66b91c19b7ba950838613798cb6d -EBUILD rkward-0.7.2-r1.ebuild 1668 BLAKE2B f0167baabfa4c85bec0f1057eba552577a7e6ce8b3a03f9ca40a8cc21587892a7094c19c103ebd7af03c30ac3ddff5cf63c5b92cb6fad11d2164929a4ef66f76 SHA512 aa9a0e5627ac4b7cd3af3935d9988a6a4b93c6ea2572d442ecd01b367262fd519cb6dec9fa02d7bf8bb1d663810e59acb4a51afe76b0c0b40bc9b8e499d1f995 +DIST rkward-0.7.4.tar.gz 5677112 BLAKE2B 5105103e95285c77d53eeffe3cb98e5945d4be29066c5726cd76307c70176cd44eb878d0459257de2f0efb756ecc880343226ce7060bc0866f65f8a3f7f3ea96 SHA512 64a5a42e7b36af410738bdaf19c9bb2e0f7f99816a49dd37be1a1748d925665728ba9feb1977e62f2e710e0e63bc6085c1e957ad0f1feaba58baf22efa4f708b +EBUILD rkward-0.7.4.ebuild 1419 BLAKE2B 91ab4906138bf57dc3f5f8ad3b204a0b7d8d837c31fee423eafbd172bcd6e6fd973b5f9a2cde04d2d328b9027c8c84442c6e8420270098c631fb86707754c038 SHA512 3db305b798696092589bc22db0ac48a537f6a58bf05a605f926b248f90552a42b8188319f51bba9eb126626959747d00d65b40f0fb181225f1e9e9aeedd59cc5 MISC metadata.xml 448 BLAKE2B c43701b135281f800da40813b11df123d5088bfa0beb3e0700ba354e991ec18aac267dc0a0f3d206bdd06eef5d50f78378a107f05d1f01d17b0d409e632066de SHA512 b9b3c376714fc5c81008caed25794d262d2d60cafbd3fcdccfeccdf9666b16dbb09f1d06025526c8304c640e150492b685df95f200002e8ef41aed609b0893a8 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 deleted file mode 100644 index 2cc50575672b..000000000000 --- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 157207b915647cd8600c616cf6dfed8f83ecff30 Mon Sep 17 00:00:00 2001 -From: Thomas Friedrichsmeier <thomas.friedrichsmeier@kdemail.net> -Date: Sat, 26 Jun 2021 22:16:22 +0200 -Subject: [PATCH] Add dummies for the new R graphics functions to avoid crash. - -This is not a proper implementation, yet. - -CCBUG: https://bugs.kde.org/show_bug.cgi?id=438993 ---- - ChangeLog | 3 ++ - .../rkwarddevice/rkgraphicsdevice_setup.cpp | 15 +++++++- - .../rkwarddevice/rkgraphicsdevice_stubs.cpp | 36 +++++++++++++++++++ - 3 files changed, 53 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 0210df6e..ae17bc62 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,6 @@ -+--- Version 0.7.2b - UNRELEASED -+- Fixed: Crash when attempting to use new graphics features in R 4.1.0 (esp. plotting using ggplot2) -+ - --- Version 0.7.2 - Oct-16-2020 - - Script preview keeps vertical scroll position when updating - - Python development scripts have been ported to python3 -diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp -index 9909639f..e215c090 100644 ---- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp -+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_setup.cpp -@@ -216,6 +216,19 @@ bool RKGraphicsDeviceDesc::init (pDevDesc dev, double pointsize, const QStringLi - #endif - dev->newFrameConfirm = RKD_NewFrameConfirm; - -+#if R_VERSION >= R_Version (2, 14, 0) -+ dev->holdflush = RKD_HoldFlush; -+#endif -+ -+#if R_VERSION >= R_Version (4, 1, 0) -+ dev->setPattern = RKD_SetPattern; -+ dev->releasePattern = RKD_ReleasePattern; -+ dev->setClipPath = RKD_SetClipPath; -+ dev->releaseClipPath = RKD_ReleaseClipPath; -+ dev->setMask = RKD_SetMask; -+ dev->releaseMask = RKD_ReleaseMask; -+ dev->deviceVersion = 14; -+ dev->deviceClip = FALSE; // for now -+#endif - return true; - } -- -diff --git a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp -index 716a9511..b7be1609 100644 ---- a/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp -+++ b/rkward/rbackend/rkwarddevice/rkgraphicsdevice_stubs.cpp -@@ -579,5 +579,41 @@ void RKD_onExit (pDevDesc dev) { - } - dev->gettingEvent = (Rboolean) false; - } -+#endif -+ -+#if R_VERSION >= R_Version (2, 14, 0) -+int RKD_HoldFlush (pDevDesc dev, int level) { -+#warning implement me -+ return 0; -+} -+#endif -+ -+#if R_VERSION >= R_Version (4, 1, 0) -+SEXP RKD_SetPattern (SEXP pattern, pDevDesc dd) { -+#warning implement me -+ return R_NilValue; -+} -+ -+void RKD_ReleasePattern (SEXP ref, pDevDesc dd) { -+#warning implement me -+} -+ -+SEXP RKD_SetClipPath (SEXP path, SEXP ref, pDevDesc dd) { -+#warning implement me -+ return R_NilValue; -+} -+ -+void RKD_ReleaseClipPath (SEXP ref, pDevDesc dd) { -+#warning implement me -+} -+ -+SEXP RKD_SetMask (SEXP path, SEXP ref, pDevDesc dd) { -+#warning implement me -+ return R_NilValue; -+} -+ -+void RKD_ReleaseMask (SEXP ref, pDevDesc dd) { -+#warning implement me -+} - - #endif --- -GitLab - 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 deleted file mode 100644 index 005285e281bf..000000000000 --- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 5d64b6d23f19f4307fca2d79838bb6e1e38c7f36 Mon Sep 17 00:00:00 2001 -From: Nick Panayioto <npanayioto3@gmail.com> -Date: Thu, 28 Oct 2021 05:31:00 -0400 -Subject: [PATCH] Change plugin widgets that set their colors to use - setStyleSheet, then clear the style sheet to restore the default color. - -This looks the same on light themes and makes dark themes not use white text on white background. - -BUG: 389914 ---- - rkward/misc/getfilenamewidget.cpp | 8 ++------ - rkward/misc/getfilenamewidget.h | 2 +- - rkward/misc/rksaveobjectchooser.cpp | 6 ++---- - rkward/misc/rksaveobjectchooser.h | 2 +- - rkward/plugin/rkinput.cpp | 8 +++----- - rkward/plugin/rkpluginbrowser.cpp | 8 ++++---- - rkward/plugin/rkpluginsaveobject.cpp | 4 ++-- - rkward/plugin/rkvarslot.cpp | 7 +++---- - 8 files changed, 18 insertions(+), 27 deletions(-) - -diff --git a/rkward/misc/getfilenamewidget.cpp b/rkward/misc/getfilenamewidget.cpp -index 6b7f1d26..a439b8a4 100644 ---- a/rkward/misc/getfilenamewidget.cpp -+++ b/rkward/misc/getfilenamewidget.cpp -@@ -137,11 +137,7 @@ QString GetFileNameWidget::getLocation () { - return (edit->url ().url ()); - } - --void GetFileNameWidget::setBackgroundColor (const QColor & color) { -+void GetFileNameWidget::setStyleSheet (const QString & style) { - RK_TRACE (MISC); -- -- QPalette palette = edit->lineEdit ()->palette (); -- palette.setColor (edit->lineEdit ()->backgroundRole (), color); -- edit->lineEdit ()->setPalette (palette); -+ edit->setStyleSheet(style); - } -- -diff --git a/rkward/misc/getfilenamewidget.h b/rkward/misc/getfilenamewidget.h -index ecbf1364..71390667 100644 ---- a/rkward/misc/getfilenamewidget.h -+++ b/rkward/misc/getfilenamewidget.h -@@ -41,7 +41,7 @@ public: - /** set the filename/location from outside */ - void setLocation (const QString &new_location); - -- void setBackgroundColor (const QColor & color); -+ void setStyleSheet (const QString &style); - - /** retrieves the current location */ - QString getLocation (); -diff --git a/rkward/misc/rksaveobjectchooser.cpp b/rkward/misc/rksaveobjectchooser.cpp -index 5d53111d..157f6940 100644 ---- a/rkward/misc/rksaveobjectchooser.cpp -+++ b/rkward/misc/rksaveobjectchooser.cpp -@@ -194,12 +194,10 @@ void RKSaveObjectChooser::updateState () { - } - } - --void RKSaveObjectChooser::setBackgroundColor (const QColor &color) { -+void RKSaveObjectChooser::setStyleSheet (const QString &style) { - RK_TRACE (MISC); - -- QPalette palette = name_edit->palette (); -- palette.setColor (name_edit->backgroundRole (), color); -- name_edit->setPalette (palette); -+ name_edit->setStyleSheet(style); - } - - QString RKSaveObjectChooser::currentBaseName () const { -diff --git a/rkward/misc/rksaveobjectchooser.h b/rkward/misc/rksaveobjectchooser.h -index c5da85c8..3cc56a85 100644 ---- a/rkward/misc/rksaveobjectchooser.h -+++ b/rkward/misc/rksaveobjectchooser.h -@@ -37,7 +37,7 @@ public: - QString currentBaseName () const; - bool isOk () const; - void setBaseName (const QString &name); -- void setBackgroundColor (const QColor &color); -+ void setStyleSheet (const QString &style); - RObject* rootObject () const { return root_object; }; - void setRootObject (RObject* new_root); - private slots: -diff --git a/rkward/plugin/rkinput.cpp b/rkward/plugin/rkinput.cpp -index fdbab36a..a1a03ebd 100644 ---- a/rkward/plugin/rkinput.cpp -+++ b/rkward/plugin/rkinput.cpp -@@ -96,17 +96,15 @@ void RKInput::updateColor () { - if (!widget) widget = textedit; - RK_ASSERT (widget); - -- QPalette palette = widget->palette (); - if (isEnabled ()) { - if (isSatisfied ()) { -- palette.setColor (widget->backgroundRole (), QColor (255, 255, 255)); -+ widget->setStyleSheet(""); - } else { -- palette.setColor (widget->backgroundRole (), QColor (255, 0, 0)); -+ widget->setStyleSheet("background: red; color: black"); - } - } else { -- palette.setColor (widget->backgroundRole (), QColor (200, 200, 200)); -+ widget->setStyleSheet("background: rgb(200, 200, 200); color: black"); - } -- widget->setPalette (palette); - } - - void RKInput::requirednessChanged (RKComponentPropertyBase *) { -diff --git a/rkward/plugin/rkpluginbrowser.cpp b/rkward/plugin/rkpluginbrowser.cpp -index 9612acb5..ff862d16 100644 ---- a/rkward/plugin/rkpluginbrowser.cpp -+++ b/rkward/plugin/rkpluginbrowser.cpp -@@ -184,14 +184,14 @@ void RKPluginBrowser::updateColor () { - - if (isEnabled ()) { - if (status == RKComponentBase::Satisfied) { -- selector->setBackgroundColor (QColor (255, 255, 255)); -+ selector->setStyleSheet (QString ("")); - } else if (status == RKComponentBase::Processing) { -- selector->setBackgroundColor (QColor (255, 255, 0)); -+ selector->setStyleSheet (QString ("background: yellow; color: black")); - } else { -- selector->setBackgroundColor (QColor (255, 0, 0)); -+ selector->setStyleSheet (QString ("background: red; color: black")); - } - } else { -- selector->setBackgroundColor (QColor (200, 200, 200)); -+ selector->setStyleSheet (QString ("background: rgb(200, 200, 200); color: black")); - } - } - -diff --git a/rkward/plugin/rkpluginsaveobject.cpp b/rkward/plugin/rkpluginsaveobject.cpp -index 7c084a99..52b9d867 100644 ---- a/rkward/plugin/rkpluginsaveobject.cpp -+++ b/rkward/plugin/rkpluginsaveobject.cpp -@@ -82,8 +82,8 @@ RKPluginSaveObject::~RKPluginSaveObject () { - void RKPluginSaveObject::update () { - RK_TRACE (PLUGIN); - -- if (isSatisfied ()) selector->setBackgroundColor (QColor (255, 255, 255)); -- else selector->setBackgroundColor (QColor (255, 0, 0)); -+ if (isSatisfied ()) selector->setStyleSheet(QString("")); -+ else selector->setStyleSheet(QString("background: red; color: black")); - changed (); - } - -diff --git a/rkward/plugin/rkvarslot.cpp b/rkward/plugin/rkvarslot.cpp -index bc250b25..6a2ae601 100644 ---- a/rkward/plugin/rkvarslot.cpp -+++ b/rkward/plugin/rkvarslot.cpp -@@ -183,15 +183,14 @@ void RKVarSlot::updateLook () { - - QPalette palette = list->palette (); - if (!isSatisfied ()) { // implies that it is enabled -- palette.setColor (QPalette::Base, QColor (255, 0, 0)); -+ list->setStyleSheet(QString("background: red; color: black")); - } else { - if (isEnabled ()) { -- palette.setColor (QPalette::Base, QColor (255, 255, 255)); -+ list->setStyleSheet(QString("")); - } else { -- palette.setColor (QPalette::Base, QColor (200, 200, 200)); -+ list->setStyleSheet(QString("background: rgb(200, 200, 200); color: black")); - } - } -- list->setPalette(palette); - } - - void RKVarSlot::changeEvent (QEvent* event) { --- -GitLab - 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 deleted file mode 100644 index bd95490cbe4c..000000000000 --- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5f8fb9cd211f0e12ef40a0fc34a42c31f2a24475 Mon Sep 17 00:00:00 2001 -From: Johnny Jazeix <jazeix@gmail.com> -Date: Tue, 7 Dec 2021 19:03:19 +0100 -Subject: [PATCH] fix end of paragraph tag in html for the rksetupwizard - ---- - rkward/dialogs/rksetupwizard.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rkward/dialogs/rksetupwizard.cpp b/rkward/dialogs/rksetupwizard.cpp -index b14e06ec..e4787793 100644 ---- a/rkward/dialogs/rksetupwizard.cpp -+++ b/rkward/dialogs/rksetupwizard.cpp -@@ -130,12 +130,12 @@ RKSetupWizard::RKSetupWizard(QWidget* parent, InvokationReason reason, const QLi - auto l = new QVBoxLayout(firstpage); - QString intro = i18n("<p>This dialog will guide you through a quick check of the basic setup of the required (or recommended) components.</p>"); - if (reason == NewVersionRKWard) { -- intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of RKWard has been detected.</p"); -+ intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of RKWard has been detected.</p>"); - } else if (reason == NewVersionR) { - // TODO: invoke this! -- intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of R has been detected.</p"); -+ intro += i18n("<p>The setup assistant has been invoked, automatically, because a new version of R has been detected.</p>"); - } else if (reason == ProblemsDetected) { -- intro += i18n("<p>The setup assistant has been invoked, automatically, because a problem has been detected in your setup.</p"); -+ intro += i18n("<p>The setup assistant has been invoked, automatically, because a problem has been detected in your setup.</p>"); - } - l->addWidget(RKCommonFunctions::wordWrappedLabel(intro)); - auto waiting_to_start_label = RKCommonFunctions::wordWrappedLabel(i18n("<b>Waiting for R backend...</b>") + "<p> </p><p> </p>"); --- -GitLab - 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 deleted file mode 100644 index 1ce37d11ffeb..000000000000 --- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4f17155eae5b81246e8172a80b9421ec0ad22bed Mon Sep 17 00:00:00 2001 -From: Thomas Friedrichsmeier <thomas.friedrichsmeier@kdemail.net> -Date: Tue, 12 Jan 2021 09:21:29 +0100 -Subject: [PATCH] Fix hang on exit. - -(Not sure, whether there are other potential hang conditions on exit, but this is one.) - -BUG: 430680 ---- - rkward/rbackend/rkrbackendprotocol_frontend.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rkward/rbackend/rkrbackendprotocol_frontend.cpp b/rkward/rbackend/rkrbackendprotocol_frontend.cpp -index c46ed5de..e5cf5d68 100644 ---- a/rkward/rbackend/rkrbackendprotocol_frontend.cpp -+++ b/rkward/rbackend/rkrbackendprotocol_frontend.cpp -@@ -42,7 +42,7 @@ RKRBackendProtocolFrontend::~RKRBackendProtocolFrontend () { - RKFrontendTransmitter::instance ()->wait(1000); // Wait for thread to catch the backend's exit request, and exit() - RKFrontendTransmitter::instance ()->quit(); // Tell it to quit, otherwise - RKFrontendTransmitter::instance ()->wait(3000); // Wait for thread to quit and clean up. -- qApp->processEvents(); // Not strictly needed, but avoids some mem leaks on exit by handling all posted BackendExit events -+ qApp->processEvents(QEventLoop::AllEvents, 500); // Not strictly needed, but avoids some mem leaks on exit by handling all posted BackendExit events - delete RKFrontendTransmitter::instance (); - } - --- -GitLab - 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 deleted file mode 100644 index cff7b60f1951..000000000000 --- a/sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f34cb38798e8a7d3f9a39f26be4ecab3013ea57c Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Tue, 5 Oct 2021 22:36:30 +0200 -Subject: [PATCH] Enable highdpi pixmaps - -This fixes icons being pixelated on highdpi screens ---- - rkward/main.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/rkward/main.cpp b/rkward/main.cpp -index 8eafd25c..7dcb34a5 100644 ---- a/rkward/main.cpp -+++ b/rkward/main.cpp -@@ -239,6 +239,7 @@ QString resolveRSpecOrFail (QString input, QString message) { - - int main (int argc, char *argv[]) { - RK_Debug::RK_Debug_Level = DL_WARNING; -+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); - #ifndef NO_QT_WEBENGINE - // annoyingly, QWebEngineUrlSchemes have to be registered before creating the app. - QWebEngineUrlScheme scheme("help"); --- -GitLab - diff --git a/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild b/sci-mathematics/rkward/rkward-0.7.4.ebuild index 80ead3401703..6a89832e92f6 100644 --- a/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild +++ b/sci-mathematics/rkward/rkward-0.7.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -10,7 +10,7 @@ DESCRIPTION="IDE for the R-project" HOMEPAGE="https://rkward.kde.org/" if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.gz" + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" fi @@ -20,13 +20,14 @@ IUSE="" DEPEND=" dev-lang/R + dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 + kde-frameworks/karchive:5 kde-frameworks/kcompletion:5 kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 @@ -46,14 +47,6 @@ DEPEND=" RDEPEND="${DEPEND}" BDEPEND="sys-devel/gettext" -PATCHES=( - "${FILESDIR}"/${P}-fix-crash-w-R-4.1.0.patch # KDE-bug 438993 - "${FILESDIR}"/${P}-fix-hang-on-exit.patch # KDE-bug 430680 - "${FILESDIR}"/${P}-fix-dark-themes.patch # KDE-bug 389914 - "${FILESDIR}"/${P}-fix-eop-tag-in-html.patch - "${FILESDIR}"/${P}-fix-hidpi.patch -) - pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "kate plugins support" "kde-apps/kate:${SLOT}" |