* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
@ 2016-07-27 19:42 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2016-07-27 19:42 UTC (permalink / raw
To: gentoo-commits
commit: b462f7a5e612e49fa906a71c53d90d94f8df303a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 19:41:20 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 19:42:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b462f7a5
kde-apps/cantor: backport patch from upstream solving build failure with Qt 5.6
Gentoo-bug: 587082
Package-Manager: portage-2.3.0
kde-apps/cantor/cantor-15.12.3-r1.ebuild | 5 ++++-
kde-apps/cantor/files/cantor-15.12.3-qt56.patch | 27 +++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/kde-apps/cantor/cantor-15.12.3-r1.ebuild b/kde-apps/cantor/cantor-15.12.3-r1.ebuild
index b01bd79..1d0a335 100644
--- a/kde-apps/cantor/cantor-15.12.3-r1.ebuild
+++ b/kde-apps/cantor/cantor-15.12.3-r1.ebuild
@@ -56,7 +56,10 @@ DEPEND="${RDEPEND}
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-tests.patch"
+ "${FILESDIR}/${P}-qt56.patch"
+)
pkg_setup() {
use python && python_setup
diff --git a/kde-apps/cantor/files/cantor-15.12.3-qt56.patch b/kde-apps/cantor/files/cantor-15.12.3-qt56.patch
new file mode 100644
index 0000000..6434f65
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-15.12.3-qt56.patch
@@ -0,0 +1,27 @@
+From 683418b3663ddc588c44063cc11abb20970e8e08 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Thu, 2 Jun 2016 08:56:43 +0200
+Subject: [PATCH] Fix compilation error "qobject.h:300:9: error: static
+ assertion failed: Signal and slot arguments are not compatible."
+
+(cherry picked from commit 841b6f6e19d829d6ab9ee13a5d4b0bcc9f1ee2df)
+---
+ src/worksheettextitem.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/worksheettextitem.cpp b/src/worksheettextitem.cpp
+index 503153c..493ed48 100644
+--- a/src/worksheettextitem.cpp
++++ b/src/worksheettextitem.cpp
+@@ -180,7 +180,7 @@ void WorksheetTextItem::populateMenu(QMenu *menu, const QPointF& pos)
+ QKeyEvent* WorksheetTextItem::eventForStandardAction(KStandardAction::StandardAction actionID)
+ {
+ // there must be a better way to get the shortcut...
+- QAction * action = KStandardAction::create(actionID, this, 0, this);
++ QAction * action = KStandardAction::create(actionID, this, SLOT(copy()), this);
+ QKeySequence keySeq = action->shortcut();
+ // we do not support key sequences with multiple keys here
+ int code = keySeq[0];
+--
+2.7.3
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
@ 2017-02-11 23:35 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-02-11 23:35 UTC (permalink / raw
To: gentoo-commits
commit: 9be309db2b2c026522ff84601e8cef1c8a1eb9d3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 21:03:50 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 23:34:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be309db
kde-apps/cantor: Fix bashism
Gentoo-bug: 596940
Thanks-to: Michael Palimaka (kensington)
Package-Manager: portage-2.3.3
kde-apps/cantor/cantor-16.12.2.ebuild | 2 ++
kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 +++++++++++++
2 files changed, 15 insertions(+)
diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild b/kde-apps/cantor/cantor-16.12.2.ebuild
index 96540cab7f..a1f359a35e 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -56,6 +56,8 @@ RDEPEND="${RDEPEND}"
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}"/${P}-bashism.patch )
+
pkg_pretend() {
kde5_pkg_pretend
diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
new file mode 100644
index 0000000000..424ca4d15a
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake
+index 6303417..6494884 100644
+--- a/cmake/FindR.cmake
++++ b/cmake/FindR.cmake
+@@ -31,7 +31,7 @@ IF(R_EXECUTABLE)
+ OUTPUT_VARIABLE R_INCLUDE_DIR)
+ ELSE(WIN32)
+ EXECUTE_PROCESS(
+- COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR"
++ COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR"
+ OUTPUT_VARIABLE R_INCLUDE_DIR)
+ ENDIF(WIN32)
+ ENDIF(NOT R_INCLUDE_DIR)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
@ 2017-02-11 23:35 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-02-11 23:35 UTC (permalink / raw
To: gentoo-commits
commit: adb1ff04a2bddaf9a934bc7698aa10301dc1e2e2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 21:49:09 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 11 23:34:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adb1ff04
kde-apps/cantor: Fix build w/ USE=julia and KF-5.31
Package-Manager: portage-2.3.3
kde-apps/cantor/cantor-16.12.2.ebuild | 1 +
.../{cantor-16.12.2.ebuild => cantor-9999.ebuild} | 7 +-
.../files/cantor-16.12.2-julia-kf-5.31.patch | 190 +++++++++++++++++++++
3 files changed, 193 insertions(+), 5 deletions(-)
diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild b/kde-apps/cantor/cantor-16.12.2.ebuild
index 669532f809..2e6883b3b3 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -59,6 +59,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}"/${P}-bashism.patch
"${FILESDIR}"/${P}-python-kf-5.31.patch
+ "${FILESDIR}"/${P}-julia-kf-5.31.patch
)
pkg_pretend() {
diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild b/kde-apps/cantor/cantor-9999.ebuild
similarity index 96%
copy from kde-apps/cantor/cantor-16.12.2.ebuild
copy to kde-apps/cantor/cantor-9999.ebuild
index 669532f809..fb71acbf56 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-9999.ebuild
@@ -12,7 +12,7 @@ inherit kde5 python-r1
DESCRIPTION="Interface for doing mathematics and scientific computing"
HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
IUSE="analitza julia lua postscript python qalculate +R"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -56,10 +56,7 @@ RDEPEND="${RDEPEND}"
RESTRICT+=" test"
-PATCHES=(
- "${FILESDIR}"/${P}-bashism.patch
- "${FILESDIR}"/${P}-python-kf-5.31.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
pkg_pretend() {
kde5_pkg_pretend
diff --git a/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch
new file mode 100644
index 0000000000..425c61eb48
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-julia-kf-5.31.patch
@@ -0,0 +1,190 @@
+From 45322d9f58f50df3d4d5755d4199e579f6fd8646 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sat, 11 Feb 2017 22:46:35 +0100
+Subject: [PATCH] [julia] Fix build with -fno-operator-names
+
+REVIEW: 129942
+---
+ src/backends/julia/juliaexpression.cpp | 6 +++---
+ src/backends/julia/juliaextensions.cpp | 4 ++--
+ src/backends/julia/juliahighlighter.cpp | 4 ++--
+ src/backends/julia/juliakeywords.cpp | 10 +++++-----
+ src/backends/julia/juliaserver/juliaserver.cpp | 4 ++--
+ src/backends/julia/juliaserver/main.cpp | 4 ++--
+ src/backends/julia/juliasession.cpp | 4 ++--
+ 7 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/backends/julia/juliaexpression.cpp b/src/backends/julia/juliaexpression.cpp
+index 27cdd85..618200d 100644
+--- a/src/backends/julia/juliaexpression.cpp
++++ b/src/backends/julia/juliaexpression.cpp
+@@ -40,7 +40,7 @@ void JuliaExpression::evaluate()
+
+ // Plots integration
+ m_plot_filename.clear();
+- if (juliaSession->integratePlots() and checkPlotShowingCommands()) {
++ if (juliaSession->integratePlots() && checkPlotShowingCommands()) {
+ // Simply add plot saving command to the end of execution
+ QStringList inlinePlotFormats;
+ inlinePlotFormats << QLatin1String("svg");
+@@ -73,8 +73,8 @@ void JuliaExpression::finalize()
+ setResult(new Cantor::TextResult(juliaSession->getOutput()));
+ setStatus(Cantor::Expression::Error);
+ } else {
+- if (not m_plot_filename.isEmpty()
+- and QFileInfo(m_plot_filename).exists()) {
++ if (!m_plot_filename.isEmpty()
++ && QFileInfo(m_plot_filename).exists()) {
+ // If we have plot in result, show it
+ setResult(
+ new Cantor::ImageResult(QUrl::fromLocalFile(m_plot_filename)));
+diff --git a/src/backends/julia/juliaextensions.cpp b/src/backends/julia/juliaextensions.cpp
+index 4585c6f..ad5e3a9 100644
+--- a/src/backends/julia/juliaextensions.cpp
++++ b/src/backends/julia/juliaextensions.cpp
+@@ -138,7 +138,7 @@ QString JuliaPlotExtension::plotFunction2d(
+ {
+ auto new_left = left;
+ auto new_right = right;
+- if (new_left.isEmpty() and new_right.isEmpty()) {
++ if (new_left.isEmpty() && new_right.isEmpty()) {
+ new_left = QLatin1String("-1");
+ new_right = QLatin1String("1");
+ } else if (new_left.isEmpty()) {
+@@ -165,7 +165,7 @@ QString JuliaPlotExtension::plotFunction3d(
+ {
+
+ auto update_interval = [](Interval &interval) {
+- if (interval.first.isEmpty() and interval.second.isEmpty()) {
++ if (interval.first.isEmpty() && interval.second.isEmpty()) {
+ interval.first = QLatin1String("-1");
+ interval.second = QLatin1String("1");
+ } else if (interval.first.isEmpty()) {
+diff --git a/src/backends/julia/juliahighlighter.cpp b/src/backends/julia/juliahighlighter.cpp
+index 4795361..f7d3622 100644
+--- a/src/backends/julia/juliahighlighter.cpp
++++ b/src/backends/julia/juliahighlighter.cpp
+@@ -98,7 +98,7 @@ void JuliaHighlighter::highlightBlock(const QString &text)
+ while (pos < text.length()) {
+ // Trying to close current environments
+ bool triggered = false;
+- for (int i = 0; i < flags.size() and not triggered; i++) {
++ for (int i = 0; i < flags.size() && !triggered; i++) {
+ int flag = flags[i];
+ QRegExp ®exp = regexps_ends[i];
+ QTextCharFormat &format = formats[i];
+@@ -144,7 +144,7 @@ void JuliaHighlighter::highlightBlock(const QString &text)
+ singleLineCommentStart.indexIn(text, pos);
+
+ if (singleLineCommentStartPos != -1
+- and singleLineCommentStartPos < minPos) {
++ && singleLineCommentStartPos < minPos) {
+ // single line comment starts earlier
+ setFormat(pos, text.length() - pos, commentFormat());
+ break;
+diff --git a/src/backends/julia/juliakeywords.cpp b/src/backends/julia/juliakeywords.cpp
+index f0a5846..8a0efec 100644
+--- a/src/backends/julia/juliakeywords.cpp
++++ b/src/backends/julia/juliakeywords.cpp
+@@ -62,11 +62,11 @@ void JuliaKeywords::loadFromFile()
+ const QStringRef name = xml.name();
+
+ if (name == QLatin1String("keywords")
+- or name == QLatin1String("variables")
+- or name == QLatin1String("plot_showing_commands")) {
++ || name == QLatin1String("variables")
++ || name == QLatin1String("plot_showing_commands")) {
+ while (xml.readNextStartElement()) {
+ Q_ASSERT(
+- xml.isStartElement() and xml.name() == QLatin1String("word")
++ xml.isStartElement() && xml.name() == QLatin1String("word")
+ );
+
+ const QString text = xml.readElementText();
+@@ -91,7 +91,7 @@ void JuliaKeywords::loadFromFile()
+
+ void JuliaKeywords::addVariable(const QString &variable)
+ {
+- if (not m_variables.contains(variable)) {
++ if (!m_variables.contains(variable)) {
+ m_variables << variable;
+ }
+ }
+@@ -104,7 +104,7 @@ void JuliaKeywords::clearVariables()
+
+ void JuliaKeywords::addFunction(const QString &function)
+ {
+- if (not m_functions.contains(function)) {
++ if (!m_functions.contains(function)) {
+ m_functions << function;
+ }
+ }
+diff --git a/src/backends/julia/juliaserver/juliaserver.cpp b/src/backends/julia/juliaserver/juliaserver.cpp
+index c9beb4c..91585cf 100644
+--- a/src/backends/julia/juliaserver/juliaserver.cpp
++++ b/src/backends/julia/juliaserver/juliaserver.cpp
+@@ -47,7 +47,7 @@ void JuliaServer::runJuliaCommand(const QString &command)
+ {
+ // Redirect stdout, stderr to temprorary files
+ QTemporaryFile output, error;
+- if (not output.open() or not error.open()) {
++ if (!output.open() || !error.open()) {
+ qFatal("Unable to create temprorary files for stdout/stderr");
+ return;
+ }
+@@ -90,7 +90,7 @@ void JuliaServer::runJuliaCommand(const QString &command)
+ bool is_nothing = jl_unbox_bool(
+ static_cast<jl_value_t *>(jl_call2(equality, nothing, val))
+ );
+- if (not is_nothing) {
++ if (!is_nothing) {
+ jl_static_show(JL_STDOUT, val);
+ }
+ m_was_exception = false;
+diff --git a/src/backends/julia/juliaserver/main.cpp b/src/backends/julia/juliaserver/main.cpp
+index ad7e4d9..11687ec 100644
+--- a/src/backends/julia/juliaserver/main.cpp
++++ b/src/backends/julia/juliaserver/main.cpp
+@@ -30,7 +30,7 @@ int main(int argc, char *argv[])
+ {
+ QCoreApplication app(argc, argv);
+
+- if (not QDBusConnection::sessionBus().isConnected()) {
++ if (!QDBusConnection::sessionBus().isConnected()) {
+ qWarning() << "Can't connect to the D-Bus session bus.\n"
+ "To start it, run: eval `dbus-launch --auto-syntax`";
+ return 1;
+@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
+ const QString &serviceName =
+ QString::fromLatin1("org.kde.Cantor.Julia-%1").arg(app.applicationPid());
+
+- if (not QDBusConnection::sessionBus().registerService(serviceName)) {
++ if (!QDBusConnection::sessionBus().registerService(serviceName)) {
+ qWarning() << QDBusConnection::sessionBus().lastError().message();
+ return 2;
+ }
+diff --git a/src/backends/julia/juliasession.cpp b/src/backends/julia/juliasession.cpp
+index 425e6cb..9183e11 100644
+--- a/src/backends/julia/juliasession.cpp
++++ b/src/backends/julia/juliasession.cpp
+@@ -86,7 +86,7 @@ void JuliaSession::login()
+ QDBusConnection::sessionBus()
+ );
+
+- if (not m_interface->isValid()) {
++ if (!m_interface->isValid()) {
+ qWarning() << QDBusConnection::sessionBus().lastError().message();
+ return;
+ }
+@@ -213,7 +213,7 @@ bool JuliaSession::getWasException()
+ {
+ const QDBusReply<bool> &reply =
+ m_interface->call(QLatin1String("getWasException"));
+- return reply.isValid() and reply.value();
++ return reply.isValid() && reply.value();
+ }
+
+ void JuliaSession::listVariables()
+--
+2.10.2
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
@ 2018-01-28 23:19 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-01-28 23:19 UTC (permalink / raw
To: gentoo-commits
commit: e0effca2fa74d987cc4634553ff8ab59a7ac977e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 19:53:23 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 23:18:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0effca2
kde-apps/cantor: Drop 16.12.3
Closes: https://bugs.gentoo.org/619534
Package-Manager: Portage-2.3.20, Repoman-2.3.6
kde-apps/cantor/Manifest | 1 -
kde-apps/cantor/cantor-16.12.3.ebuild | 108 ---------------------
kde-apps/cantor/files/cantor-16.12.2-bashism.patch | 13 ---
3 files changed, 122 deletions(-)
diff --git a/kde-apps/cantor/Manifest b/kde-apps/cantor/Manifest
index 06520bd2aed..940af934614 100644
--- a/kde-apps/cantor/Manifest
+++ b/kde-apps/cantor/Manifest
@@ -1,3 +1,2 @@
-DIST cantor-16.12.3.tar.xz 378460 BLAKE2B 189ab04d6fda6864d1827abbd7689b87f59e784ed838613b8d00c44774b9672afad7456665310cc39d95345c5845b60f44708a28550842d14104948333a1e9af SHA512 e6401d5472797894931b4c1c0a4cda7e900ede0d9c5e7d1b5a2ff518741f7f62a7f6187b5081edb231f47c1de163aa537cc195e381334ed60890eb6c73374768
DIST cantor-17.08.3.tar.xz 1062400 BLAKE2B c9ee9ca23679566c7e8b1895a6ef5a332d486f8abea75242529cd5a5f99f506cd1b3dfef5591a6275272a5a0b8441ff9ef1cf8621c236a7357c5391d187e60be SHA512 92d40921b4121e7053381f071eaf08ba2a5bfdd42272ff749db726aa300878561b8079118a0ea61173269abb04fa1cbfeb8dba27da8701ecd2b17876c64a108b
DIST cantor-17.12.1.tar.xz 1064476 BLAKE2B 64eb91b1f0f033c5d6d33c21c9077cac1eb3ccfe33f25047dd18af8fec029cf1b5b26c5f68908eb3d12741ea48857639bb38db97748e48a6880993d37568711a SHA512 d15d9699e05a01fe5f376942dd39fdc9f6e8189819d44b11dbadb7ac43638766a233a361d107aa572e16df598eec4e220bfb9740d741d60a10ea7b00bb6fe095
diff --git a/kde-apps/cantor/cantor-16.12.3.ebuild b/kde-apps/cantor/cantor-16.12.3.ebuild
deleted file mode 100644
index 14332980db5..00000000000
--- a/kde-apps/cantor/cantor-16.12.3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-PYTHON_COMPAT=( python2_7 )
-# FIXME: PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-inherit kde5 python-r1
-
-DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://www.kde.org/applications/education/cantor https://edu.kde.org/cantor"
-SRC_URI="mirror://kde/Attic/applications/${PV}/src/${P}.tar.xz"
-
-KEYWORDS="amd64 x86"
-IUSE="analitza julia lua postscript python qalculate +R"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# TODO Add Sage Mathematics Software backend (http://www.sagemath.org)
-# FIXME: $(python_gen_cond_dep 'dev-qt/qtdbus:5' 'python3*')
-DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kcrash)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep knewstuff)
- $(add_frameworks_dep kparts)
- $(add_frameworks_dep kpty)
- $(add_frameworks_dep ktexteditor)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- $(add_qt_dep qtxmlpatterns)
- analitza? ( $(add_kdeapps_dep analitza) )
- julia? ( dev-lang/julia )
- lua? ( dev-lang/luajit:2 )
- qalculate? (
- sci-libs/cln
- sci-libs/libqalculate:=
- )
- postscript? ( app-text/libspectre )
- python? ( ${PYTHON_DEPS} )
- R? ( dev-lang/R )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-16.12.2-bashism.patch )
-
-pkg_pretend() {
- kde5_pkg_pretend
-
- if ! has_version sci-mathematics/maxima && ! has_version sci-mathematics/octave && \
- ! use analitza && ! use julia && ! use lua && ! use python && ! use qalculate && ! use R; then
- einfo "You have decided to build ${PN} with no backend."
- einfo "To have this application functional, please enable one of the backends via USE flag:"
- einfo " analitza, julia, lua, python, qalculate, R"
- einfo "Alternatively, install one of these:"
- einfo " # emerge sci-mathematics/maxima"
- einfo " # emerge sci-mathematics/octave"
- einfo
- fi
-
- if ! has_version virtual/latex-base; then
- einfo "For LaTeX support:"
- einfo " # emerge virtual/latex-base"
- fi
-}
-
-pkg_setup() {
- use python && python_setup
- kde5_pkg_setup
-}
-
-src_prepare() {
- kde5_src_prepare
-
- # FIXME: shipped FindPythonLibs3.cmake does not work for Gentoo
- sed -e "/^find_package(PythonLibs3)/ s/^/#/" \
- -i src/backends/CMakeLists.txt || die
-}
-
-src_configure() {
- use julia && addpredict /proc/self/mem # bug 602894
-
- local mycmakeargs=(
- $(cmake-utils_use_find_package analitza Analitza5)
- $(cmake-utils_use_find_package julia Julia)
- $(cmake-utils_use_find_package lua LuaJIT)
- $(cmake-utils_use_find_package postscript LibSpectre)
- $(cmake-utils_use_find_package python PythonLibs)
- $(cmake-utils_use_find_package qalculate Qalculate)
- $(cmake-utils_use_find_package R R)
- )
- kde5_src_configure
-}
diff --git a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch b/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
deleted file mode 100644
index 424ca4d15aa..00000000000
--- a/kde-apps/cantor/files/cantor-16.12.2-bashism.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindR.cmake b/cmake/FindR.cmake
-index 6303417..6494884 100644
---- a/cmake/FindR.cmake
-+++ b/cmake/FindR.cmake
-@@ -31,7 +31,7 @@ IF(R_EXECUTABLE)
- OUTPUT_VARIABLE R_INCLUDE_DIR)
- ELSE(WIN32)
- EXECUTE_PROCESS(
-- COMMAND ${R_EXECUTABLE} CMD sh -c "echo -n $R_INCLUDE_DIR"
-+ COMMAND ${R_EXECUTABLE} CMD sh -c "printf $R_INCLUDE_DIR"
- OUTPUT_VARIABLE R_INCLUDE_DIR)
- ENDIF(WIN32)
- ENDIF(NOT R_INCLUDE_DIR)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
@ 2020-10-11 21:33 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-10-11 21:33 UTC (permalink / raw
To: gentoo-commits
commit: c1245e6300f7a054d1ec07c3203de104492fb18d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 20:18:49 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 21:32:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1245e63
kde-apps/cantor: python3_9 via patch to use CMake's Python3 module
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-20.08.2.ebuild | 7 ++-
kde-apps/cantor/files/cantor-20.08.2-python.patch | 70 +++++++++++++++++++++++
2 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/kde-apps/cantor/cantor-20.08.2.ebuild b/kde-apps/cantor/cantor-20.08.2.ebuild
index 1185cb49e18..5ed83ea2278 100644
--- a/kde-apps/cantor/cantor-20.08.2.ebuild
+++ b/kde-apps/cantor/cantor-20.08.2.ebuild
@@ -6,7 +6,7 @@ EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
ECM_HANDBOOK="forceoptional"
ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
PVCUT=$(ver_cut 1-3)
KFMIN=5.72.0
QTMIN=5.14.2
@@ -74,6 +74,8 @@ RDEPEND="${DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-python.patch" )
+
pkg_setup() {
use python && python-single-r1_pkg_setup
ecm_pkg_setup
@@ -87,10 +89,11 @@ src_configure() {
$(cmake_use_find_package julia Julia)
$(cmake_use_find_package lua LuaJIT)
-DUSE_LIBSPECTRE=$(usex postscript)
- $(cmake_use_find_package python PythonLibs3)
+ $(cmake_use_find_package python Python3)
$(cmake_use_find_package qalculate Qalculate)
$(cmake_use_find_package R R)
)
+ use python && mycmakeargs+=( -DPython3_EXECUTABLE="${PYTHON}" )
ecm_src_configure
}
diff --git a/kde-apps/cantor/files/cantor-20.08.2-python.patch b/kde-apps/cantor/files/cantor-20.08.2-python.patch
new file mode 100644
index 00000000000..0f3c6774628
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-20.08.2-python.patch
@@ -0,0 +1,70 @@
+From c09628ae8c08e8ef0e57b801994acd4276b65b02 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 11 Oct 2020 22:47:55 +0200
+Subject: [PATCH] Use CMake FindPython3 module, raises minimum CMake to 3.12
+
+---
+ CMakeLists.txt | 2 +-
+ src/backends/CMakeLists.txt | 10 ++++------
+ src/backends/python/CMakeLists.txt | 4 ++--
+ 3 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e96e6df0..a90328b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
++cmake_minimum_required (VERSION 3.12 FATAL_ERROR)
+
+ set(CMAKE_CXX_STANDARD 11)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt
+index e99e1731..9b6b615e 100644
+--- a/src/backends/CMakeLists.txt
++++ b/src/backends/CMakeLists.txt
+@@ -50,15 +50,13 @@ if(QALCULATE_FOUND)
+ add_subdirectory(qalculate)
+ endif(QALCULATE_FOUND)
+
+-set_package_properties(PythonLibs3 PROPERTIES DESCRIPTION "A powerful dynamic programming language."
+- URL "https://www.python.org/"
+- TYPE OPTIONAL
++set_package_properties(Python3 PROPERTIES TYPE OPTIONAL
+ PURPOSE "Backend to use Python with Cantor.")
+
+-find_package(PythonLibs3)
+-if(PYTHONLIBS3_FOUND)
++find_package(Python3 COMPONENTS Interpreter Development)
++if(Python3_FOUND)
+ add_subdirectory(python)
+-endif(PYTHONLIBS3_FOUND)
++endif()
+
+ set_package_properties(LuaJIT PROPERTIES DESCRIPTION "A lightweight, extensible programming language (luajit implementation)."
+ URL "https://www.lua.org/"
+diff --git a/src/backends/python/CMakeLists.txt b/src/backends/python/CMakeLists.txt
+index 04b4c313..ccf76193 100644
+--- a/src/backends/python/CMakeLists.txt
++++ b/src/backends/python/CMakeLists.txt
+@@ -14,7 +14,7 @@ set(PythonServer_SRCS
+ pythonserver.cpp
+ )
+
+-include_directories(${PYTHONLIBS3_INCLUDE_DIRS})
++include_directories(${Python3_INCLUDE_DIRS})
+
+ qt5_add_resources(PythonBackend_RSCS python.qrc)
+ ki18n_wrap_ui(PythonBackend_SRCS settings.ui)
+@@ -34,7 +34,7 @@ set_target_properties(cantor_pythonserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH
+ if(MSVC)
+ set_property(TARGET cantor_pythonserver PROPERTY LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+ endif()
+-target_link_libraries(cantor_pythonserver ${PYTHONLIBS3_LIBRARIES})
++target_link_libraries(cantor_pythonserver ${Python3_LIBRARIES})
+
+ if(BUILD_TESTING)
+ add_executable(testpython testpython.cpp settings.cpp)
+--
+2.28.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/
@ 2022-06-18 11:03 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-06-18 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 5fcc7e784362f4d1a11629ae5bd44245da33a7d4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 10:48:48 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 11:03:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fcc7e78
kde-apps/cantor: Fix build with >=KF-5.94
Backport of upstream commit 064c0ba1526c5cb1bfcf353aea4f84d8ca6393d6
See also:
https://invent.kde.org/education/cantor/-/merge_requests/46
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-apps/cantor/cantor-21.12.3.ebuild | 2 +
.../cantor/files/cantor-21.12.3-fix-includes.patch | 560 +++++++++++++++++++++
2 files changed, 562 insertions(+)
diff --git a/kde-apps/cantor/cantor-21.12.3.ebuild b/kde-apps/cantor/cantor-21.12.3.ebuild
index 4bc395d8b480..69fdb78c5919 100644
--- a/kde-apps/cantor/cantor-21.12.3.ebuild
+++ b/kde-apps/cantor/cantor-21.12.3.ebuild
@@ -76,6 +76,8 @@ RDEPEND="${DEPEND}
"
BDEPEND="x11-misc/shared-mime-info"
+PATCHES=( "${FILESDIR}/${P}-fix-includes.patch" )
+
pkg_setup() {
use lua && lua-single_pkg_setup
use python && python-single-r1_pkg_setup
diff --git a/kde-apps/cantor/files/cantor-21.12.3-fix-includes.patch b/kde-apps/cantor/files/cantor-21.12.3-fix-includes.patch
new file mode 100644
index 000000000000..6e45c3dfeda4
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-21.12.3-fix-includes.patch
@@ -0,0 +1,560 @@
+From 064c0ba1526c5cb1bfcf353aea4f84d8ca6393d6 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat, 23 Apr 2022 22:10:55 +0200
+Subject: [PATCH] Fix includes
+
+Add missing ones
+
+Remove unneeded ones
+
+Convert forward decl to include where needed
+
+Fix syntax where needed
+
+(cherry picked from commit 6a6156db8b0041261ac4361a9231f2a974dde475)
+---
+ src/backends/R/rbackend.cpp | 2 ++
+ src/backends/R/rhighlighter.h | 2 ++
+ src/backends/R/rkeywords.cpp | 4 ++--
+ src/backends/R/rserver/rserver.cpp | 2 +-
+ src/backends/julia/juliakeywords.cpp | 4 ++--
+ src/backends/lua/luabackend.cpp | 2 ++
+ src/backends/lua/luahelper.h | 3 ++-
+ src/backends/lua/luakeywords.cpp | 4 ++--
+ src/backends/maxima/maximabackend.cpp | 2 ++
+ src/backends/maxima/maximakeywords.cpp | 4 ++--
+ src/backends/octave/octavebackend.cpp | 2 ++
+ src/backends/octave/octavekeywords.cpp | 4 ++--
+ src/backends/python/pythonbackend.cpp | 2 ++
+ src/backends/python/pythonkeywords.cpp | 4 ++--
+ src/backends/qalculate/qalculatebackend.cpp | 1 +
+ src/backends/sage/sagebackend.cpp | 2 ++
+ src/backends/sage/sagekeywords.cpp | 4 ++--
+ src/backends/scilab/scilabbackend.cpp | 1 +
+ src/backends/scilab/scilabkeywords.cpp | 4 ++--
+ src/cantor.cpp | 1 +
+ src/commandentry.cpp | 2 +-
+ src/hierarchyentry.cpp | 1 +
+ src/horizontalruleentry.cpp | 1 +
+ src/lib/backend.cpp | 2 ++
+ src/lib/jupyterutils.h | 2 +-
+ src/lib/panelpluginhandler.cpp | 1 +
+ .../documentationpanel/documentationpanelplugin.cpp | 2 ++
+ src/panelplugins/filebrowserpanel/filebrowserpanelplugin.cpp | 1 +
+ src/panelplugins/filebrowserpanel/filebrowserpanelplugin.h | 1 +
+ src/panelplugins/helppanel/helppanelplugin.cpp | 1 +
+ src/panelplugins/helppanel/helppanelplugin.h | 2 ++
+ src/panelplugins/tocpanel/tocpanelplugin.cpp | 2 ++
+ src/panelplugins/tocpanel/tocpanelplugin.h | 2 ++
+ src/panelplugins/variablemgr/variablemanagerplugin.cpp | 2 ++
+ src/panelplugins/variablemgr/variablemanagerplugin.h | 2 ++
+ src/textentry.cpp | 1 +
+ src/worksheet.cpp | 3 +++
+ 37 files changed, 62 insertions(+), 20 deletions(-)
+
+diff --git a/src/backends/R/rbackend.cpp b/src/backends/R/rbackend.cpp
+index 5e700fd8..6bc0fed9 100644
+--- a/src/backends/R/rbackend.cpp
++++ b/src/backends/R/rbackend.cpp
+@@ -10,6 +10,8 @@
+ #include "settings.h"
+ #include "rsettingswidget.h"
+
++#include <KPluginFactory>
++
+ RBackend::RBackend(QObject* parent,const QList<QVariant>& args) : Cantor::Backend(parent, args)
+ {
+ new RScriptExtension(this);
+diff --git a/src/backends/R/rhighlighter.h b/src/backends/R/rhighlighter.h
+index f4bd99ff..4ff6f42e 100644
+--- a/src/backends/R/rhighlighter.h
++++ b/src/backends/R/rhighlighter.h
+@@ -8,6 +8,8 @@
+
+ #include "defaulthighlighter.h"
+
++#include <QRegExp>
++
+ class RSession;
+
+ class RHighlighter : public Cantor::DefaultHighlighter
+diff --git a/src/backends/R/rkeywords.cpp b/src/backends/R/rkeywords.cpp
+index 407ca1c8..19ad6cb3 100644
+--- a/src/backends/R/rkeywords.cpp
++++ b/src/backends/R/rkeywords.cpp
+@@ -5,8 +5,8 @@
+
+ #include "rkeywords.h"
+
+-#include <repository.h>
+-#include <KF5/KSyntaxHighlighting/Definition>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/Definition>
+
+ RKeywords::RKeywords()
+ {
+diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp
+index f86c2a19..04f6194f 100644
+--- a/src/backends/R/rserver/rserver.cpp
++++ b/src/backends/R/rserver/rserver.cpp
+@@ -8,7 +8,7 @@
+ // on the one hand comme il faut, on another, causes flickering in UI
+
+ #include "rserver.h"
+-#include <KIOCore/KIO/DeleteJob>
++#include <KIO/DeleteJob>
+ #include "radaptor.h"
+ #include "rcallbacks.h"
+ #include "settings.h"
+diff --git a/src/backends/julia/juliakeywords.cpp b/src/backends/julia/juliakeywords.cpp
+index 13df83ad..20dbc2b7 100644
+--- a/src/backends/julia/juliakeywords.cpp
++++ b/src/backends/julia/juliakeywords.cpp
+@@ -4,8 +4,8 @@
+ */
+ #include "juliakeywords.h"
+
+-#include <repository.h>
+-#include <KF5/KSyntaxHighlighting/Definition>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/Definition>
+
+ JuliaKeywords::JuliaKeywords()
+ {
+diff --git a/src/backends/lua/luabackend.cpp b/src/backends/lua/luabackend.cpp
+index 81f0fb72..db2525cd 100644
+--- a/src/backends/lua/luabackend.cpp
++++ b/src/backends/lua/luabackend.cpp
+@@ -10,6 +10,8 @@
+ #include "luasettingswidget.h"
+ #include "settings.h"
+
++#include <KPluginFactory>
++
+ LuaBackend::LuaBackend( QObject* parent,const QList<QVariant> args ) : Cantor::Backend( parent,args )
+ {
+ new LuaScriptExtension(this);
+diff --git a/src/backends/lua/luahelper.h b/src/backends/lua/luahelper.h
+index 470f4375..77ee9133 100644
+--- a/src/backends/lua/luahelper.h
++++ b/src/backends/lua/luahelper.h
+@@ -6,9 +6,10 @@
+ #ifndef _LUAHELPER_H
+ #define _LUAHELPER_H
+
++#include <QStringList>
++
+ struct lua_State;
+ class QString;
+-class QStringList;
+
+ /* follows lua_funcname convention */
+ QString luahelper_tostring (lua_State* L, int idx);
+diff --git a/src/backends/lua/luakeywords.cpp b/src/backends/lua/luakeywords.cpp
+index 2069317d..b572e7e0 100644
+--- a/src/backends/lua/luakeywords.cpp
++++ b/src/backends/lua/luakeywords.cpp
+@@ -5,8 +5,8 @@
+
+ #include "luakeywords.h"
+
+-#include <repository.h>
+-#include <KF5/KSyntaxHighlighting/Definition>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/Definition>
+
+ LuaKeywords::LuaKeywords()
+ {
+diff --git a/src/backends/maxima/maximabackend.cpp b/src/backends/maxima/maximabackend.cpp
+index 9c7c8430..d51f08a0 100644
+--- a/src/backends/maxima/maximabackend.cpp
++++ b/src/backends/maxima/maximabackend.cpp
+@@ -10,6 +10,8 @@
+ #include "maximasettingswidget.h"
+ #include "settings.h"
+
++#include <KPluginFactory>
++
+ MaximaBackend::MaximaBackend( QObject* parent,const QList<QVariant> args ) : Cantor::Backend( parent,args )
+ {
+ //initialize the supported extensions
+diff --git a/src/backends/maxima/maximakeywords.cpp b/src/backends/maxima/maximakeywords.cpp
+index 6e7a9a0a..f80d6af7 100644
+--- a/src/backends/maxima/maximakeywords.cpp
++++ b/src/backends/maxima/maximakeywords.cpp
+@@ -7,8 +7,8 @@
+
+ #include <QDebug>
+
+-#include <repository.h>
+-#include <KF5/KSyntaxHighlighting/Definition>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/Definition>
+
+ MaximaKeywords* MaximaKeywords::instance()
+ {
+diff --git a/src/backends/octave/octavebackend.cpp b/src/backends/octave/octavebackend.cpp
+index 3a33023e..d8894454 100644
+--- a/src/backends/octave/octavebackend.cpp
++++ b/src/backends/octave/octavebackend.cpp
+@@ -10,6 +10,8 @@
+ #include "octavesettingswidget.h"
+ #include "settings.h"
+
++#include <KPluginFactory>
++
+ OctaveBackend::OctaveBackend(QObject* parent, const QList<QVariant>& args): Backend(parent, args)
+ {
+ new OctaveHistoryExtension(this);
+diff --git a/src/backends/octave/octavekeywords.cpp b/src/backends/octave/octavekeywords.cpp
+index c309dc1a..8f4289be 100644
+--- a/src/backends/octave/octavekeywords.cpp
++++ b/src/backends/octave/octavekeywords.cpp
+@@ -5,8 +5,8 @@
+
+ #include "octavekeywords.h"
+
+-#include <repository.h>
+-#include <KF5/KSyntaxHighlighting/Definition>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/Definition>
+
+ OctaveKeywords::OctaveKeywords()
+ {
+diff --git a/src/backends/python/pythonbackend.cpp b/src/backends/python/pythonbackend.cpp
+index 87259089..db6cfea6 100644
+--- a/src/backends/python/pythonbackend.cpp
++++ b/src/backends/python/pythonbackend.cpp
+@@ -13,6 +13,8 @@
+ #include <QDebug>
+ #include <QWidget>
+
++#include <KPluginFactory>
++
+ PythonBackend::PythonBackend(QObject* parent, const QList<QVariant>& args) : Cantor::Backend(parent, args)
+ {
+ new PythonLinearAlgebraExtension(this);
+diff --git a/src/backends/python/pythonkeywords.cpp b/src/backends/python/pythonkeywords.cpp
+index 09271a2e..9b28022f 100644
+--- a/src/backends/python/pythonkeywords.cpp
++++ b/src/backends/python/pythonkeywords.cpp
+@@ -8,8 +8,8 @@
+ #include <QFile>
+ #include <QDebug>
+
+-#include <repository.h>
+-#include <KF5/KSyntaxHighlighting/Definition>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/Definition>
+
+ PythonKeywords::PythonKeywords()
+ {
+diff --git a/src/backends/qalculate/qalculatebackend.cpp b/src/backends/qalculate/qalculatebackend.cpp
+index 6c978278..23050688 100644
+--- a/src/backends/qalculate/qalculatebackend.cpp
++++ b/src/backends/qalculate/qalculatebackend.cpp
+@@ -12,6 +12,7 @@
+ #include "qalculatesettingswidget.h"
+
+ #include <KLocalizedString>
++#include <KPluginFactory>
+
+ QalculateBackend::QalculateBackend(QObject* parent,const QList<QVariant> args)
+ : Cantor::Backend(parent, args)
+diff --git a/src/backends/sage/sagebackend.cpp b/src/backends/sage/sagebackend.cpp
+index d79747d0..6765f516 100644
+--- a/src/backends/sage/sagebackend.cpp
++++ b/src/backends/sage/sagebackend.cpp
+@@ -10,6 +10,8 @@
+ #include "sagesettingswidget.h"
+ #include "settings.h"
+
++#include <KPluginFactory>
++
+ SageBackend::SageBackend( QObject* parent,const QList<QVariant>& args ) : Cantor::Backend( parent,args )
+ {
+ //initialize the supported extensions
+diff --git a/src/backends/sage/sagekeywords.cpp b/src/backends/sage/sagekeywords.cpp
+index 2cc2be0e..f81faa02 100644
+--- a/src/backends/sage/sagekeywords.cpp
++++ b/src/backends/sage/sagekeywords.cpp
+@@ -4,8 +4,8 @@
+ */
+ #include "sagekeywords.h"
+
+-#include <repository.h>
+-#include <KF5/KSyntaxHighlighting/Definition>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/Definition>
+
+ #include <QDebug>
+
+diff --git a/src/backends/scilab/scilabbackend.cpp b/src/backends/scilab/scilabbackend.cpp
+index af2d9195..5dacd686 100644
+--- a/src/backends/scilab/scilabbackend.cpp
++++ b/src/backends/scilab/scilabbackend.cpp
+@@ -9,6 +9,7 @@
+ #include "scilabsettingswidget.h"
+ #include "settings.h"
+
++#include <KPluginFactory>
+
+ ScilabBackend::ScilabBackend(QObject* parent,const QList<QVariant> args) : Cantor::Backend(parent, args)
+ {
+diff --git a/src/backends/scilab/scilabkeywords.cpp b/src/backends/scilab/scilabkeywords.cpp
+index 04b555b6..aac7a4d9 100644
+--- a/src/backends/scilab/scilabkeywords.cpp
++++ b/src/backends/scilab/scilabkeywords.cpp
+@@ -10,8 +10,8 @@
+ #include <QtAlgorithms>
+ #include <QDebug>
+
+-#include <repository.h>
+-#include <KF5/KSyntaxHighlighting/Definition>
++#include <KSyntaxHighlighting/Repository>
++#include <KSyntaxHighlighting/Definition>
+
+ ScilabKeywords::ScilabKeywords()
+ {
+diff --git a/src/cantor.cpp b/src/cantor.cpp
+index a62d0be4..161f05e3 100644
+--- a/src/cantor.cpp
++++ b/src/cantor.cpp
+@@ -18,6 +18,7 @@
+ #include <KNS3/DownloadDialog>
+ #include <KParts/ReadWritePart>
+ #include <KRecentFilesAction>
++#include <KPluginFactory>
+
+ #include <QApplication>
+ #include <QCloseEvent>
+diff --git a/src/commandentry.cpp b/src/commandentry.cpp
+index 3bc9359b..b0f8512e 100644
+--- a/src/commandentry.cpp
++++ b/src/commandentry.cpp
+@@ -20,7 +20,7 @@
+
+ #include <QGuiApplication>
+ #include <QDebug>
+-#include <QDesktopWidget>
++#include <QActionGroup>
+ #include <QFontDialog>
+ #include <QScreen>
+ #include <QTimer>
+diff --git a/src/hierarchyentry.cpp b/src/hierarchyentry.cpp
+index 30afba5e..59aa603f 100644
+--- a/src/hierarchyentry.cpp
++++ b/src/hierarchyentry.cpp
+@@ -16,6 +16,7 @@
+ #include <QMimeData>
+ #include <QPainter>
+ #include <QDebug>
++#include <QActionGroup>
+
+ #include <KLocalizedString>
+
+diff --git a/src/horizontalruleentry.cpp b/src/horizontalruleentry.cpp
+index 8763e109..32895323 100644
+--- a/src/horizontalruleentry.cpp
++++ b/src/horizontalruleentry.cpp
+@@ -9,6 +9,7 @@
+ #include <QPainter>
+ #include <QPropertyAnimation>
+ #include <QJsonObject>
++#include <QActionGroup>
+
+ #include <KLocalizedString>
+
+diff --git a/src/lib/backend.cpp b/src/lib/backend.cpp
+index cd082503..a5426ed2 100644
+--- a/src/lib/backend.cpp
++++ b/src/lib/backend.cpp
+@@ -13,8 +13,10 @@
+ #include <QUrl>
+ #include <QProcess>
+ #include <QStandardPaths>
++#include <QPluginLoader>
+
+ #include <KPluginMetaData>
++#include <KPluginFactory>
+ #include <KLocalizedString>
+
+ using namespace Cantor;
+diff --git a/src/lib/jupyterutils.h b/src/lib/jupyterutils.h
+index b2172884..714be188 100644
+--- a/src/lib/jupyterutils.h
++++ b/src/lib/jupyterutils.h
+@@ -10,6 +10,7 @@
+
+ #include <QString>
+ #include <QMimeDatabase>
++#include <QStringList>
+
+ #include "cantor_export.h"
+
+@@ -19,7 +20,6 @@ class QJsonArray;
+ class QJsonDocument;
+ class QImage;
+ class QUrl;
+-class QStringList;
+
+ namespace Cantor {
+
+diff --git a/src/lib/panelpluginhandler.cpp b/src/lib/panelpluginhandler.cpp
+index 418e5cba..2604a2dc 100644
+--- a/src/lib/panelpluginhandler.cpp
++++ b/src/lib/panelpluginhandler.cpp
+@@ -9,6 +9,7 @@ using namespace Cantor;
+ #include <QDebug>
+ #include <QDir>
+ #include <KPluginMetaData>
++#include <KPluginFactory>
+
+ #include "session.h"
+ #include "backend.h"
+diff --git a/src/panelplugins/documentationpanel/documentationpanelplugin.cpp b/src/panelplugins/documentationpanel/documentationpanelplugin.cpp
+index 23589ac3..973b41bb 100644
+--- a/src/panelplugins/documentationpanel/documentationpanelplugin.cpp
++++ b/src/panelplugins/documentationpanel/documentationpanelplugin.cpp
+@@ -8,6 +8,8 @@
+ #include "documentationpanelwidget.h"
+ #include "session.h"
+
++#include <KPluginFactory>
++
+ DocumentationPanelPlugin::DocumentationPanelPlugin(QObject* parent, QList<QVariant> args) : Cantor::PanelPlugin(parent)
+ {
+ Q_UNUSED(args);
+diff --git a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.cpp b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.cpp
+index 8f3d832e..f7620e97 100644
+--- a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.cpp
++++ b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.cpp
+@@ -22,6 +22,7 @@
+
+ #include <KLocalizedString>
+ #include <KParts/ReadOnlyPart>
++#include <KPluginFactory>
+
+ FileBrowserPanelPlugin::FileBrowserPanelPlugin(QObject* parent, const QList<QVariant>& args): Cantor::PanelPlugin(parent),
+ m_mainWidget(nullptr), m_treeview(nullptr), m_pathEdit(nullptr), m_filterCombobox(nullptr)
+diff --git a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.h b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.h
+index 4fe9e194..4215e145 100644
+--- a/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.h
++++ b/src/panelplugins/filebrowserpanel/filebrowserpanelplugin.h
+@@ -6,6 +6,7 @@
+ #ifndef _FILEBROWSERPANELPLUGIN_H
+ #define _FILEBROWSERPANELPLUGIN_H
+
++#include <QPointer>
+ #include <QVector>
+
+ #include "panelplugin.h"
+diff --git a/src/panelplugins/helppanel/helppanelplugin.cpp b/src/panelplugins/helppanel/helppanelplugin.cpp
+index 164cc3f2..04d6b618 100644
+--- a/src/panelplugins/helppanel/helppanelplugin.cpp
++++ b/src/panelplugins/helppanel/helppanelplugin.cpp
+@@ -7,6 +7,7 @@
+
+ #include <KLocalizedString>
+ #include <KTextEdit>
++#include <KPluginFactory>
+
+ HelpPanelPlugin::HelpPanelPlugin(QObject* parent, const QList<QVariant>& args) : Cantor::PanelPlugin(parent), m_edit(nullptr)
+ {
+diff --git a/src/panelplugins/helppanel/helppanelplugin.h b/src/panelplugins/helppanel/helppanelplugin.h
+index 473b1148..b16a1184 100644
+--- a/src/panelplugins/helppanel/helppanelplugin.h
++++ b/src/panelplugins/helppanel/helppanelplugin.h
+@@ -6,6 +6,8 @@
+ #ifndef _HELPPANELPLUGIN_H
+ #define _HELPPANELPLUGIN_H
+
++#include <QPointer>
++
+ #include "panelplugin.h"
+
+ class KTextEdit;
+diff --git a/src/panelplugins/tocpanel/tocpanelplugin.cpp b/src/panelplugins/tocpanel/tocpanelplugin.cpp
+index 24c13355..6df4c3a9 100644
+--- a/src/panelplugins/tocpanel/tocpanelplugin.cpp
++++ b/src/panelplugins/tocpanel/tocpanelplugin.cpp
+@@ -10,6 +10,8 @@
+ #include <QDebug>
+ #include <QWidget>
+
++#include <KPluginFactory>
++
+ TableOfContentPanelPlugin::TableOfContentPanelPlugin(QObject* parent, const QList<QVariant>& args): Cantor::PanelPlugin(parent),
+ m_mainWidget(nullptr)
+ {
+diff --git a/src/panelplugins/tocpanel/tocpanelplugin.h b/src/panelplugins/tocpanel/tocpanelplugin.h
+index 5ce24b78..fed98b8c 100644
+--- a/src/panelplugins/tocpanel/tocpanelplugin.h
++++ b/src/panelplugins/tocpanel/tocpanelplugin.h
+@@ -8,6 +8,8 @@
+
+ #include <QStringListModel>
+
++#include <QPointer>
++
+ #include "panelplugin.h"
+
+ class QWidget;
+diff --git a/src/panelplugins/variablemgr/variablemanagerplugin.cpp b/src/panelplugins/variablemgr/variablemanagerplugin.cpp
+index 3482eed0..8526fc3b 100644
+--- a/src/panelplugins/variablemgr/variablemanagerplugin.cpp
++++ b/src/panelplugins/variablemgr/variablemanagerplugin.cpp
+@@ -8,6 +8,8 @@
+ #include "session.h"
+ #include "variablemanagerwidget.h"
+
++#include <KPluginFactory>
++
+ VariableManagerPlugin::VariableManagerPlugin(QObject* parent, QList<QVariant> args) : Cantor::PanelPlugin(parent), m_widget(nullptr)
+ {
+ Q_UNUSED(args);
+diff --git a/src/panelplugins/variablemgr/variablemanagerplugin.h b/src/panelplugins/variablemgr/variablemanagerplugin.h
+index 75ce6851..2dd98e4d 100644
+--- a/src/panelplugins/variablemgr/variablemanagerplugin.h
++++ b/src/panelplugins/variablemgr/variablemanagerplugin.h
+@@ -6,6 +6,8 @@
+ #ifndef _VARIABLEMANAGERPLUGIN_H
+ #define _VARIABLEMANAGERPLUGIN_H
+
++#include <QPointer>
++
+ #include "panelplugin.h"
+
+ class VariableManagerWidget;
+diff --git a/src/textentry.cpp b/src/textentry.cpp
+index 4c8d192d..3ba54f5a 100644
+--- a/src/textentry.cpp
++++ b/src/textentry.cpp
+@@ -25,6 +25,7 @@
+ #include <QRegularExpression>
+ #include <QStringList>
+ #include <QInputDialog>
++#include <QActionGroup>
+
+ QStringList standartRawCellTargetNames = {QLatin1String("None"), QLatin1String("LaTeX"), QLatin1String("reST"), QLatin1String("HTML"), QLatin1String("Markdown")};
+ QStringList standartRawCellTargetMimes = {QString(), QLatin1String("text/latex"), QLatin1String("text/restructuredtext"), QLatin1String("text/html"), QLatin1String("text/markdown")};
+diff --git a/src/worksheet.cpp b/src/worksheet.cpp
+index 7697a233..a3d961eb 100644
+--- a/src/worksheet.cpp
++++ b/src/worksheet.cpp
+@@ -32,9 +32,12 @@
+ #include <QGraphicsSceneMouseEvent>
+ #include <QJsonArray>
+ #include <QJsonDocument>
++#include <QJsonObject>
+ #include <QPrinter>
+ #include <QRegularExpression>
+ #include <QTimer>
++#include <QActionGroup>
++#include <QFile>
+ #include <QXmlQuery>
+
+ #include <kcoreaddons_version.h>
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-06-18 11:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-28 23:19 [gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/, kde-apps/cantor/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-06-18 11:03 Andreas Sturmlechner
2020-10-11 21:33 Andreas Sturmlechner
2017-02-11 23:35 Andreas Sturmlechner
2017-02-11 23:35 Andreas Sturmlechner
2016-07-27 19:42 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox