diff options
author | Eric Hameleers <alien@slackware.com> | 2017-02-13 12:04:44 +0100 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2017-02-13 12:04:44 +0100 |
commit | e39a60732b70eb45d39743d1c4c71ca745da65d0 (patch) | |
tree | cd9842ea93e69c9f69790b4e6fa933f8499c0da8 /kde/patch/cantor/cantor_python.patch | |
parent | 52c50a287052b6b63c8f602e4269dee461a94e11 (diff) | |
download | ktown-e39a60732b70eb45d39743d1c4c71ca745da65d0.tar.gz ktown-e39a60732b70eb45d39743d1c4c71ca745da65d0.tar.xz |
Applications: patches for cantor and kalzium to compile against KF 5.31.
Diffstat (limited to 'kde/patch/cantor/cantor_python.patch')
-rw-r--r-- | kde/patch/cantor/cantor_python.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/kde/patch/cantor/cantor_python.patch b/kde/patch/cantor/cantor_python.patch new file mode 100644 index 0000000..aa2b398 --- /dev/null +++ b/kde/patch/cantor/cantor_python.patch @@ -0,0 +1,31 @@ +Patch taken from: +https://gitweb.gentoo.org/repo/gentoo.git/plain/kde-apps/cantor/files/cantor-16.12.2-python-kf-5.31.patch + +commit 4b8ef6bed62daced90c7826985650c2a813d2996 +Author: Jonathan Riddell <jr@jriddell.org> +Date: Wed Feb 8 14:56:48 2017 +0000 + + remove modern C++ use to fix compile with current KDE policy + +diff --git a/src/backends/python/pythonhighlighter.cpp b/src/backends/python/pythonhighlighter.cpp +index 4064524..87b10dd 100644 +--- a/src/backends/python/pythonhighlighter.cpp ++++ b/src/backends/python/pythonhighlighter.cpp +@@ -87,7 +87,7 @@ void PythonHighlighter::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[i]; + QTextCharFormat &format = formats[i]; +@@ -126,7 +126,7 @@ void PythonHighlighter::highlightBlock(const QString &text) + singleLineCommentStart.indexIn(text, pos); + + if (singleLineCommentStartPos != -1 +- and singleLineCommentStartPos < minPos) { ++ && singleLineCommentStartPos < minPos) { + setFormat(pos, text.length() - pos, commentFormat()); + break; + } else if (minRegexp) { |