summaryrefslogtreecommitdiff
path: root/dev-util/kdevelop-python
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/kdevelop-python')
-rw-r--r--dev-util/kdevelop-python/Manifest9
-rw-r--r--dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch190
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-24.05.2.ebuild53
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-24.08.1.ebuild48
-rw-r--r--dev-util/kdevelop-python/kdevelop-python-24.08.2.ebuild (renamed from dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild)0
5 files changed, 52 insertions, 248 deletions
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index b08ed71a202b..d3a5b12ccd81 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,6 +1,5 @@
-AUX kdevelop-python-24.05.1-python3.12.patch 6101 BLAKE2B decbd9f26f3c44bb2f6b81ff511f737a217fa7946cd3b72b2c13c6c5b06fee3e7a9ad14edc9dff858f04eed17de57d8297172c55ffee5fc826189c3e0b320051 SHA512 311966d24e3d5a73c79372abd30a261ba8a78dedec3cb4c9990264bdd6cce7bb8737f2ec687e683534317315137f5a1fe0df29fcf9f75c38a5d86971295d56ae
-DIST kdev-python-24.05.2.tar.xz 1098280 BLAKE2B 71f3759d45defde73bb2526b33d48641efe2da771a088ad9bc481d24fb59b3a1d890744307340ef648a08fd4a9f1d0bfe52f099c7fcd8e1e19fb59809e9e0aa9 SHA512 d7e5935194e16203479f1cdb32118b383c7f5837306aff1a60eee729e93a6cb3be0427536aa2bcdaa5b5363844571ced056ea74cca02f329ca9ea07c7ac98fd3
-DIST kdev-python-24.08.0.tar.xz 1101512 BLAKE2B 030b40783e882d770cf40873f5da2e7975287541d949f3767ce272e70dfc680193ba45ace52956964eeebae8a64e52c65128eb38d2138c5cec3e128beb807383 SHA512 d971f718ee5e54e9b3d12377ffb225b1b4577f75d7870d5f6408ce52e5ccf4e1e84b22ddf3d5deb23c016838680f9e7833a26c748beefa0cbd186d9b75f03d36
-EBUILD kdevelop-python-24.05.2.ebuild 1305 BLAKE2B 3eb7f17f7a04e9ce8e93bfe02eb1dd15faa27981856870437ef331c58975723e803ffcbabd410734709fb3a5c52e559a4bd5329cf691ca7948e4f5145feae645 SHA512 b958772ca359f11c5600e7c2df206f1a14a7b1f12f2f51a10d951e01f5952b1240c709bdbc23cc941f33e9fbd6f0b6a21f6a4136080cb174c20a965be2e73d7c
-EBUILD kdevelop-python-24.08.0.ebuild 1121 BLAKE2B 32d78b3f30d254044e9a872bd7d5e2df6447c7dea6e753ab3ba4408b8f10929d00720ff6e56f199ad62541835b1843f3a48328b6f79cf8d23284bd4153a69214 SHA512 98998005c2769be95801142683ad702a9bbe91edcb378004b3b2223fd271c1b34d424667f254719db99a5f7703b2b23e0914e2cfa8a2bb79b7ea9b5e4f2aa745
+DIST kdev-python-24.08.1.tar.xz 1101688 BLAKE2B efa86c0d83386ebeee2619e2a885f2b600c0c81fcf171ee441339f2dba12c987ef9c29dee0dbd825015011eeda48c8bff35cf6e35c32e077383eceecd6ff63ad SHA512 c40acb15517e0261878cf6862b588a289425e6f15b57d107dae152e369a91625c47de785b85f3e7b8b78023901e2fc543adb1a04561e05cba5d3a7cced6e8fd9
+DIST kdev-python-24.08.2.tar.xz 1101932 BLAKE2B 48bedc19cdaf64ec6b0d348199fb8e48efeeac60273c1154b505da9a13cf333fca59e51d38ee8e42489192d70b6570e1834bfc0a3fc9afb654dbdc3d8ef3bd54 SHA512 90f5be2410d73e6af62fa1dd74878a76bcf3b22aa0127bbf1183e91109f574995d30e5f8e87a3147db0ee02f381dc604804ae05006ad73c368c1edfbcc8af8ce
+EBUILD kdevelop-python-24.08.1.ebuild 1119 BLAKE2B 455b6ab786d6de972d1a02f6faf855c2a80c9d87e7daa7947612627da8bd78e50b83c852016a20eefeabec415d60ca8988f80ab9cbae112c2b1f5096543c9588 SHA512 3fffed4e354b3041a1a7035d6826b5b439343b77ec9f94c0052276744bd2a69af0966668049c685c0f20f1066a2654af2eeee39856790293abfbdca3ca37279c
+EBUILD kdevelop-python-24.08.2.ebuild 1121 BLAKE2B 32d78b3f30d254044e9a872bd7d5e2df6447c7dea6e753ab3ba4408b8f10929d00720ff6e56f199ad62541835b1843f3a48328b6f79cf8d23284bd4153a69214 SHA512 98998005c2769be95801142683ad702a9bbe91edcb378004b3b2223fd271c1b34d424667f254719db99a5f7703b2b23e0914e2cfa8a2bb79b7ea9b5e4f2aa745
MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch b/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch
deleted file mode 100644
index 00507fc0de7e..000000000000
--- a/dev-util/kdevelop-python/files/kdevelop-python-24.05.1-python3.12.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 26ee370982e7cd7795921e9533b61a5a89d11b6a Mon Sep 17 00:00:00 2001
-From: Bernd Buschinski <b.buschinski@googlemail.com>
-Date: Sat, 8 Jun 2024 16:50:47 +0200
-Subject: [PATCH] initial support for python 3.12
-
----
- CMakeLists.txt | 2 +-
- duchain/tests/pyduchaintest.cpp | 5 +++++
- parser/ast.cpp | 3 +++
- parser/ast.h | 6 ++++++
- parser/astbuilder.cpp | 15 +++++++++++++--
- parser/asttransformer.cpp | 6 ++++++
- parser/astvisitor.cpp | 1 +
- parser/python_grammar.h | 15 +++++++++++++++
- 8 files changed, 50 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9fba20c3..29b83950 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_definitions( -DTRANSLATION_DOMAIN=\"kdevpython\" )
-
- set(Python3_USE_STATIC_LIBS FALSE)
- set(Python3_FIND_STRATEGY VERSION)
--find_package(Python3 3.4.3...<3.12 COMPONENTS Interpreter Development REQUIRED)
-+find_package(Python3 3.4.3...<3.13 COMPONENTS Interpreter Development REQUIRED)
-
- configure_file(kdevpythonversion.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/kdevpythonversion.h" @ONLY)
-
-diff --git a/duchain/tests/pyduchaintest.cpp b/duchain/tests/pyduchaintest.cpp
-index b0711fd0..8a4a75e4 100644
---- a/duchain/tests/pyduchaintest.cpp
-+++ b/duchain/tests/pyduchaintest.cpp
-@@ -439,6 +439,11 @@ void PyDUChainTest::testCrashes_data() {
- #if PYTHON_VERSION >= QT_VERSION_CHECK(3, 11, 0)
- QTest::newRow("except_star") << "try: pass\nexcept* (IndexError, ValueError): pass";
- #endif
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+ QTest::newRow("type_alias") << "type Point = tuple[float, float]";
-+ QTest::newRow("generic_function") << "def func[T](arg: T): pass";
-+ QTest::newRow("generic_class") << "class Bag[T]: pass";
-+#endif
- }
-
- void PyDUChainTest::testClassVariables()
-diff --git a/parser/ast.cpp b/parser/ast.cpp
-index a63ac231..4a371b10 100644
---- a/parser/ast.cpp
-+++ b/parser/ast.cpp
-@@ -765,6 +765,9 @@ QString TryAst::dump() const
- return r;
- }
-
-+TypeAliasAst::TypeAliasAst(Ast* parent): StatementAst(parent, Ast::TypeAliasType)
-+{
-+}
-
- WhileAst::WhileAst(Ast* parent): StatementAst(parent, Ast::WhileAstType), condition(nullptr)
- {
-diff --git a/parser/ast.h b/parser/ast.h
-index 430b70d6..acaf79f7 100644
---- a/parser/ast.h
-+++ b/parser/ast.h
-@@ -137,6 +137,7 @@ public:
- ExceptionHandlerAstType,
- AliasAstType, // for imports
- IdentifierAstType,
-+ TypeAliasType, // for types
- LastAstType // the largest one, not valid!
- };
-
-@@ -437,6 +438,11 @@ public:
- QList<Ast*> finally;
- };
-
-+class KDEVPYTHONPARSER_EXPORT TypeAliasAst : public StatementAst {
-+public:
-+ TypeAliasAst(Ast* parent);
-+};
-+
- class KDEVPYTHONPARSER_EXPORT ImportAst : public StatementAst {
- public:
- ImportAst(Ast* parent);
-diff --git a/parser/astbuilder.cpp b/parser/astbuilder.cpp
-index 9c9ec056..32ab95c7 100644
---- a/parser/astbuilder.cpp
-+++ b/parser/astbuilder.cpp
-@@ -57,7 +57,16 @@ struct PythonParser : private QMutexLocker
-
- PythonParser(QMutex& lock): QMutexLocker(&lock)
- {
-+#if PYTHON_VERSION < QT_VERSION_CHECK(3, 12, 0)
- Py_InitializeEx(0);
-+#else
-+ PyConfig config;
-+ PyConfig_InitPythonConfig(&config);
-+ config.site_import = 0;
-+ config.install_signal_handlers = 0;
-+ Py_InitializeFromConfig(&config);
-+#endif
-+
- Q_ASSERT(Py_IsInitialized());
- m_parser_mod = PyImport_ImportModule("ast");
- Q_ASSERT(m_parser_mod); // parser import error
-@@ -92,9 +101,11 @@ struct PythonParser : private QMutexLocker
- CodeAst::Ptr AstBuilder::parse(const QUrl& filename, QString &contents)
- {
- qCDebug(KDEV_PYTHON_PARSER) << " ====> AST ====> building abstract syntax tree for " << filename.path();
--
-+
-+#if PYTHON_VERSION < QT_VERSION_CHECK(3, 12, 0)
- Py_NoSiteFlag = 1;
--
-+#endif
-+
- contents.append('\n');
-
- PythonParser py_parser(pyInitLock);
-diff --git a/parser/asttransformer.cpp b/parser/asttransformer.cpp
-index 3884ae13..0c54a498 100644
---- a/parser/asttransformer.cpp
-+++ b/parser/asttransformer.cpp
-@@ -1246,6 +1246,12 @@ Ast* AstTransformer::visitStmtNode(PyObject* node, Ast* parent)
- }
- result = v;
- }
-+#endif
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+ else if (PyObject_IsInstance(node, grammar.ast_TypeAlias)) {
-+ TypeAliasAst* v = new TypeAliasAst(parent);
-+ result = v;
-+ }
- #endif
- else {
- qWarning() << "Unsupported _stmt AST type: " << PyUnicodeObjectToQString(PyObject_Str(node));
-diff --git a/parser/astvisitor.cpp b/parser/astvisitor.cpp
-index eda66000..df21cddf 100644
---- a/parser/astvisitor.cpp
-+++ b/parser/astvisitor.cpp
-@@ -104,6 +104,7 @@ void AstVisitor::visitNode(Ast* node)
- case Ast::LastStatementType: Q_ASSERT(false); break;
- case Ast::LastExpressionType: Q_ASSERT(false); break;
- case Ast::LastPatternType: Q_ASSERT(false); break;
-+ case Ast::TypeAliasType: break;
- }
- }
-
-diff --git a/parser/python_grammar.h b/parser/python_grammar.h
-index 1b30be49..88c68f70 100644
---- a/parser/python_grammar.h
-+++ b/parser/python_grammar.h
-@@ -45,6 +45,10 @@ public:
- PyObject* ast_Pass;
- PyObject* ast_Break;
- PyObject* ast_Continue;
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+ // type
-+ PyObject* ast_TypeAlias;
-+#endif
-
- // expr
- PyObject* ast_expr;
-@@ -330,6 +334,10 @@ public:
- Py_GRAMMAR_GET(mod, Bytes);
- #endif
-
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+ Py_GRAMMAR_GET(mod, TypeAlias);
-+#endif
-+
- Py_DECREF(mod);
- }
-
-@@ -472,6 +480,13 @@ public:
- Py_XDECREF(ast_Str);
- Py_XDECREF(ast_Bytes);
- #endif
-+
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 11, 0)
-+ Py_XDECREF(ast_TryStar);
-+#endif
-+#if PYTHON_VERSION >= QT_VERSION_CHECK(3, 12, 0)
-+ Py_XDECREF(ast_TypeAlias);
-+#endif
- }
- };
-
---
-GitLab
-
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.05.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.05.2.ebuild
deleted file mode 100644
index 07e58dda43be..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-24.05.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-KDE_ORG_CATEGORY="kdevelop"
-KDE_ORG_NAME="kdev-python"
-PYTHON_COMPAT=( python3_{10..12} )
-KFMIN=5.115.0
-QTMIN=5.15.12
-inherit ecm gear.kde.org python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-HOMEPAGE="https://www.kdevelop.org/"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="test"
-
-DEPEND="${PYTHON_DEPS}
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- dev-util/kdevelop:5=
- >=kde-frameworks/kcompletion-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/ktexteditor-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- >=kde-frameworks/threadweaver-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
- $(python_gen_cond_dep '
- dev-python/pycodestyle[${PYTHON_USEDEP}]
- ')
-"
-
-PATCHES=( "${FILESDIR}/${PN}-24.05.1-python3.12.patch" ) # bug 929546
-
-pkg_setup() {
- python-single-r1_pkg_setup
- ecm_pkg_setup
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.08.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.08.1.ebuild
new file mode 100644
index 000000000000..75a9f7ad66c7
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-24.08.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+KDE_ORG_CATEGORY="kdevelop"
+KDE_ORG_NAME="kdev-python"
+PYTHON_COMPAT=( python3_{10..12} )
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org python-single-r1
+
+DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://kdevelop.org/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="6"
+KEYWORDS="amd64 arm64"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="test"
+
+DEPEND="${PYTHON_DEPS}
+ >=dev-qt/qt5compat-${QTMIN}:6
+ >=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+ dev-util/kdevelop:6=
+ >=kde-frameworks/kconfig-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kparts-${KFMIN}:6
+ >=kde-frameworks/kservice-${KFMIN}:6
+ >=kde-frameworks/ktexteditor-${KFMIN}:6
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
+ >=kde-frameworks/threadweaver-${KFMIN}:6
+"
+RDEPEND="${DEPEND}
+ $(python_gen_cond_dep '
+ dev-python/pycodestyle[${PYTHON_USEDEP}]
+ ')
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ ecm_pkg_setup
+}
diff --git a/dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild b/dev-util/kdevelop-python/kdevelop-python-24.08.2.ebuild
index e283a3d10c12..e283a3d10c12 100644
--- a/dev-util/kdevelop-python/kdevelop-python-24.08.0.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-24.08.2.ebuild
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 05:55:56 +0000