commit: 32c2a79c23f5ea4e3809c84b8af5bf38b26e9d4f Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jun 9 10:55:17 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jun 9 10:56:19 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32c2a79c
media-sound/csound: enable py3.13 Closes: https://bugs.gentoo.org/952543 Closes: https://bugs.gentoo.org/938333 Bug: https://bugs.gentoo.org/941397 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/csound/csound-6.17.0-r1.ebuild | 6 +++-- media-sound/csound/csound-9999.ebuild | 4 ++-- .../csound/files/csound-6.17.0-python3.13.patch | 27 ++++++++++++++++++++++ .../files/csound-6.17.0-typo-instantiate.patch | 12 ++++++++++ 4 files changed, 45 insertions(+), 4 deletions(-) diff --git a/media-sound/csound/csound-6.17.0-r1.ebuild b/media-sound/csound/csound-6.17.0-r1.ebuild index 4d3489c2ab05..a6bdd2e7c2cc 100644 --- a/media-sound/csound/csound-6.17.0-r1.ebuild +++ b/media-sound/csound/csound-6.17.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # As upstream (and we aswell) are not allowed to redistribute scansyn, @@ -8,7 +8,7 @@ EAPI=8 LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit cmake flag-o-matic lua-single python-single-r1 @@ -93,6 +93,8 @@ RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-6.13.0-xdg-open.patch" + "${FILESDIR}/${PN}-6.17.0-typo-instantiate.patch" + "${FILESDIR}/${PN}-6.17.0-python3.13.patch" ) pkg_setup() { diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild index 4d3489c2ab05..11aeb59e5871 100644 --- a/media-sound/csound/csound-9999.ebuild +++ b/media-sound/csound/csound-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # As upstream (and we aswell) are not allowed to redistribute scansyn, @@ -8,7 +8,7 @@ EAPI=8 LUA_COMPAT=( lua5-1 luajit ) -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..13} ) inherit cmake flag-o-matic lua-single python-single-r1 diff --git a/media-sound/csound/files/csound-6.17.0-python3.13.patch b/media-sound/csound/files/csound-6.17.0-python3.13.patch new file mode 100644 index 000000000000..ed5fc28d6162 --- /dev/null +++ b/media-sound/csound/files/csound-6.17.0-python3.13.patch @@ -0,0 +1,27 @@ +https://github.com/csound/csound/pull/1876 + +From 6458f562a106ac582179fb9dbff393c20b6fb4bb Mon Sep 17 00:00:00 2001 +From: Jelle van der Waa <[email protected]> +Date: Mon, 29 Apr 2024 19:57:54 +0200 +Subject: [PATCH] replace logging.warn with logging.warning + +logging.warn is an alias to logging.warning since Python 3.3 and will be +removed in Python 3.13. +--- + Emscripten/examples/httpd.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Emscripten/examples/httpd.py b/Emscripten/examples/httpd.py +index 88d8f98e6cb..bf42b3f0bac 100755 +--- a/Emscripten/examples/httpd.py ++++ b/Emscripten/examples/httpd.py +@@ -82,7 +82,7 @@ def _FindDelegateAtPath(self, dirname): + delegate_class = getattr(module, 'HTTPRequestHandlerDelegate', None) + delegate = delegate_class() + if not delegate: +- logging.warn( ++ logging.warning( + 'Unable to find symbol HTTPRequestHandlerDelegate in module %s.' % + handler_script) + + diff --git a/media-sound/csound/files/csound-6.17.0-typo-instantiate.patch b/media-sound/csound/files/csound-6.17.0-typo-instantiate.patch new file mode 100644 index 000000000000..065c22108aef --- /dev/null +++ b/media-sound/csound/files/csound-6.17.0-typo-instantiate.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/938333 +--- a/include/plugin.h ++++ b/include/plugin.h +@@ -1002,7 +1002,7 @@ template <std::size_t N> struct InPlug : OPDS { + /** check if this opcode runs at perf time + */ + bool is_perf() { +- return this->opaddr ? true : false; ++ return this->opadr ? true : false; + } + + };
