[gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/files/, kde-apps/cantor/
commit: 06e70a05e74d23fcbb57deb324b67dab0bebd587
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Oct 15 21:01:21 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Oct 17 11:13:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06e70a05
kde-apps/cantor: Update python.patch with upstream review changes
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/cantor/cantor-20.08.2.ebuild | 5 ++---
08.2-python.patch => cantor-20.08.3-python.patch} | 19 ++-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/kde-apps/cantor/cantor-20.08.2.ebuild
b/kde-apps/cantor/cantor-20.08.2.ebuild
index 5ed83ea2278..9ac4987f1a1 100644
--- a/kde-apps/cantor/cantor-20.08.2.ebuild
+++ b/kde-apps/cantor/cantor-20.08.2.ebuild
@@ -13,8 +13,7 @@ QTMIN=5.14.2
inherit ecm kde.org optfeature python-single-r1
DESCRIPTION="Interface for doing mathematics and scientific computing"
-HOMEPAGE="https://kde.org/applications/education/org.kde.cantor
-https://edu.kde.org/cantor/;
+HOMEPAGE="https://kde.org/applications/en/cantor https://edu.kde.org/cantor/;
LICENSE="GPL-2" # TODO: CHECK
SLOT="5"
@@ -74,7 +73,7 @@ RDEPEND="${DEPEND}
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}/${P}-python.patch" )
+PATCHES=( "${FILESDIR}/${PN}-20.08.3-python.patch" )
pkg_setup() {
use python && python-single-r1_pkg_setup
diff --git a/kde-apps/cantor/files/cantor-20.08.2-python.patch
b/kde-apps/cantor/files/cantor-20.08.3-python.patch
similarity index 80%
rename from kde-apps/cantor/files/cantor-20.08.2-python.patch
rename to kde-apps/cantor/files/cantor-20.08.3-python.patch
index 0f3c6774628..c0dc3804c83 100644
--- a/kde-apps/cantor/files/cantor-20.08.2-python.patch
+++ b/kde-apps/cantor/files/cantor-20.08.3-python.patch
@@ -1,13 +1,14 @@
-From c09628ae8c08e8ef0e57b801994acd4276b65b02 Mon Sep 17 00:00:00 2001
+From c794fb5f0f616ce2d9e4004fc459a1c50f077470 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner
Date: Sun, 11 Oct 2020 22:47:55 +0200
Subject: [PATCH] Use CMake FindPython3 module, raises minimum CMake to 3.12
+Gives us out-of-the-box future proof python detection (python-3.9 right now).
---
CMakeLists.txt | 2 +-
src/backends/CMakeLists.txt| 10 --
- src/backends/python/CMakeLists.txt | 4 ++--
- 3 files changed, 7 insertions(+), 9 deletions(-)
+ src/backends/python/CMakeLists.txt | 4 +---
+ 3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e96e6df0..a90328b5 100644
@@ -44,24 +45,24 @@ index e99e1731..9b6b615e 100644
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
+index 04b4c313..c7868561 100644
--- a/src/backends/python/CMakeLists.txt
+++ b/src/backends/python/CMakeLists.txt
-@@ -14,7 +14,7 @@ set(PythonServer_SRCS
+@@ -14,8 +14,6 @@ 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
+ kconfig_add_kcfg_files(PythonBackend_SRCS settings.kcfgc)
+@@ -34,7 +32,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})
++target_link_libraries(cantor_pythonserver Python3::Python)
if(BUILD_TESTING)
add_executable(testpython testpython.cpp settings.cpp)
[gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/files/, kde-apps/cantor/
commit: a2ebe989c58066eacc134386760f8e9f7b59393b
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Aug 12 19:58:24 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Aug 12 19:59:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ebe989
kde-apps/cantor: Fix missing header with Frameworks 5.61
Closes: https://bugs.gentoo.org/692008
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
kde-apps/cantor/cantor-19.04.3.ebuild | 2 ++
.../files/cantor-19.04.3-missing-header.patch | 26 ++
2 files changed, 28 insertions(+)
diff --git a/kde-apps/cantor/cantor-19.04.3.ebuild
b/kde-apps/cantor/cantor-19.04.3.ebuild
index fca31777aba..306541dd15a 100644
--- a/kde-apps/cantor/cantor-19.04.3.ebuild
+++ b/kde-apps/cantor/cantor-19.04.3.ebuild
@@ -57,6 +57,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
RESTRICT+=" test"
pkg_pretend() {
diff --git a/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
b/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
new file mode 100644
index 000..3844b6bcc54
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-19.04.3-missing-header.patch
@@ -0,0 +1,26 @@
+From 6a49ffa048f619752d32ff9b85a03c8cbcb448b7 Mon Sep 17 00:00:00 2001
+From: Nikita Sirgienko
+Date: Sun, 21 Jul 2019 02:00:46 +0300
+Subject: Try to fix build error in stable-kf5-qt5 #7
+
+---
+ src/cantor.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+(limited to 'src/cantor.h')
+
+diff --git a/src/cantor.h b/src/cantor.h
+index 0352753..bbf8f6e 100644
+--- a/src/cantor.h
b/src/cantor.h
+@@ -25,6 +25,8 @@
+ #include
+
+ #include
++#include
++#include
+
+ class QTabWidget;
+ class KTextEdit;
+--
+cgit v1.1
[gentoo-commits] repo/gentoo:master commit in: kde-apps/cantor/files/, kde-apps/cantor/
commit: ac7535cce2ad786c5ec95d8c68902afd64a3cbca
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Feb 11 23:23:57 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Feb 11 23:34:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac7535cc
kde-apps/cantor: Fix build w/ USE=python and KF-5.31
Package-Manager: portage-2.3.3
kde-apps/cantor/cantor-16.12.2.ebuild | 5 +++-
.../files/cantor-16.12.2-python-kf-5.31.patch | 28 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/kde-apps/cantor/cantor-16.12.2.ebuild
b/kde-apps/cantor/cantor-16.12.2.ebuild
index 19314488a8..669532f809 100644
--- a/kde-apps/cantor/cantor-16.12.2.ebuild
+++ b/kde-apps/cantor/cantor-16.12.2.ebuild
@@ -56,7 +56,10 @@ RDEPEND="${RDEPEND}"
RESTRICT+=" test"
-PATCHES=( "${FILESDIR}"/${P}-bashism.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-bashism.patch
+ "${FILESDIR}"/${P}-python-kf-5.31.patch
+)
pkg_pretend() {
kde5_pkg_pretend
diff --git a/kde-apps/cantor/files/cantor-16.12.2-python-kf-5.31.patch
b/kde-apps/cantor/files/cantor-16.12.2-python-kf-5.31.patch
new file mode 100644
index 00..b8c5161b49
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-16.12.2-python-kf-5.31.patch
@@ -0,0 +1,28 @@
+commit 4b8ef6bed62daced90c7826985650c2a813d2996
+Author: Jonathan Riddell
+Date: Wed Feb 8 14:56:48 2017 +
+
+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 )
+ 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 = regexps[i];
+ QTextCharFormat = formats[i];
+@@ -126,7 +126,7 @@ void PythonHighlighter::highlightBlock(const QString )
+ singleLineCommentStart.indexIn(text, pos);
+
+ if (singleLineCommentStartPos != -1
+-and singleLineCommentStartPos < minPos) {
++&& singleLineCommentStartPos < minPos) {
+ setFormat(pos, text.length() - pos, commentFormat());
+ break;
+ } else if (minRegexp) {
