[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/, sci-mathematics/rkward/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/, sci-mathematics/rkward/files/
@ 2020-02-17  0:14 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-02-17  0:14 UTC (permalink / raw
  To: gentoo-commits

commit:     771e1f2dde218b1164457e05b7b4e05f548ed1e1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 17 00:14:10 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 17 00:14:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=771e1f2d

sci-mathematics/rkward: Drop 0.7.0b

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/rkward/Manifest                    |  1 -
 .../rkward/files/rkward-0.7.0b-qt-5.13-1.patch     | 23 ---------
 .../rkward/files/rkward-0.7.0b-qt-5.13-2.patch     | 23 ---------
 .../rkward/files/rkward-0.7.0b-qt-5.13-3.patch     | 33 -------------
 sci-mathematics/rkward/rkward-0.7.0b.ebuild        | 55 ----------------------
 5 files changed, 135 deletions(-)

diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 04cd90b5198..e598fdcf6ba 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,2 +1 @@
-DIST rkward-0.7.0b.tar.gz 3978972 BLAKE2B 268ebbcdd16d64f546ffc78bfaf0fbe1546d42b09f7d869a82b9f2df2104c5a449052409773b3b063e9f5ca12948d9a19065ebe57e79684e6eb0ad73dfa5791a SHA512 c582ea2d35371315d41664a8620693c82017bd98d6bb380e64dfd2dda8b34b8890aa1e50b9c4a03838b41f22a1983ee0a48b97b30670b6a15143198631ad49ed
 DIST rkward-0.7.1.tar.gz 4605097 BLAKE2B d2e0af7480965f139b1c3a36da9c9b0c005aa51f94df0a4622718b84bc8de9799e2d861972cd0bc0b4cc685c39cde9f0c2df90166fd8513169806ba6bab5cf95 SHA512 acb4eb8884afe44d7522cbf69980614d389318accaf085986e68283447626a6b890e09a1fd48c55cebb194fae40d9fc14af01e36dfed00a0b45733e61ac9e7b0

diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch
deleted file mode 100644
index af45406a417..00000000000
--- a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b51802243f478d1d89120edc343bec7eb5ef8285 Mon Sep 17 00:00:00 2001
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
-Date: Wed, 24 Jul 2019 19:36:51 +0200
-Subject: Fix compilation
-
----
- rkward/windows/rkworkplace.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/rkward/windows/rkworkplace.cpp b/rkward/windows/rkworkplace.cpp
-index 0dbf36a..94b3378 100644
---- a/rkward/windows/rkworkplace.cpp
-+++ b/rkward/windows/rkworkplace.cpp
-@@ -31,6 +31,7 @@
- #include <QDir>
- #include <QApplication>
- #include <QMimeDatabase>
-+#include <QLayout>
- 
- #include "detachedwindowcontainer.h"
- #include "rkcommandeditorwindow.h"
--- 
-cgit v1.1

diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch
deleted file mode 100644
index bbb07c1e8fc..00000000000
--- a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From d713ce77e077b426d9d81a22f558f71dfa832615 Mon Sep 17 00:00:00 2001
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
-Date: Fri, 26 Jul 2019 22:32:42 +0200
-Subject: Another missing include file
-
----
- rkward/windows/rktoolwindowbar.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/rkward/windows/rktoolwindowbar.cpp b/rkward/windows/rktoolwindowbar.cpp
-index a8f5cbd..03c405e 100644
---- a/rkward/windows/rktoolwindowbar.cpp
-+++ b/rkward/windows/rktoolwindowbar.cpp
-@@ -27,6 +27,7 @@
- 
- #include <QSplitter>
- #include <QContextMenuEvent>
-+#include <QHBoxLayout>
- 
- #include "rkworkplace.h"
- #include "rkworkplaceview.h"
--- 
-cgit v1.1

diff --git a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch b/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch
deleted file mode 100644
index e907f2877ce..00000000000
--- a/sci-mathematics/rkward/files/rkward-0.7.0b-qt-5.13-3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 394128e8d58b58bbd7cef9a4523ae346f94cd456 Mon Sep 17 00:00:00 2001
-From: Thomas Friedrichsmeier <thomas.friedrichsmeier@ruhr-uni-bochum.de>
-Date: Sat, 27 Jul 2019 11:12:34 +0200
-Subject: Another include file fix
-
----
- rkward/rkward.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/rkward/rkward.cpp b/rkward/rkward.cpp
-index 1a4a7e3..bb2f69c 100644
---- a/rkward/rkward.cpp
-+++ b/rkward/rkward.cpp
-@@ -26,6 +26,9 @@
- #include <QMenuBar>
- #include <QStatusBar>
- #include <QInputDialog>
-+#include <QVBoxLayout>
-+#include <QHBoxLayout>
-+#include <QIcon>
- 
- // include files for KDE
- #include <kmessagebox.h>
-@@ -41,7 +44,6 @@
- #include <krecentfilesaction.h>
- #include <ktoolbar.h>
- #include <kactionmenu.h>
--#include <QIcon>
- #include <KSharedConfig>
- #include <KConfigGroup>
- 
--- 
-cgit v1.1

diff --git a/sci-mathematics/rkward/rkward-0.7.0b.ebuild b/sci-mathematics/rkward/rkward-0.7.0b.ebuild
deleted file mode 100644
index 1f7aa1a0fc8..00000000000
--- a/sci-mathematics/rkward/rkward-0.7.0b.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="IDE for the R-project"
-HOMEPAGE="https://rkward.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${PV/b}/src/${P}.tar.gz"
-
-LICENSE="GPL-2+ LGPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdewebkit-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtscript-${QTMIN}:5
-	>=dev-qt/qtwebkit-5.212.0_pre20180120:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-lang/R
-"
-RDEPEND="${DEPEND}
-	virtual/libintl
-	!sci-mathematics/rkward:4
-"
-
-PATCHES=( "${FILESDIR}"/${P}-qt-5.13-{1,2,3}.patch)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/, sci-mathematics/rkward/files/
@ 2022-01-07 14:21 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-01-07 14:21 UTC (permalink / raw
  To: gentoo-commits

commit:     c2522b493bf5d0b1041111fab10c69d491259a86
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 29 12:17:43 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  7 14:21:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2522b49

sci-mathematics/rkward: EAPI-8, more optfeature, various fixes

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=389914
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430680
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=438993

Reported-by: Milos Popovic <gpopac <AT> gmail.com>
Closes: https://bugs.gentoo.org/829998
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch   |  99 ++++++++++++
 .../files/rkward-0.7.2-fix-dark-themes.patch       | 172 +++++++++++++++++++++
 .../files/rkward-0.7.2-fix-eop-tag-in-html.patch   |  32 ++++
 .../files/rkward-0.7.2-fix-hang-on-exit.patch      |  28 ++++
 .../rkward/files/rkward-0.7.2-fix-hidpi.patch      |  25 +++
 sci-mathematics/rkward/rkward-0.7.2-r1.ebuild      |  64 ++++++++
 6 files changed, 420 insertions(+)

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
new file mode 100644
index 000000000000..2cc50575672b
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch
@@ -0,0 +1,99 @@
+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
new file mode 100644
index 000000000000..005285e281bf
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.2-fix-dark-themes.patch
@@ -0,0 +1,172 @@
+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
new file mode 100644
index 000000000000..bd95490cbe4c
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.2-fix-eop-tag-in-html.patch
@@ -0,0 +1,32 @@
+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>&nbsp;</p><p>&nbsp;</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
new file mode 100644
index 000000000000..1ce37d11ffeb
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.2-fix-hang-on-exit.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 000000000000..cff7b60f1951
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.7.2-fix-hidpi.patch
@@ -0,0 +1,25 @@
+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.2-r1.ebuild
new file mode 100644
index 000000000000..80ead3401703
--- /dev/null
+++ b/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+inherit ecm kde.org optfeature
+
+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"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-2+ LGPL-2"
+SLOT="5"
+IUSE=""
+
+DEPEND="
+	dev-lang/R
+	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/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kio:5
+	kde-frameworks/kjobwidgets:5
+	kde-frameworks/knotifications:5
+	kde-frameworks/kparts:5
+	kde-frameworks/kservice:5
+	kde-frameworks/ktexteditor:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kwindowsystem:5
+	kde-frameworks/kxmlgui:5
+"
+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}"
+		optfeature "prendering (or previewing) R markdown (.Rmd) files" "app-text/pandoc"
+		optfeature "managing citations while writing articles" "app-text/kbibtex"
+	fi
+	ecm_pkg_postinst
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/, sci-mathematics/rkward/files/
@ 2022-06-01  7:57 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2022-06-01  7:57 UTC (permalink / raw
  To: gentoo-commits

commit:     6d07d1869d0fd8bb0fa03777b2c48bc577eddd04
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 22:47:33 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun  1 07:57:07 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d07d186

sci-mathematics/rkward: Drop 0.7.2-r1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/rkward/Manifest                    |   1 -
 .../files/rkward-0.7.2-fix-crash-w-R-4.1.0.patch   |  99 ------------
 .../files/rkward-0.7.2-fix-dark-themes.patch       | 172 ---------------------
 .../files/rkward-0.7.2-fix-eop-tag-in-html.patch   |  32 ----
 .../files/rkward-0.7.2-fix-hang-on-exit.patch      |  28 ----
 .../rkward/files/rkward-0.7.2-fix-hidpi.patch      |  25 ---
 sci-mathematics/rkward/rkward-0.7.2-r1.ebuild      |  64 --------
 7 files changed, 421 deletions(-)

diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index 4335505a63bf..b6b2bd584d0c 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1,2 +1 @@
-DIST rkward-0.7.2.tar.gz 6307769 BLAKE2B df72d5d03ecbb57cb08787cc27e66cfacca517a08ca10190c1bb0d627f991dab6b79e9399b0b6c38a545d370d0ecdc8fc5796c1e046a0aac20c0485405a2d72c SHA512 af872b59dea8535eb6ddc0b3db56c45114fc64b0b657e5c8373eb2f7b3a63aa13f9e3c8f6050ff3eff0126df595ed30e1d1e66b91c19b7ba950838613798cb6d
 DIST rkward-0.7.3.tar.gz 5486401 BLAKE2B 0410c29b79567e3e1b8e1947fa89c2b696a67396a51bf6a0bb5ddee485ee295e66cf20442b5b585f272bb4a6afa77c3217997b2a02752cd7b0bc945d9f099a35 SHA512 dc93b88653c6303fdbe82406837534118ad56eec9a95613b1da8a5711d3f7cc798bb8e0d15955584a8c143c1944469a0e80728b5e5e46edef2d23e9d818782ec

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>&nbsp;</p><p>&nbsp;</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.2-r1.ebuild
deleted file mode 100644
index 80ead3401703..000000000000
--- a/sci-mathematics/rkward/rkward-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-inherit ecm kde.org optfeature
-
-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"
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2+ LGPL-2"
-SLOT="5"
-IUSE=""
-
-DEPEND="
-	dev-lang/R
-	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/kcompletion:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kconfigwidgets:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/ki18n:5
-	kde-frameworks/kio:5
-	kde-frameworks/kjobwidgets:5
-	kde-frameworks/knotifications:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	kde-frameworks/ktexteditor:5
-	kde-frameworks/kwidgetsaddons:5
-	kde-frameworks/kwindowsystem:5
-	kde-frameworks/kxmlgui:5
-"
-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}"
-		optfeature "prendering (or previewing) R markdown (.Rmd) files" "app-text/pandoc"
-		optfeature "managing citations while writing articles" "app-text/kbibtex"
-	fi
-	ecm_pkg_postinst
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/, sci-mathematics/rkward/files/
@ 2024-07-30 21:31 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-07-30 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     fe37f36c668553ac3676d4c6901b77602340447c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 20:21:23 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 21:30:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe37f36c

sci-mathematics/rkward: add 0.8.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/rkward/Manifest                    |  1 +
 ...rkward-0.8.0-unbundle-kdsingleapplication.patch | 57 ++++++++++++++++++++
 sci-mathematics/rkward/rkward-0.8.0.ebuild         | 62 ++++++++++++++++++++++
 3 files changed, 120 insertions(+)

diff --git a/sci-mathematics/rkward/Manifest b/sci-mathematics/rkward/Manifest
index dcf538f32e0b..d341b86d2513 100644
--- a/sci-mathematics/rkward/Manifest
+++ b/sci-mathematics/rkward/Manifest
@@ -1 +1,2 @@
 DIST rkward-0.7.5.tar.gz 7682442 BLAKE2B b3c79dbc51585c646e88549d82b0a68a3246219b069d641f71beb25f2ac855d0c7a0e44e1cdba3da112ee94479584768ebd45fc37afb83fbd95de51bcc3f5a31 SHA512 247ee50fbebb9b74a1c03d6ef99dded18a1b3cf18286a6d2afcaa8ff7472cc3cb735db0a876926625aff4674906956f7a0c001a46d0dfd328a93e8c7af9f6c6b
+DIST rkward-0.8.0.tar.gz 8614382 BLAKE2B e44dd1c9ae5df02160ac47a14409a2fbf88dbc085369af22e64c80a59740f25305129e166402e944f85978cabde4d273a08f7f473eb46fdb31145ff8d886f46a SHA512 07070189e05fe1bdd65372fb3f90c027c693b93e3dc80a17bc30f90c983ca0bc777f30ea81ef99343ebdc90f463f47721d03f26d116145567c8ef6ca4ffdff27

diff --git a/sci-mathematics/rkward/files/rkward-0.8.0-unbundle-kdsingleapplication.patch b/sci-mathematics/rkward/files/rkward-0.8.0-unbundle-kdsingleapplication.patch
new file mode 100644
index 000000000000..0340987c517b
--- /dev/null
+++ b/sci-mathematics/rkward/files/rkward-0.8.0-unbundle-kdsingleapplication.patch
@@ -0,0 +1,57 @@
+From 997c8a7280fe0f99a29465f67b56fd001cdac4e1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 22 Jul 2024 22:20:26 +0200
+Subject: [PATCH] Make it possible to build against system kdsingleapplication
+
+Bundling must be avoided wherever possible.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt  | 10 +++++++++-
+ rkward/main.cpp |  2 +-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3b9833164..1af6cd172 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,6 +26,15 @@ FIND_PACKAGE(Qt6 6.6 CONFIG REQUIRED COMPONENTS Widgets Core Xml Network Qml Pri
+ FIND_PACKAGE(KF6 6.0.0 REQUIRED COMPONENTS CoreAddons DocTools I18n XmlGui TextEditor WidgetsAddons Parts Config Notifications WindowSystem Archive BreezeIcons OPTIONAL_COMPONENTS Crash)
+ FIND_PACKAGE(Gettext REQUIRED)
+ 
++FIND_PACKAGE(KDSingleApplication-qt6 1.1.0 QUIET)
++if(KDSingleApplication-qt6_FOUND)
++  message(STATUS "Using system KDSingleApplication")
++else()
++  message(STATUS "Using bundled KDSingleApplication")
++  add_subdirectory(3rdparty/KDSingleApplication)
++  add_definitions(-DKDSINGLEAPPLICATION_STATIC_BUILD)
++endif()
++
+ IF(FORCE_PRETTY_MAKEFILE)
+ 	SET(CMAKE_VERBOSE_MAKEFILE OFF)
+ ENDIF(FORCE_PRETTY_MAKEFILE)
+@@ -37,7 +46,6 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) # TODO remove to compley to KDECompi
+ #uncomment the line below to save ~250-350kB in object size
+ #ADD_DEFINITIONS(-DRKWARD_NO_TRACE)
+ 
+-ADD_SUBDIRECTORY(3rdparty/KDSingleApplication)
+ ADD_SUBDIRECTORY(rkward)
+ ADD_SUBDIRECTORY(doc)
+ ADD_SUBDIRECTORY(tests)
+diff --git a/rkward/main.cpp b/rkward/main.cpp
+index 2804e99d8..df959ba82 100644
+--- a/rkward/main.cpp
++++ b/rkward/main.cpp
+@@ -72,7 +72,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
+ #include "rbackend/rksessionvars.h"
+ #include "windows/rkdebugmessagewindow.h"
+ #include "misc/rkcommonfunctions.h"
+-#include "../3rdparty/KDSingleApplication/kdsingleapplication.h"
++#include "kdsingleapplication.h"
+ #include "misc/rkcommandlineargs.h"
+ 
+ #ifdef Q_OS_WIN
+-- 
+GitLab
+

diff --git a/sci-mathematics/rkward/rkward-0.8.0.ebuild b/sci-mathematics/rkward/rkward-0.8.0.ebuild
new file mode 100644
index 000000000000..a6333ecdd210
--- /dev/null
+++ b/sci-mathematics/rkward/rkward-0.8.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.3.0
+QTMIN=6.6.2
+inherit ecm kde.org optfeature
+
+DESCRIPTION="IDE for the R-project"
+HOMEPAGE="https://rkward.kde.org/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~amd64-linux"
+fi
+
+LICENSE="GPL-2+ LGPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-lang/R
+	dev-libs/kdsingleapplication[qt6(+)]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtwebengine-${QTMIN}:6[widgets]
+	>=kde-frameworks/breeze-icons-${KFMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:5
+"
+BDEPEND="sys-devel/gettext"
+
+PATCHES=( "${FILESDIR}/${P}-unbundle-kdsingleapplication.patch" )
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "kate plugins support" "kde-apps/kate-addons:6"
+		optfeature "prendering (or previewing) R markdown (.Rmd) files" "app-text/pandoc"
+		optfeature "managing citations while writing articles" "app-text/kbibtex"
+	fi
+	ecm_pkg_postinst
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2024-07-30 21:31 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-17  0:14 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/rkward/, sci-mathematics/rkward/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-01-07 14:21 Andreas Sturmlechner
2022-06-01  7:57 Andreas Sturmlechner
2024-07-30 21:31 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox