GitLab

BUG: 373150

Closes T5214 T5037
Differential Revision: https://phabricator.kde.org/D4664

Vadim A. Misbakh-Soloviov authored Feb 15, 2017 and Filipe Saraiva committed Feb 15, 2017

Currently Cantor has a hardcoded include to get lua.hpp library.
This patch fix the search to include different versions of lua
library. The hardcoded solution is no more necessary.

BUG: 354772
Differential Revision: https://phabricator.kde.org/D4588

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Now Julia backend has the keywords hardcoded in the class JuliaKeywords.
The old static keywords.xml was removed.

Closes T5211

Now the default keywords, variables and functions are hardcoded in
pythonkeywords.cpp. There is no need of QtXML and keywords.xml file for
this backend.

Moves T5212 to Done
Closes T5212

Now the keywords used by Sage backend are hardcoded in sagekeywords
class. This way the backend doesn't depend of QtXML anymore.

Close T5213

variable management widget

BUG: 363553

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

Differential Revision: https://phabricator.kde.org/D3441
CCBUG: 372676

Differential Revision: https://phabricator.kde.org/D3441
CCBUG: 372676

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

BUG: 363915
FIXED-IN: 16.12

BUG: 363916
FIXED-IN: 16.12

Summary:
While compilling master, a few failures regarding julia where raised
on my computer:

Scanning dependencies of target cantor_juliaserver
[ 16%] Building CXX object
src/backends/julia/juliaserver/CMakeFiles/cantor_juliaserver.dir/juliaserver.cpp.o
In file included from
/home/tcanabrava/Projects/kdesrc/cantor/src/backends/julia/juliaserver/juliaserver.cpp:22:0:
/usr/include/julia/julia.h:59:27: fatal error: julia_threads.h: No such
file or directory
 #include <julia_threads.h>
                            ^
                            compilation terminated.

Inspecting the FindJulia that's shipped with Cantor, the issue seemed
obvious to me: it doesn't tries to find LibJulia, nor it does add
the julia includes to the include_directories.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>

Differential Revision: https://phabricator.kde.org/D3070

Instead of relying on parsing the sage banner, which is likely to break with changes in Sage output format, use the dedicated 'sage -v' command.

REVIEW: 128926

BUG: 363605

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"