Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
math/rkward-kde: upgrade RKWard to 0.7.3
Release notes at <https://rkward.kde.org/News.html>.
- Loading branch information
1 parent
5ececa5
commit 15f47a7
Showing
7 changed files
with
141 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1579970115 | ||
| SHA256 (rkward-0.7.1.tar.gz) = 02a96450ef4275d38b9ff6fd13d98bcf353c5388399a813a111b640d7c61c834 | ||
| SIZE (rkward-0.7.1.tar.gz) = 4605097 | ||
| TIMESTAMP = 1651044867 | ||
| SHA256 (rkward-0.7.3.tar.gz) = 49b118c11c41605e05434e4214f06bbf3a45c8bbc5ab54499dca117ca9efe7da | ||
| SIZE (rkward-0.7.3.tar.gz) = 5486401 |
This file was deleted.
Oops, something went wrong.
34 changes: 34 additions & 0 deletions
34
math/rkward-kde/files/patch-rkward_windows_rkhtmlwindow.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| --- rkward/windows/rkhtmlwindow.cpp.orig 2022-04-16 22:02:17 UTC | ||
| +++ rkward/windows/rkhtmlwindow.cpp | ||
| @@ -109,8 +109,9 @@ class RKWebPage : public QWebEnginePage { (public) | ||
| QUrl url () { | ||
| return mainFrame ()->url (); | ||
| } | ||
| - void setHtml (const QString &html) { | ||
| - mainFrame ()->setHtml (html); | ||
| + void setHtmlWrapper(const QString &html, const QUrl &baseurl) { | ||
| + direct_load = true; | ||
| + mainFrame()->setHtml(html, baseurl); | ||
| } | ||
| QPointF scrollPosition () const { | ||
| return mainFrame ()->scrollPosition (); | ||
| @@ -127,6 +128,10 @@ class RKWebPage : public QWebEnginePage { (public) | ||
| }); | ||
| } | ||
| #else | ||
| + void setHtmlWrapper(const QString &html, const QUrl &baseurl) { | ||
| + direct_load = true; | ||
| + setHtml(html, baseurl); | ||
| + } | ||
| bool supportsContentType (const QString &name) { | ||
| if (name.startsWith("text")) return true; | ||
| #ifdef __GNUC__ | ||
| @@ -617,7 +622,7 @@ bool RKHTMLWindow::openURL (const QUrl &url) { | ||
| RK_DEBUG (APP, DL_WARNING, "Applying workaround for https://bugs.kde.org/show_bug.cgi?id=405386"); | ||
| QFile f (url.toLocalFile ()); | ||
| f.open (QIODevice::ReadOnly); | ||
| - page->setHtml (f.readAll()); | ||
| + page->setHtmlWrapper(f.readAll(), url.adjusted(QUrl::RemoveFilename)); | ||
| f.close (); | ||
| } else { | ||
| page->load (url); |
8 changes: 4 additions & 4 deletions
8
math/rkward-kde/files/patch-rkward_windows_rktoolwindowbar.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| --- rkward/windows/rktoolwindowbar.cpp.orig 2019-09-04 19:20:47 UTC | ||
| --- rkward/windows/rktoolwindowbar.cpp.orig 2022-04-05 11:57:55 UTC | ||
| +++ rkward/windows/rktoolwindowbar.cpp | ||
| @@ -24,6 +24,7 @@ | ||
| #include <kparts/partmanager.h> | ||
| @@ -15,6 +15,7 @@ SPDX-License-Identifier: GPL-2.0-or-later | ||
| #include <kselectaction.h> | ||
| #include <kwidgetsaddons_version.h> | ||
|
|
||
| +#include <QLayout> | ||
| #include <QSplitter> | ||
| #include <QContextMenuEvent> | ||
|
|
||
| #include <QHBoxLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| --- tests/all_tests.R.orig 2022-04-11 21:08:17 UTC | ||
| +++ tests/all_tests.R | ||
| @@ -2,10 +2,10 @@ require (rkwardtests) | ||
|
|
||
| ## add your test suite files, to this vector: | ||
| testsuites <- c ( | ||
| - "rkward_application_tests.R" | ||
| - "import_export_plugins.R" | ||
| + "rkward_application_tests.R", | ||
| + "import_export_plugins.R", | ||
| "item_response_theory.R", | ||
| - "analysis_plugins.R" | ||
| + "analysis_plugins.R", | ||
| "distributions.R", | ||
| "plots.R", | ||
| "data_plugin_tests.R" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters