commit: 7c68dab579ff45df25151a79725f6fdc7a910ec1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 31 11:26:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 07:17:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c68dab5
dev-util/kdevelop-python: drop 24.05.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/kdevelop-python/Manifest | 1 -
.../files/kdevelop-python-24.05.1-python3.12.patch | 190 ---------------------
.../kdevelop-python/kdevelop-python-24.05.2.ebuild | 53 ------
3 files changed, 244 deletions(-)
diff --git a/dev-util/kdevelop-python/Manifest
b/dev-util/kdevelop-python/Manifest
index 672b7354ddaa..6a8e73db4ea8 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,2 +1 @@
-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
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.buschin...@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
-}
